diff --git a/_doimport.html b/_doimport.html index 22a6610..dafebf9 100644 --- a/_doimport.html +++ b/_doimport.html @@ -111,8 +111,8 @@ } http.open('GET', '{{vtLink: -met="ajax/import_image.html", src="{vtGet:Source}" }}&path=' + encodeURIComponent( thePath ) ); document.getElementById('wait').style.display = 'block'; - document.getElementById('wait_message').innerHTML = 'Importiere Bild #' + imageCount + '
' + thePath; - addMessage( 'Importiere Bild #' + imageCount + ': ' + thePath ); + document.getElementById('wait_message').innerHTML = 'Importiere Bild #' + (1+imageCount) + '
' + thePath; + addMessage( 'Importiere Bild #' + (1+imageCount) + ': ' + thePath ); http.onreadystatechange = handleResponse_importImage; http.send(null); } @@ -234,7 +234,7 @@ } document.getElementById( 'messages' ).appendChild( newElm ); document.all[ 'msg' + messageCount ].innerHTML = '' + theMessage; - window.location.hash = 'msg' + messageCount; + window.scrollTo( 0, document.body.scrollHeight ); // scroll to the bottom of the pagse messageCount++; } diff --git a/actions/update.html b/actions/update.html index b4d6019..402845b 100644 --- a/actions/update.html +++ b/actions/update.html @@ -80,6 +80,21 @@ folder" {{vtDo: -act="delete", -obj="{vtResult}" }} {{vtEndIf}} + {{vtIf: {vtGlobal:pxtc_version_number} .lt. 55 }} + {{vtDbQuery: ALTER TABLE `%table_downloads_log` + ADD `id` int(10) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST, + ADD `image_id` int(10) unsigned DEFAULT NULL, + ADD `paid` tinyint(4) NOT NULL DEFAULT '0' + }} + {{vtDbQuery: UPDATE `%table_downloads_log` d + LEFT JOIN `%data_image` i + ON i.verzeichnis = REGEXP_REPLACE( d.image_path, '/[^/]+$', '' ) + AND i.dateiname = SUBSTRING_INDEX( d.image_path, '/', -1 ) + SET d.image_id = i.vtid + WHERE d.image_id IS NULL + }} + {{vtEndIf}} + {{vtEndAsAdmin}} {{vtEndScript}} diff --git a/ajax/order_dialog.html b/ajax/order_dialog.html index 7891576..7d08178 100644 --- a/ajax/order_dialog.html +++ b/ajax/order_dialog.html @@ -1,22 +1,36 @@ {{vtInclude: includes/initialize.html}} -
+
-
- {{Name}}{{vtName}} -
+
+
+ {{Name}}{{vtName}} +
+
+ + + + + + {{vtItem:quantity}} × {{vtItem:title}} + + + + +
+
{{vtGet:LightboxCount}} {{vtGet:s_txt_0037}}
-
@@ -53,40 +67,66 @@ - -
{{vtItem:name}}
+ +
{{vtItem:name}}
- - -
- - -
- - - -
-
+ + +
{{vtItem:name}} + + + +    + +
- + - {{vtItem:price|num-en:2}} {{vtGlobal:pxtcCurrency}} - {{vtGet:s_txt_0070}} {{vtItem:vatRate}}% {{vtGet:s_txt_0072}} + {{vtGet:Price|num-en:2}} {{vtGlobal:pxtcCurrency}} + {{vtGet:s_txt_0070}} {{vtGet:VatRate}}% {{vtGet:s_txt_0072}} - {{vtItem:price|num-en:2}} {{vtGlobal:pxtcCurrency}} - - {{vtGet:s_txt_0071}} {{vtItem:vatRate}}% {{vtGet:s_txt_0072}} = + {{vtGet:Price|num-en:2}} {{vtGlobal:pxtcCurrency}} + + {{vtGet:s_txt_0071}} {{vtGet:VatRate}}% {{vtGet:s_txt_0072}} = {{vtResult|num-en:2}} {{vtGlobal:pxtcCurrency}} - {{vtItem:price|num-en:2}} {{vtGlobal:pxtcCurrency}} + {{vtGet:Price|num-en:2}} {{vtGlobal:pxtcCurrency}} +
+
+ +
+ + + +
+ +
+ + + +
+
@@ -117,10 +157,12 @@ {{vtGet:s_btn_cart}} - +
+ +
@@ -128,4 +170,68 @@ diff --git a/assortment.html b/assortment.html index 2f8ed6c..bea5c67 100644 --- a/assortment.html +++ b/assortment.html @@ -31,7 +31,14 @@ -

{{Bezeichnung}} | {{Preis|num-en:2}} {{vtGlobal:pxtcCurrency}}

+

+ {{Bezeichnung}} | + + {{vtCountPages}} Produkt(e) + + {{Preis|num-en:2}} {{vtGlobal:pxtcCurrency}} + +

diff --git a/assortment.vtedit.html b/assortment.vtedit.html index c2d2762..4a5aa8a 100644 --- a/assortment.vtedit.html +++ b/assortment.vtedit.html @@ -103,7 +103,14 @@
☰ -

{{Bezeichnung}} | {{Preis|num-en:2}} {{vtGlobal:pxtcCurrency}}

+

+ {{Bezeichnung}} | + + {{vtCountPages}} Produkt(e) + + {{Preis|num-en:2}} {{vtGlobal:pxtcCurrency}} + +

@@ -145,7 +152,12 @@ @@ -199,7 +211,8 @@ text: 'Hinzufügen', click: function(){ $(this).find('input:checked').each( function(){ - $('#prodlist').append( '
☰

' + $(this).data('text') + '

' ); + let label = $(this).parents('tr').find('label').text(); + $('#prodlist').append( '
☰

' + label + '

' ); }); $(this).dialog('close'); $('input[name=Liste]').val( serialize_prod_List('#prodlist') ); diff --git a/checkout.html b/checkout.html index 8002662..65c27fb 100644 --- a/checkout.html +++ b/checkout.html @@ -131,7 +131,7 @@ {{vtIf: {vtGet:CartValue} .gt. 0 }} {{vtDbQuery: SELECT `vtid` FROM {vtDbTable:data_coupon} d, {vtDbTable:content} c WHERE d.`vtid` = c.`id` AND c.`containerID` = {vtGet:ID_Gutscheine} - AND ( `verwendet` IS NULL OR `verwendet` = '0' ) + AND ( `verwendet` IS NULL OR `verwendet:num` = '0' ) AND ( `gueltig_von` = '' OR `gueltig_von:num` <= {vtEcho:time()} ) AND ( `gueltig_bis` = '' OR `gueltig_bis:num` >= {vtEcho:strtotime('today')} ) }} {{vtIf: {vtDbCountSelection} .gt. 0 }} diff --git a/checkout.summary.html b/checkout.summary.html index f4e2fbb..d2d590c 100644 --- a/checkout.summary.html +++ b/checkout.summary.html @@ -655,6 +655,10 @@
+ +
+ +
diff --git a/download.single.html b/download.single.html index 59f303a..a53057f 100644 --- a/download.single.html +++ b/download.single.html @@ -31,6 +31,8 @@ {{vtSet: File}} {{vtCalc: basename('{vtGet:File,escaped}') }} {{vtSet: FileName }} + {{vtSet: LogType = "hires" }} + {{vtSet: LogPath="{vtItem:folder}/{vtItem:hires_path}"}} {{vtIf: {vtItem:rule} .neq.}} {{vtCalc: substr( '{vtGet:FileName,escaped}', 0, -4 ) . '_' . strtolower('{vtItem:rule}') . '.jpg' }} @@ -41,6 +43,8 @@ {{vtIf: {vtGet:File} .bw. - }} {{vtCode: die( 'Could not generate image [' . v::vtget('File') . ']' ); }} {{vtEndIf}} + {{vtSet: LogType = "{vtItem:rule}" }} + {{vtSet: LogPath="{vtItem:folder}/{vtGet:FileName}"}} {{vtEndIf}} {{vtDeliver: {vtGet:File}, {vtGet:FileName} }} @@ -49,6 +53,18 @@ {{vtReturn}} {{vtEndIf}} + {{vtDbQuery: INSERT INTO {vtDbTable:table_downloads_log} SET + `timestamp` = CURRENT_TIMESTAMP, + `ip_address` = '{vtEcho: getenv( 'REMOTE_ADDR' ) }', + `session_id` = '{vtSession:id}', + `type` = '{vtGet:LogType}', + `user` = '{vtUser:name}', + `realname` = '{vtUser:realname}', + `organization` = '{vtUser:Contact_Company}', + `image_path` = '{vtGet:LogPath}', + `image_id` = '{vtItem:image}', + `paid` = 1 + }} {{vtIf: {vtGlobal:mailRecipient} .neq. .or. {vtGlobal:pxtcNotifyRecipient} .neq. }} {{vtIf: {vtGlobal:pxtcNotifyHiresDownload} .eq. 1 }} {{vtIf: {vtGlobal:pxtcNotifyRecipient} .neq. }} @@ -72,4 +88,4 @@ {{vtEndIf}} -{{vtEndScript}}{{vtInclude:download.html}} \ No newline at end of file +{{vtEndScript}}{{vtInclude:download.html}} diff --git a/download.zip.html b/download.zip.html index c70c9de..d353d4e 100644 --- a/download.zip.html +++ b/download.zip.html @@ -39,10 +39,12 @@ {{vtElse}} {{vtCalc: substr( '{vtGet:File,escaped}', 0, strrpos( '{vtGet:File,raw}', '.' ) ) . '_' . strtolower('{vtItem:rule}') . '.' . pathinfo( v::vtget('TempFile'), PATHINFO_EXTENSION ) }} {{vtSet: FinalList[] = "{vtResult}|{vtGet:TempFile}" }} + {{vtSet: NumberList[] = "{vtItem:image}|{vtResult}|{vtItem:rule}" }} {{vtSet: DeleteList[] = "{vtGet:TempFile}" }} {{vtEndIf}} {{vtElse}} {{vtSet: FinalList[] = "{vtGet:File,raw}" }} + {{vtSet: NumberList[] = "{vtItem:image}|{vtResult}|hires" }} {{vtEndIf}} {{vtEndIf}} {{vtEndIf}} @@ -76,6 +78,27 @@ {{vtEndIf}} {{vtEndIf}} + {{vtRepeat: {vtGet:NumberList} }} + {{vtCalc: strtok( '{vtItem:escaped}', '|' ) }} + {{vtSet: ImageId }} + {{vtCalc: strtok( '|' ) }} + {{vtSet: ImagePath }} + {{vtCalc: strtok( '|' ) }} + {{vtSet: LogType }} + {{vtDbQuery: INSERT INTO {vtDbTable:table_downloads_log} SET + `timestamp` = CURRENT_TIMESTAMP, + `ip_address` = '{vtEcho: getenv( 'REMOTE_ADDR' ) }', + `session_id` = '{vtSession:id}', + `type` = '{vtGet:LogType}', + `user` = '{vtUser:name}', + `realname` = '{vtUser:realname}', + `organization` = '{vtUser:Contact_Company}', + `image_path` = '/{vtGet:ImagePath,raw}', + `image_id` = '{vtGet:ImageId}', + `paid` = 1 + }} + {{vtEndRepeat}} + {{vtRepeat: {vtGet:DeleteList} }} {{vtCalc: unlink('{vtItem:escaped}') }} {{vtEndRepeat}} diff --git a/downloadlog.html b/downloadlog.html index d8ffe1c..ed86100 100644 --- a/downloadlog.html +++ b/downloadlog.html @@ -23,46 +23,109 @@ tr:hover { background: #FFF; } + form input[type=text] { + width: 9em; + } - +

Download-Protokoll

-

- Daten herunterladen | - Daten löschen + + Daten herunterladen | + Daten löschen + + + | Filter zurücksetzen +

- + + + + + + + + + + + + +   + + + +
@@ -71,6 +134,7 @@ + @@ -81,20 +145,42 @@ +
Datum/Uhrzeit IP-AdresseOrganisation Typ Bildpfadgekauft
{{vtDbRow:organization}} {{vtDbRow:type}} - - - {{vtDbRow:image_path}} + + {{vtDbRow:image_path}} + {{vtDbRow:image_path}} + + + + + +
+

+ + + {{vtItem}} | + + {{vtItem}} | + + + + ∞ + + ∞ + + + +   —    + Aufgelistete Bilder in Lightbox legen + +

Diese Funktion ist nur in der Professional-Edition verfügbar.

jetzt bestellen

@@ -105,9 +191,33 @@ Jetzt aktivieren

+ +

Es liegen keine Protokolleinträge vor, die den Filterbedingungen entsprechen.

Es liegen noch keine Protokolleinträge vor.

+ diff --git a/downloadlog.update.html b/downloadlog.update.html new file mode 100644 index 0000000..61be84f --- /dev/null +++ b/downloadlog.update.html @@ -0,0 +1,21 @@ +{{vtScript}} + +{{vtHeader: ContentType: application/json }} + +{{vtIf: {vtUser:admin} .neq. 1 }} + {{vtSet: Status = "0", Error = "Fehlende Rechte" }} +{{vtElseIf: {vtGetValue:id} .eq. .or. {vtGetValue:paid} .eq. }} + {{vtSet: Status = "0", Error = "Fehlende Parameter" }} +{{vtElse}} + {{vtCalc: (int) '{vtGetValue:id}' }} + {{vtSet: id }} + {{vtCalc: '{vtGetValue:paid}' ? 1 : 0 }} + {{vtSet: paid }} + {{vtDbQuery: UPDATE `%table_downloads_log` + SET paid = {vtGet:paid} WHERE id = {vtGet:id} + }} + {{vtSet: Status = "1", Error = "0" }} +{{vtEndIf}} + +{{vtEndScript}}{ status: {{vtGet:Status}}, error: {{vtGet:Error}} } + diff --git a/export/download_log.xls b/export/download_log.xls index 43cb492..cd1dd38 100644 --- a/export/download_log.xls +++ b/export/download_log.xls @@ -1,9 +1,40 @@ {{vtScript}} {{vtIf: workspace .and. {vtUser:admin} .eq. 1 }} - {{vtDbQuery: SELECT * FROM {vtDbTable:table_downloads_log} WHERE 1 }} + {{vtSet: Where = "1" }} + {{vtIf: {vtSession:dlflt_timestamp} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND timestamp LIKE '{vtSession:dlflt_timestamp, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_ip_address} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND ip_address LIKE '{vtSession:dlflt_ip_address, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_user} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND user LIKE '{vtSession:dlflt_user, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_realname} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND realname LIKE '{vtSession:dlflt_realname, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_organization} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND organization LIKE '{vtSession:dlflt_organization, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_type} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND type LIKE '{vtSession:dlflt_type, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_image_path} .neq. }} + {{vtSet: Where = "{vtGet:Where} AND image_path LIKE '%{vtSession:dlflt_image_path, escaped}%'" }} + {{vtEndIf}} + {{vtIf: {vtSession:dlflt_paid} .eq. 1 }} + {{vtSet: Where = "{vtGet:Where} AND paid = 1" }} + {{vtEndIf}} + + {{vtIf: {vtSession:dlflt_limit} .gt. 0 }} + {{vtSet: Limit = "LIMIT {vtSession:dlflt_limit}" }} + {{vtEndIf}} + + {{vtDbQuery: SELECT * FROM {vtDbTable:table_downloads_log} WHERE {vtGet:Where} + ORDER BY `timestamp` DESC {vtGet:Limit} }} {{vtEndIf}} -{{vtEndScript}}"Datum/Uhrzeit" "IP-Adresse" "Anmeldename" "Name" "Organisation" "Typ" "Bildpfad" -{{vtDbLoop}}"{{vtDbRow:timestamp}}" "{{vtDbRow:ip_address}}" "{{vtDbRow:user}}" "{{vtDbRow:realname}}" "{{vtDbRow:organization}}" "{{vtDbRow:type}}" "{{vtDbRow:image_path}}" -{{vtEndDbLoop}} \ No newline at end of file +{{vtEndScript}}"Datum/Uhrzeit" "IP-Adresse" "Anmeldename" "Name" "Organisation" "Typ" "Bildpfad" "gekauft" +{{vtDbLoop}}"{{vtDbRow:timestamp}}" "{{vtDbRow:ip_address}}" "{{vtDbRow:user}}" "{{vtDbRow:realname}}" "{{vtDbRow:organization}}" "{{vtDbRow:type}}" "{{vtDbRow:image_path}}" "{{vtDbRow:paid}}" +{{vtEndDbLoop}} diff --git a/image.download.html b/image.download.html index e7942bb..89f0c07 100644 --- a/image.download.html +++ b/image.download.html @@ -107,7 +107,8 @@ `user` = '{vtUser:name}', `realname` = '{vtUser:realname}', `organization` = '{vtUser:Contact_Company}', - `image_path` = '{vtGet:LogPath}' + `image_path` = '{vtGet:LogPath}', + `image_id` = '{vtId}' }} {{vtEndIf}} diff --git a/imagelist.download.html b/imagelist.download.html index 35d331c..95ee5a7 100644 --- a/imagelist.download.html +++ b/imagelist.download.html @@ -126,7 +126,7 @@ {{vtElse}} {{vtCalc: substr( '{vtName:escaped}', 0, -4 ) . '_' . strtolower('{vtGetValue:rule}') . '.' . pathinfo( v::vtget('TempFile'), PATHINFO_EXTENSION ) }} {{vtSet: FinalList[] = "{vtGet:Verzeichnis,raw}/{vtResult}|{vtGet:TempFile}" }} - {{vtSet: NumberList="{vtGet:NumberList},{vtID}"}} + {{vtSet: NumberList="{vtGet:NumberList},{vtID}|{vtGet:Verzeichnis,raw}/{vtResult}"}} {{vtSet: DeleteList[] = "{vtGet:TempFile}" }} {{vtEndIf}} {{vtElseIf: {vtGetValue:v} .eq. }} @@ -154,7 +154,7 @@ {{vtCalc: file_exists( '{vtGet:Directory}/{vtGet:BaseName}{vtItem}' ) ? '1' : '' }} {{vtIf: {vtResult} .eq. 1}} {{vtSet: FinalList[]="{vtGet:BaseName}{vtItem}"}} - {{vtSet: NumberList="{vtGet:NumberList},{vtID}"}} + {{vtSet: NumberList="{vtGet:NumberList},{vtID}|{vtGet:BaseName}{vtItem}"}} {{vtExit}} {{vtEndIf}} {{vtEndRepeat}} @@ -213,8 +213,10 @@ {{vtEndIf}} {{vtIf: {vtGet:LogType} .neq.}} - {{vtRepeat: {vtGet:FinalList} }} - {{vtCalc: array_shift( explode( '|', '{vtItem:escaped}' ) ) }} + {{vtRepeat: {vtGet:NumberList} }} + {{vtCalc: strtok( '{vtItem:escaped}', '|' ) }} + {{vtSet: ImageId }} + {{vtCalc: strtok( '|' ) }} {{vtSet: ImagePath }} {{vtDbQuery: INSERT INTO {vtDbTable:table_downloads_log} SET `timestamp` = CURRENT_TIMESTAMP, @@ -224,7 +226,8 @@ `user` = '{vtUser:name}', `realname` = '{vtUser:realname}', `organization` = '{vtUser:Contact_Company}', - `image_path` = '/{vtGet:ImagePath,raw}' + `image_path` = '/{vtGet:ImagePath,raw}', + `image_id` = '{vtGet:ImageId}' }} {{vtEndRepeat}} {{vtEndIf}} diff --git a/imagelist.html b/imagelist.html index 7eeabe4..b8a45e3 100644 --- a/imagelist.html +++ b/imagelist.html @@ -275,6 +275,18 @@ {{vtInclude: includes/get_payment_methods.html }} {{vtInclude: includes/deliverymethods.html }} + {{vtLoad: templates/pixtacy/lib/pxtc_products.class.php }} + {{vtCalc: Pixtacy_Products::set_options( array ( + 'paymentsPossible' => ! empty( v::vtget('Bezahlmethoden') ) || ! empty( v::vtget('DeliveryPayment') ), + 'deliveryPossible' => ! empty( v::vtget('DeliveryMethods') ), + 'vatRate1' => v::vtglobal('pxtcVatRate'), + 'vatRate2' => v::vtglobal('pxtcVatRate2'), + 'userName' => v::vtuser('name'), + 'userGroups' => v::vtuser('groups'), + 'preferEnglish' => v::vtget('Language') != 'de' ? '1' : '' + ) ) }} + {{vtCalc: Pixtacy_Products::initialize( v::get_db(), v::vtget('ID_Produkte'), v::vtget('ID_Sortimente'), v::vtget('Cart') ) }} + {{vtIf: {Sortiment} .eq. 0 }} {{vtSet: GalerieSortiment = "" }} {{vtSet: GalerieProdukte = "{Produkte} @@ -333,16 +345,8 @@ {{vtSet: Image[badge] = "{vtGet:s_txt_0018}" }} {{vtEndIf}} - {{vtIf: {Sortiment} .eq. .or. {Sortiment} .eq. 0 }} - {{vtSet: Sortiment = "{vtGet:GalerieSortiment}" }} - {{vtElseIf: {Sortiment} .neq. -1 }} - {{vtSet: Sortiment = "{Sortiment}" }} - {{vtElse}} - {{vtSet: Sortiment = "" }} - {{vtEndIf}} - - {{vtCalc: image_is_buyable( '{Verzeichnis:escaped}/{Dateiname:escaped}', '{vtGet:Sortiment}', '{vtGet:GalerieProdukte} -{Produkte}' ) ? 1 : 0 }} + {{vtCalc: Pixtacy_Products::is_image_buyable( '{Verzeichnis:escaped}/{Dateiname:escaped}', '{Sortiment:escaped}', + '{Produkte:escaped}', '{vtGet:GalerieSortiment}', '{vtGet:GalerieProdukte}' ) ? 1 : 0 }} {{vtIf: {vtResult} .eq. 1 }} {{vtSet: ShowCartButtons = "1" }} {{vtSet: Image[buyable] = "1" }} diff --git a/includes/get_payment_methods.html b/includes/get_payment_methods.html index b040807..5929caa 100644 --- a/includes/get_payment_methods.html +++ b/includes/get_payment_methods.html @@ -43,6 +43,12 @@ {{vtSet: Methode[label]="{vtGet:s_payment_payrexx}"}} {{vtSet: Bezahlmethoden[]="{vtGet:Methode}"}} {{vtEndIf}} + {{vtIf: {vtGlobal:pxtcPaymentMollie} .in. 1|2 .or. {vtGlobal:pxtcPaymentMollie} .in. {vtUser:groups} .and. {vtGet:AdvancedOptions} .eq. 1 }} + {{vtSet: Methode[id]="8"}} + {{vtSet: Methode[name]="mollie"}} + {{vtSet: Methode[label]="{vtGet:s_payment_mollie}"}} + {{vtSet: Bezahlmethoden[]="{vtGet:Methode}"}} + {{vtEndIf}} {{vtElse}} @@ -82,6 +88,12 @@ {{vtSet: Methode[label]="{vtGet:s_payment_payrexx}"}} {{vtSet: Bezahlmethoden[]="{vtGet:Methode}"}} {{vtEndIf}} + {{vtIf: {vtGet:MollieInitialized} .eq. 1 .and. {vtGlobal:pxtcPaymentMollie} .eq. 2 }} + {{vtSet: Methode[id]="8"}} + {{vtSet: Methode[name]="mollie"}} + {{vtSet: Methode[label]="{vtGet:s_payment_mollie}"}} + {{vtSet: Bezahlmethoden[]="{vtGet:Methode}"}} + {{vtEndIf}} {{vtEndIf}} diff --git a/includes/get_products.html b/includes/get_products.html index 0bf5485..3666db5 100644 --- a/includes/get_products.html +++ b/includes/get_products.html @@ -26,6 +26,7 @@ 'vatRate2' => v::vtglobal('pxtcVatRate2'), 'userName' => v::vtuser('name'), 'userGroups' => v::vtuser('groups'), + 'userPriceFactor' => v::vtuser('Preisfaktor'), 'preferEnglish' => v::vtget('Language') != 'de' ? '1' : '' ) ) }} {{vtCalc: Pixtacy_Products::initialize( v::get_db(), v::vtget('ID_Produkte'), v::vtget('ID_Sortimente'), v::vtget('Cart') ) }} diff --git a/includes/get_products_lb.html b/includes/get_products_lb.html index d13722c..bb2c663 100644 --- a/includes/get_products_lb.html +++ b/includes/get_products_lb.html @@ -4,58 +4,34 @@ ### In "ProductList" wird die Liste, in "ProductCount" die Anzahl gespeichert {{vtInclude: includes/get_payment_methods.html}} - - {{vtSet: ProductCount = "0" }} - {{vtSet: ProductList = "" }} - - {{vtAsAdmin}} - {{vtUse: {vtGet:ID_Produkte} }} - {{vtLoop}} - - {{vtSet: ShowRow=""}} - {{vtIf: {Benutzer} .neq. .and. {Benutzer} .neq. guest .and. {vtUser:groups} .ncn. {Benutzer} .and. {vtUser:admin} .neq. 1 }} - {{vtElseIf: {Benutzer} .eq. guest .and. {vtUser:name} .neq. .and. {vtUser:admin} .neq. 1 }} - {{vtElseIf: {Preis|num-en} .gt. 0 .and. {vtGet:Bezahlmethoden} .eq.}} - {{vtElseIf: {Zuordnung} .eq. 1 .and. {Kennung} .eq.}} - {{vtSet: ShowRow="1"}} - {{vtEndIf}} - - {{vtIf: {vtGet:ShowRow} .eq. 1}} - - {{vtSet: Prod[id] = "{vtID}" }} - {{vtSet: Prod[name] = "{Bezeichnung:raw}" }} - {{vtSet: Prod[name_en] = "{Bezeichnung_en:raw}" }} - {{vtSet: Prod[type] = "{Typ}" }} - {{vtSet: Prod[description] = "{Beschreibung:raw}" }} - - {{vtIf: {Steuersatz} .eq. 2 }} - {{vtSet: Prod[vatRate] = "{vtGlobal:pxtcVatRate2}" }} - {{vtElse}} - {{vtSet: Prod[vatRate] = "{vtGlobal:pxtcVatRate}" }} - {{vtEndIf}} - - {{vtIf: {Preisanpassung} .eq. 1 .and. {vtUser:Preisfaktor} .gt. 0}} - {{vtCalc: {Preis} * {vtUser:Preisfaktor|num:2.} }} - {{vtSet: Prod[price] = "{vtResult}" }} - {{vtElse}} - {{vtSet: Prod[price] = "{Preis}" }} - {{vtEndIf}} - - {{vtCalc: get_cart_price( {vtID} ) }} - {{vtIf: {vtResult} .gt. 0 }} - {{vtSet: Prod[price] = "{vtResult}" }} - {{vtEndIf}} - - {{vtCalc: get_cart_quantity( {vtGet:ID_Current}, {vtID} ) }} - {{vtSet: Prod[quantity] = "{vtResult}" }} - - {{vtSet: ProductList[] = "{vtGet:Prod}" }} - {{vtCalc: {vtGet:ProductCount} + 1 }} - {{vtSet: ProductCount }} - - {{vtEndIf}} - {{vtEndLoop}} - {{vtEndUse}} - {{vtEndAsAdmin}} + {{vtInclude: includes/deliverymethods.html }} + + {{vtIf: {vtGet:Bezahlmethoden} .eq. .and. {vtGet:DeliveryPayment} .neq. 1 }} + {{vtSet: PaymentPossible = "0" }} + {{vtElse}} + {{vtSet: PaymentPossible = "1" }} + {{vtEndIf}} + + {{vtIf: {vtGet:DeliveryMethods} .eq. }} + {{vtSet: DeliveryPossible = "0" }} + {{vtElse}} + {{vtSet: DeliveryPossible = "1" }} + {{vtEndIf}} + + {{vtLoad: templates/pixtacy/lib/pxtc_products.class.php }} + {{vtCalc: Pixtacy_Products::set_options( array ( + 'paymentsPossible' => v::vtget('PaymentPossible'), + 'deliveryPossible' => v::vtget('DeliveryPayment'), + 'vatRate1' => v::vtglobal('pxtcVatRate'), + 'vatRate2' => v::vtglobal('pxtcVatRate2'), + 'preferEnglish' => v::vtget('Language') != 'de' ? '1' : '' + ) ) }} + {{vtCalc: Pixtacy_Products::initialize( v::get_db(), v::vtget('ID_Produkte'), v::vtget('ID_Sortimente') ) }} + + {{vtCalc: Pixtacy_Products::get_global_products() }} + {{vtSet: ProductList }} + + {{vtCalc: count( json_decode( v::vtresult() ) ) }} + {{vtSet: ProductCount }} {{vtEndScript}} diff --git a/includes/header_r.html b/includes/header_r.html index bfc8b88..0e5cbe3 100644 --- a/includes/header_r.html +++ b/includes/header_r.html @@ -67,7 +67,7 @@