WooCommerce Germanized - Version 1.3.7

Version Description

  • Feature - is_ajax double-check for nasty themes
  • Fix - better checkout fallback mode
  • Fix - digital checkbox markup
Download this release

Release Info

Developer vendidero
Plugin Icon 128x128 WooCommerce Germanized
Version 1.3.7
Comparing to
See all releases

Code changes from version 1.3.6 to 1.3.7

Files changed (8) hide show
  1. i18n/languages/woocommerce-germanized-de_DE.mo +0 -0
  2. i18n/languages/woocommerce-germanized-de_DE.po +53 -62
  3. includes/admin/settings/class-wc-gzd-settings-germanized.php +2 -2
  4. includes/wc-gzd-template-functions.php +12 -14
  5. includes/wc-gzd-template-hooks.php +23 -6
  6. readme.txt +6 -1
  7. templates/checkout/review-order-fallback.php +0 -104
  8. woocommerce-germanized.php +26 -10
i18n/languages/woocommerce-germanized-de_DE.mo CHANGED
Binary file
i18n/languages/woocommerce-germanized-de_DE.po CHANGED
@@ -1,9 +1,9 @@
1
  msgid ""
2
  msgstr ""
3
- "Project-Id-Version: WooCommerce Germanized v1.3.5\n"
4
  "Report-Msgid-Bugs-To: \n"
5
  "POT-Creation-Date: 2014-09-29 12:26+0100\n"
6
- "PO-Revision-Date: 2015-07-20 11:18:49+0000\n"
7
  "Last-Translator: \n"
8
  "Language-Team: \n"
9
  "MIME-Version: 1.0\n"
@@ -105,39 +105,39 @@ msgstr "zu den WooCommerce Germanized Einstellungen"
105
  msgid "Cheatin’ huh?"
106
  msgstr "So geht das leider nicht.."
107
 
108
- #: includes/admin/class-wc-gzd-admin.php:107
109
  #@ woocommerce-germanized
110
  msgid "Optional Email Content"
111
  msgstr "Optionaler E-Mail Inhalt"
112
 
113
- #: includes/admin/class-wc-gzd-admin.php:116
114
  #@ woocommerce-germanized
115
  msgid "Add content which will be replacing default page content within emails."
116
  msgstr "Füllen Sie dieses Feld aus um einen abweichenden E-Mail Anhangstext für diese Seite zu bestimmen."
117
 
118
- #: includes/admin/class-wc-gzd-admin.php:125
119
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:75
120
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:134
121
  #@ woocommerce-germanized
122
  msgid "Optional Mini Description"
123
  msgstr "Warenkorb Kurzbeschreibung"
124
 
125
- #: includes/admin/class-wc-gzd-admin.php:142
126
  #@ woocommerce-germanized
127
  msgid "This content will be shown as short product description within checkout and emails."
128
  msgstr "Dieser Inhalt wird während des Bezahlvorganges und in den E-Mails als Produkt Kurzbeschreibung angezeigt."
129
 
130
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:40
131
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:92
132
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:33
133
  #: includes/class-wc-gzd-post-types.php:66
134
  #@ woocommerce-germanized
135
  msgid "Unit"
136
  msgstr "Einheit"
137
 
138
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:42
139
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:94
140
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:122
141
  #: includes/admin/settings/class-wc-gzd-settings-germanized.php:94
142
  #: includes/class-wc-gzd-trusted-shops.php:441
143
  #@ woocommerce-germanized
@@ -145,44 +145,44 @@ msgid "None"
145
  msgstr "Keine"
146
 
147
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:49
148
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:101
149
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:34
150
  #@ woocommerce-germanized
151
  msgid "Unit Base"
152
  msgstr "Anzahl Einheiten"
153
 
154
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:58
155
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:107
156
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:36
157
  #@ woocommerce-germanized
158
  msgid "Regular Unit Price"
159
  msgstr "Einheitspreis"
160
 
161
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:62
162
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:111
163
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:37
164
  #@ woocommerce-germanized
165
  msgid "Sale Unit Price"
166
  msgstr "Angebots-Einheitspreis"
167
 
168
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:68
169
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:117
170
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:44
171
  #@ woocommerce-germanized
172
  msgid "Delivery Time"
173
  msgstr "Lieferzeit"
174
 
175
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:33
176
  #@ woocommerce-germanized
177
  msgid "Select unit"
178
  msgstr "Einheit auswählen"
179
 
180
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:33
181
  #@ woocommerce-germanized
182
  msgid "Needed if selling on a per unit basis"
183
  msgstr "Notwendig falls auf pro-Einheit-Basis verkauft werden soll"
184
 
185
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:34
186
  #@ woocommerce-germanized
187
  msgid "Unit price per amount (e.g. 100)"
188
  msgstr "Anzahl der Einheiten, auf die sich der Einheitspreis bezieht"
@@ -1079,7 +1079,7 @@ msgstr "Zahlungsgebühr"
1079
 
1080
  #: includes/abstracts/abstract-wc-gzd-product.php:129
1081
  #: includes/wc-gzd-cart-functions.php:159
1082
- #: woocommerce-germanized.php:834
1083
  #, php-format
1084
  #@ woocommerce-germanized
1085
  msgid "incl. %s%% VAT"
@@ -1134,7 +1134,6 @@ msgstr "Gesamtsumme"
1134
 
1135
  #: templates/checkout/form-pay-2-2.php:57
1136
  #: templates/checkout/review-order-2-2.php:70
1137
- #: templates/checkout/review-order-fallback.php:17
1138
  #@ woocommerce
1139
  msgid "Product"
1140
  msgstr "Produkt"
@@ -1155,19 +1154,18 @@ msgstr "Es tut uns Leid! Leider gibt es für Sie aktuell keine passende Zahlungs
1155
  msgid "Your order"
1156
  msgstr "Ihre Bestellung"
1157
 
1158
- #: templates/checkout/order-submit.php:17
1159
  #: templates/checkout/review-order-2-2.php:168
1160
  #@ woocommerce
1161
  msgid "Since your browser does not support JavaScript, or it is disabled, please ensure you click the <em>Update Totals</em> button before placing your order. You may be charged more than the amount stated above if you fail to do so."
1162
  msgstr "Da Ihr Browser kein JavaScript erlaubt, denken Sie bitte daran, auf \"Gesamtsumme aktualisieren\" zu klicken, bevor Sie den Auftrag absenden. "
1163
 
1164
- #: templates/checkout/order-submit.php:17
1165
  #: templates/checkout/review-order-2-2.php:168
1166
  #@ woocommerce
1167
  msgid "Update totals"
1168
  msgstr "Gesamtsumme aktualisieren"
1169
 
1170
- #: templates/checkout/order-submit.php:28
1171
  #: templates/checkout/review-order-2-2.php:184
1172
  #, php-format
1173
  #@ woocommerce
@@ -1175,7 +1173,7 @@ msgid "I&rsquo;ve read and accept the <a href=\"%s\" target=\"_blank\">terms &am
1175
  msgstr "Ich habe die <a href=\"%s\" target=\"_blank\">Allgemeinen Geschäftsbedingungen</a> gelesen und akzeptiert."
1176
 
1177
  #: includes/wc-gzd-template-functions.php:363
1178
- #: templates/checkout/order-submit.php:24
1179
  #: templates/checkout/review-order-2-2.php:175
1180
  #@ woocommerce
1181
  msgid "Place order"
@@ -1264,7 +1262,7 @@ msgstr "Widerruf erklären"
1264
  msgid "VAT free based on &#167;19 UStG"
1265
  msgstr "Kein Mehrwertsteuerausweis, da Kleinunternehmer nach §19 (1) UStG."
1266
 
1267
- #: woocommerce-germanized.php:578
1268
  #@ woocommerce
1269
  msgid "Settings"
1270
  msgstr "Einstellungen"
@@ -1638,7 +1636,7 @@ msgstr "Versandkosten-Hinweis auch für virtuelle Produkte aktivieren?"
1638
 
1639
  #: includes/abstracts/abstract-wc-gzd-product.php:127
1640
  #: includes/wc-gzd-cart-functions.php:159
1641
- #: woocommerce-germanized.php:834
1642
  #@ woocommerce-germanized
1643
  msgid "incl. VAT"
1644
  msgstr "inkl. MwSt."
@@ -1877,8 +1875,6 @@ msgid "It seems like your theme tries to overwrite legally relevant templates. P
1877
  msgstr "Es sieht so aus als wenn dein aktuelles Theme versucht rechtlich relevante Templates (kritische Templates: %s) zu überschreiben. Bitte überprüfe deinen Shop und insbesondere den Bezahlvorgang. WooCommerce Germanized musste das Überschreiben dieser Templates verhindern um für Rechtssicherheit sorgen zu können. Bitte lies dazu <a href=\"%s\" target=\"_blank\">mein Theme kompatibel machen</a> oder schau dir das von uns entwickelte Theme <a href=\"%s\" target=\"_blank\">VendiPro</a> für 100&#37; Kompatibilität an."
1878
 
1879
  #: templates/checkout/review-order-2-2.php:71
1880
- #: templates/checkout/review-order-fallback.php:18
1881
- #: templates/checkout/review-order-fallback.php:97
1882
  #@ woocommerce
1883
  msgid "Total"
1884
  msgstr ""
@@ -1969,12 +1965,12 @@ msgstr "Wenn Sie bei %s kein Benutzerkonto eröffnet haben, ignorieren Sie diese
1969
  msgid "If you cannot follow the link above please copy this url and paste it to your browser bar: %s"
1970
  msgstr "Falls Sie dem Link nicht folgen können, kopieren Sie bitte folgende URL in die Adresszeile Ihres Browsers: %s"
1971
 
1972
- #: woocommerce-germanized.php:744
1973
  #@ woocommerce-germanized
1974
  msgid "Thank you. You have successfully activated your account."
1975
  msgstr "Vielen Dank. Ihr Benutzerkonto wurde erfolgreich aktiviert."
1976
 
1977
- #: woocommerce-germanized.php:748
1978
  #@ woocommerce-germanized
1979
  msgid "Sorry, but this activation code cannot be found."
1980
  msgstr "Sorry, dieser Aktivierungscode ist uns leider nicht bekannt."
@@ -1984,8 +1980,8 @@ msgstr "Sorry, dieser Aktivierungscode ist uns leider nicht bekannt."
1984
  msgid "days"
1985
  msgstr "Tagen"
1986
 
1987
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:69
1988
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:45
1989
  #@ woocommerce-germanized
1990
  msgid "Search for a delivery time&hellip;"
1991
  msgstr "Lieferzeit suchen&hellip;"
@@ -2014,16 +2010,6 @@ msgstr "https://vendidero.de"
2014
  msgid "Fallback Mode"
2015
  msgstr "Fallback Modus"
2016
 
2017
- #: includes/admin/settings/class-wc-gzd-settings-germanized.php:619
2018
- #@ woocommerce-germanized
2019
- msgid "Enable to make sure default review-order.php is not being overriden by theme."
2020
- msgstr "Dieser Modus unterdrückt das Überschreiben des review-order.php Templates."
2021
-
2022
- #: includes/admin/settings/class-wc-gzd-settings-germanized.php:623
2023
- #@ woocommerce-germanized
2024
- msgid "If you are facing problems within your checkout e.g. legally relevant data is not showing (terms, delivery time, unit price etc.) your theme seems to be incompatible (not using default WooCommerce hooks and filters). As a workaround you may use this fallback which ensures default review-order.php is used."
2025
- msgstr "Falls du Probleme mit dem Checkout hast - es fehlen z.B. rechtlich relevante Dinge wie der AGB/Widerrufsbelehrung Hinweis, Lieferzeit, Einheitspreis etc. - dann scheint dein Theme inkompatibel zu sein (Aktiviere ein Default-WP-Theme um das zu testen). Als Workaround kannst du diesen Fallback-Modus nutzen, der dafür sorgt, dass die Datei review-order.php auf keinen Fall vom Theme überschrieben wird."
2026
-
2027
  #: includes/class-wc-gzd-trusted-shops.php:412
2028
  #@ woocommerce-germanized
2029
  msgctxt "trusted-shops"
@@ -2136,11 +2122,6 @@ msgstr "Neue Einheit anlegen"
2136
  msgid "New Unit Name"
2137
  msgstr "Name der neuen Einheit"
2138
 
2139
- #: templates/checkout/review-order-fallback.php:50
2140
- #@ woocommerce
2141
- msgid "Subtotal"
2142
- msgstr ""
2143
-
2144
  #: templates/global/small-business-info.php:15
2145
  #@ woocommerce-germanized
2146
  msgid "Because of the small business owner state according to &#167;19 UstG the seller does not levy nor state the German value added tax."
@@ -2374,7 +2355,7 @@ msgstr "Füge einen jetzt bezahlen - Button zur E-Mail und der Bestätigungs-Sei
2374
  msgid "Add a pay now button to order confirmation email and order success page if the order awaits payment (PayPal etc)."
2375
  msgstr "Füge einen jetzt bezahlen - Button zur Bestellbestätigungs-Email sowie zur Bestätigungs-Seite hinzu insofern die Bestellung eine automatisierte Zahlung benötigt (z.B. per PayPal)."
2376
 
2377
- #: includes/wc-gzd-template-functions.php:426
2378
  #@ woocommerce-germanized
2379
  msgid "Please accept the creation of a new customer account"
2380
  msgstr "Bitte akzeptieren Sie die Erstellung eines neuen Kundenkontos"
@@ -2533,7 +2514,7 @@ msgstr ""
2533
  #: includes/admin/settings/class-wc-gzd-settings-germanized.php:629
2534
  #@ woocommerce-germanized
2535
  msgid "Force free shipping"
2536
- msgstr "Kostenlosen Versand erzwingen"
2537
 
2538
  #: includes/admin/settings/class-wc-gzd-settings-germanized.php:630
2539
  #@ woocommerce-germanized
@@ -2546,20 +2527,30 @@ msgid "By default WooCommerce will let customers choose other shipping methods t
2546
  msgstr "Standardmäßig erlaubt WooCommerce die Auswahl anderer Versandmethoden, auch wenn kostenloser Versand möglich ist. Diese Option erzwingt den kostenlosen Versand, sobald dieser verfügbar ist."
2547
 
2548
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:53
2549
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:35
2550
  #@ woocommerce-germanized
2551
  msgid "Calculation"
2552
  msgstr "Berechnung"
2553
 
2554
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:55
2555
- #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:35
2556
  #@ woocommerce-germanized
2557
  msgid "Calculate unit prices automatically based on product price"
2558
  msgstr "Einheitspreise basierend auf dem Produktpreis automatisch berechnen"
2559
 
 
 
 
 
 
 
 
 
 
 
2560
  #. translators: plugin header field 'Version'
2561
  #: woocommerce-germanized.php:0
2562
  #@ woocommerce-germanized
2563
- msgid "1.3.5"
2564
- msgstr "1.3.5"
2565
 
1
  msgid ""
2
  msgstr ""
3
+ "Project-Id-Version: WooCommerce Germanized v1.3.6\n"
4
  "Report-Msgid-Bugs-To: \n"
5
  "POT-Creation-Date: 2014-09-29 12:26+0100\n"
6
+ "PO-Revision-Date: 2015-08-13 19:42:29+0000\n"
7
  "Last-Translator: \n"
8
  "Language-Team: \n"
9
  "MIME-Version: 1.0\n"
105
  msgid "Cheatin&#8217; huh?"
106
  msgstr "So geht das leider nicht.."
107
 
108
+ #: includes/admin/class-wc-gzd-admin.php:103
109
  #@ woocommerce-germanized
110
  msgid "Optional Email Content"
111
  msgstr "Optionaler E-Mail Inhalt"
112
 
113
+ #: includes/admin/class-wc-gzd-admin.php:112
114
  #@ woocommerce-germanized
115
  msgid "Add content which will be replacing default page content within emails."
116
  msgstr "Füllen Sie dieses Feld aus um einen abweichenden E-Mail Anhangstext für diese Seite zu bestimmen."
117
 
118
+ #: includes/admin/class-wc-gzd-admin.php:121
119
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:77
120
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:137
121
  #@ woocommerce-germanized
122
  msgid "Optional Mini Description"
123
  msgstr "Warenkorb Kurzbeschreibung"
124
 
125
+ #: includes/admin/class-wc-gzd-admin.php:138
126
  #@ woocommerce-germanized
127
  msgid "This content will be shown as short product description within checkout and emails."
128
  msgstr "Dieser Inhalt wird während des Bezahlvorganges und in den E-Mails als Produkt Kurzbeschreibung angezeigt."
129
 
130
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:40
131
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:95
132
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:37
133
  #: includes/class-wc-gzd-post-types.php:66
134
  #@ woocommerce-germanized
135
  msgid "Unit"
136
  msgstr "Einheit"
137
 
138
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:42
139
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:97
140
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:125
141
  #: includes/admin/settings/class-wc-gzd-settings-germanized.php:94
142
  #: includes/class-wc-gzd-trusted-shops.php:441
143
  #@ woocommerce-germanized
145
  msgstr "Keine"
146
 
147
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:49
148
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:104
149
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:38
150
  #@ woocommerce-germanized
151
  msgid "Unit Base"
152
  msgstr "Anzahl Einheiten"
153
 
154
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:61
155
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:110
156
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:41
157
  #@ woocommerce-germanized
158
  msgid "Regular Unit Price"
159
  msgstr "Einheitspreis"
160
 
161
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:65
162
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:114
163
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:42
164
  #@ woocommerce-germanized
165
  msgid "Sale Unit Price"
166
  msgstr "Angebots-Einheitspreis"
167
 
168
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:71
169
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:120
170
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:61
171
  #@ woocommerce-germanized
172
  msgid "Delivery Time"
173
  msgstr "Lieferzeit"
174
 
175
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:37
176
  #@ woocommerce-germanized
177
  msgid "Select unit"
178
  msgstr "Einheit auswählen"
179
 
180
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:37
181
  #@ woocommerce-germanized
182
  msgid "Needed if selling on a per unit basis"
183
  msgstr "Notwendig falls auf pro-Einheit-Basis verkauft werden soll"
184
 
185
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:38
186
  #@ woocommerce-germanized
187
  msgid "Unit price per amount (e.g. 100)"
188
  msgstr "Anzahl der Einheiten, auf die sich der Einheitspreis bezieht"
1079
 
1080
  #: includes/abstracts/abstract-wc-gzd-product.php:129
1081
  #: includes/wc-gzd-cart-functions.php:159
1082
+ #: woocommerce-germanized.php:854
1083
  #, php-format
1084
  #@ woocommerce-germanized
1085
  msgid "incl. %s%% VAT"
1134
 
1135
  #: templates/checkout/form-pay-2-2.php:57
1136
  #: templates/checkout/review-order-2-2.php:70
 
1137
  #@ woocommerce
1138
  msgid "Product"
1139
  msgstr "Produkt"
1154
  msgid "Your order"
1155
  msgstr "Ihre Bestellung"
1156
 
1157
+ #: templates/checkout/order-submit.php:18
1158
  #: templates/checkout/review-order-2-2.php:168
1159
  #@ woocommerce
1160
  msgid "Since your browser does not support JavaScript, or it is disabled, please ensure you click the <em>Update Totals</em> button before placing your order. You may be charged more than the amount stated above if you fail to do so."
1161
  msgstr "Da Ihr Browser kein JavaScript erlaubt, denken Sie bitte daran, auf \"Gesamtsumme aktualisieren\" zu klicken, bevor Sie den Auftrag absenden. "
1162
 
1163
+ #: templates/checkout/order-submit.php:18
1164
  #: templates/checkout/review-order-2-2.php:168
1165
  #@ woocommerce
1166
  msgid "Update totals"
1167
  msgstr "Gesamtsumme aktualisieren"
1168
 
 
1169
  #: templates/checkout/review-order-2-2.php:184
1170
  #, php-format
1171
  #@ woocommerce
1173
  msgstr "Ich habe die <a href=\"%s\" target=\"_blank\">Allgemeinen Geschäftsbedingungen</a> gelesen und akzeptiert."
1174
 
1175
  #: includes/wc-gzd-template-functions.php:363
1176
+ #: templates/checkout/order-submit.php:25
1177
  #: templates/checkout/review-order-2-2.php:175
1178
  #@ woocommerce
1179
  msgid "Place order"
1262
  msgid "VAT free based on &#167;19 UStG"
1263
  msgstr "Kein Mehrwertsteuerausweis, da Kleinunternehmer nach §19 (1) UStG."
1264
 
1265
+ #: woocommerce-germanized.php:593
1266
  #@ woocommerce
1267
  msgid "Settings"
1268
  msgstr "Einstellungen"
1636
 
1637
  #: includes/abstracts/abstract-wc-gzd-product.php:127
1638
  #: includes/wc-gzd-cart-functions.php:159
1639
+ #: woocommerce-germanized.php:854
1640
  #@ woocommerce-germanized
1641
  msgid "incl. VAT"
1642
  msgstr "inkl. MwSt."
1875
  msgstr "Es sieht so aus als wenn dein aktuelles Theme versucht rechtlich relevante Templates (kritische Templates: %s) zu überschreiben. Bitte überprüfe deinen Shop und insbesondere den Bezahlvorgang. WooCommerce Germanized musste das Überschreiben dieser Templates verhindern um für Rechtssicherheit sorgen zu können. Bitte lies dazu <a href=\"%s\" target=\"_blank\">mein Theme kompatibel machen</a> oder schau dir das von uns entwickelte Theme <a href=\"%s\" target=\"_blank\">VendiPro</a> für 100&#37; Kompatibilität an."
1876
 
1877
  #: templates/checkout/review-order-2-2.php:71
 
 
1878
  #@ woocommerce
1879
  msgid "Total"
1880
  msgstr ""
1965
  msgid "If you cannot follow the link above please copy this url and paste it to your browser bar: %s"
1966
  msgstr "Falls Sie dem Link nicht folgen können, kopieren Sie bitte folgende URL in die Adresszeile Ihres Browsers: %s"
1967
 
1968
+ #: woocommerce-germanized.php:758
1969
  #@ woocommerce-germanized
1970
  msgid "Thank you. You have successfully activated your account."
1971
  msgstr "Vielen Dank. Ihr Benutzerkonto wurde erfolgreich aktiviert."
1972
 
1973
+ #: woocommerce-germanized.php:762
1974
  #@ woocommerce-germanized
1975
  msgid "Sorry, but this activation code cannot be found."
1976
  msgstr "Sorry, dieser Aktivierungscode ist uns leider nicht bekannt."
1980
  msgid "days"
1981
  msgstr "Tagen"
1982
 
1983
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:72
1984
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:62
1985
  #@ woocommerce-germanized
1986
  msgid "Search for a delivery time&hellip;"
1987
  msgstr "Lieferzeit suchen&hellip;"
2010
  msgid "Fallback Mode"
2011
  msgstr "Fallback Modus"
2012
 
 
 
 
 
 
 
 
 
 
 
2013
  #: includes/class-wc-gzd-trusted-shops.php:412
2014
  #@ woocommerce-germanized
2015
  msgctxt "trusted-shops"
2122
  msgid "New Unit Name"
2123
  msgstr "Name der neuen Einheit"
2124
 
 
 
 
 
 
2125
  #: templates/global/small-business-info.php:15
2126
  #@ woocommerce-germanized
2127
  msgid "Because of the small business owner state according to &#167;19 UstG the seller does not levy nor state the German value added tax."
2355
  msgid "Add a pay now button to order confirmation email and order success page if the order awaits payment (PayPal etc)."
2356
  msgstr "Füge einen jetzt bezahlen - Button zur Bestellbestätigungs-Email sowie zur Bestätigungs-Seite hinzu insofern die Bestellung eine automatisierte Zahlung benötigt (z.B. per PayPal)."
2357
 
2358
+ #: includes/wc-gzd-template-functions.php:434
2359
  #@ woocommerce-germanized
2360
  msgid "Please accept the creation of a new customer account"
2361
  msgstr "Bitte akzeptieren Sie die Erstellung eines neuen Kundenkontos"
2514
  #: includes/admin/settings/class-wc-gzd-settings-germanized.php:629
2515
  #@ woocommerce-germanized
2516
  msgid "Force free shipping"
2517
+ msgstr "Versandmethode erzwingen"
2518
 
2519
  #: includes/admin/settings/class-wc-gzd-settings-germanized.php:630
2520
  #@ woocommerce-germanized
2527
  msgstr "Standardmäßig erlaubt WooCommerce die Auswahl anderer Versandmethoden, auch wenn kostenloser Versand möglich ist. Diese Option erzwingt den kostenlosen Versand, sobald dieser verfügbar ist."
2528
 
2529
  #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:53
2530
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:39
2531
  #@ woocommerce-germanized
2532
  msgid "Calculation"
2533
  msgstr "Berechnung"
2534
 
2535
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data-variable.php:56
2536
+ #: includes/admin/meta-boxes/class-wc-gzd-meta-box-product-data.php:39
2537
  #@ woocommerce-germanized
2538
  msgid "Calculate unit prices automatically based on product price"
2539
  msgstr "Einheitspreise basierend auf dem Produktpreis automatisch berechnen"
2540
 
2541
+ #: includes/admin/settings/class-wc-gzd-settings-germanized.php:619
2542
+ #@ woocommerce-germanized
2543
+ msgid "Enable to make sure default checkout template is not being overriden by theme."
2544
+ msgstr "Überschreiben relevanter Templates im Checkout durch dein Theme verhindern."
2545
+
2546
+ #: includes/admin/settings/class-wc-gzd-settings-germanized.php:623
2547
+ #@ woocommerce-germanized
2548
+ msgid "If you are facing problems within your checkout e.g. legally relevant data is not showing (terms, delivery time, unit price etc.) your theme seems to be incompatible (not using default WooCommerce hooks and filters). As a workaround you may use this fallback which ensures default review-order.php and form-checkout.php is used."
2549
+ msgstr "Wenn du Probleme während des Checkouts hast (Inhalte werden falsch, nicht oder doppelt dargestellt), dann könntest du als Workaround diese Option aktivieren. Diese Option hindert dein Theme relevante Templates für den Checkout (review-order.php und form-checkout.php) zu überschreiben. "
2550
+
2551
  #. translators: plugin header field 'Version'
2552
  #: woocommerce-germanized.php:0
2553
  #@ woocommerce-germanized
2554
+ msgid "1.3.6"
2555
+ msgstr "1.3.6"
2556
 
includes/admin/settings/class-wc-gzd-settings-germanized.php CHANGED
@@ -616,11 +616,11 @@ class WC_GZD_Settings_Germanized extends WC_Settings_Page {
616
 
617
  array(
618
  'title' => __( 'Fallback Mode', 'woocommerce-germanized' ),
619
- 'desc' => __( 'Enable to make sure default review-order.php is not being overriden by theme.', 'woocommerce-germanized' ),
620
  'id' => 'woocommerce_gzd_display_checkout_fallback',
621
  'default' => 'no',
622
  'type' => 'checkbox',
623
- 'desc_tip' => __( 'If you are facing problems within your checkout e.g. legally relevant data is not showing (terms, delivery time, unit price etc.) your theme seems to be incompatible (not using default WooCommerce hooks and filters). As a workaround you may use this fallback which ensures default review-order.php is used.', 'woocommerce-germanized' ),
624
  )
625
 
626
  : array() ),
616
 
617
  array(
618
  'title' => __( 'Fallback Mode', 'woocommerce-germanized' ),
619
+ 'desc' => __( 'Enable to make sure default checkout template is not being overriden by theme.', 'woocommerce-germanized' ),
620
  'id' => 'woocommerce_gzd_display_checkout_fallback',
621
  'default' => 'no',
622
  'type' => 'checkbox',
623
+ 'desc_tip' => __( 'If you are facing problems within your checkout e.g. legally relevant data is not showing (terms, delivery time, unit price etc.) your theme seems to be incompatible (not using default WooCommerce hooks and filters). As a workaround you may use this fallback which ensures default review-order.php and form-checkout.php is used.', 'woocommerce-germanized' ),
624
  )
625
 
626
  : array() ),
includes/wc-gzd-template-functions.php CHANGED
@@ -184,9 +184,10 @@ if ( ! function_exists( 'woocommerce_gzd_digital_checkbox' ) ) {
184
  }
185
  }
186
  if ( $is_downloadable ) {
187
- echo '<p class="form-row data-download terms">
188
- <input type="checkbox" class="input-checkbox" name="download-revocate" id="data-download" />
189
- <label for="data-download" class="checkbox">' . wc_gzd_get_legal_text_digital() . '</label>
 
190
  </p>';
191
  }
192
  }
@@ -219,17 +220,6 @@ if ( ! function_exists( 'woocommerce_gzd_checkout_validation' ) ) {
219
 
220
  }
221
 
222
- if ( ! function_exists( 'woocommerce_gzd_remove_term_checkbox' ) ) {
223
-
224
- /**
225
- * Removes default term checkbox
226
- */
227
- function woocommerce_gzd_remove_term_checkbox() {
228
- return false;
229
- }
230
-
231
- }
232
-
233
  if ( ! function_exists( 'woocommerce_gzd_template_checkout_set_terms_manually' ) ) {
234
 
235
  /**
@@ -410,6 +400,14 @@ if ( ! function_exists( 'woocommerce_gzd_template_set_order_button_show_filter'
410
 
411
  }
412
 
 
 
 
 
 
 
 
 
413
  if ( ! function_exists( 'woocommerce_gzd_template_customer_account_checkbox' ) ) {
414
 
415
  function woocommerce_gzd_template_customer_account_checkbox() {
184
  }
185
  }
186
  if ( $is_downloadable ) {
187
+ echo '<p class="form-row data-download terms legal">
188
+ <label for="data-download" class="checkbox">
189
+ <input type="checkbox" class="input-checkbox" name="download-revocate" id="data-download" /> ' . wc_gzd_get_legal_text_digital() . '
190
+ </label>
191
  </p>';
192
  }
193
  }
220
 
221
  }
222
 
 
 
 
 
 
 
 
 
 
 
 
223
  if ( ! function_exists( 'woocommerce_gzd_template_checkout_set_terms_manually' ) ) {
224
 
225
  /**
400
 
401
  }
402
 
403
+ if ( ! function_exists( 'woocommerce_gzd_template_set_wc_terms_hide' ) ) {
404
+
405
+ function woocommerce_gzd_template_set_wc_terms_hide( $show ) {
406
+ return false;
407
+ }
408
+
409
+ }
410
+
411
  if ( ! function_exists( 'woocommerce_gzd_template_customer_account_checkbox' ) ) {
412
 
413
  function woocommerce_gzd_template_customer_account_checkbox() {
includes/wc-gzd-template-hooks.php CHANGED
@@ -65,26 +65,43 @@ if ( get_option( 'woocommerce_gzd_display_checkout_edit_data_notice' ) == 'yes'
65
  add_action( 'woocommerce_before_order_notes', 'woocommerce_gzd_template_checkout_edit_data_notice', wc_gzd_get_hook_priority( 'checkout_edit_data_notice' ), 1 );
66
 
67
  // Do only hook if is no ajax request - fallback if theme misses no-ajax-check before applying hooks & filters
68
- if ( ! is_ajax() && version_compare( WC_VERSION, '2.3', '>=' ) ) {
69
 
 
 
 
 
70
  // Make sure payment form goes before order review
71
  WC_GZD_Hook_Priorities::instance()->change_priority( 'woocommerce_checkout_order_review', 'woocommerce_order_review', wc_gzd_get_hook_priority( 'checkout_order_review' ) );
72
  WC_GZD_Hook_Priorities::instance()->change_priority( 'woocommerce_checkout_order_review', 'woocommerce_checkout_payment', wc_gzd_get_hook_priority( 'checkout_payment' ) );
73
 
74
- add_action( 'woocommerce_checkout_order_review', 'woocommerce_gzd_template_order_submit', wc_gzd_get_hook_priority( 'checkout_order_submit' ) );
75
- add_action( 'woocommerce_review_order_after_payment', 'woocommerce_gzd_template_checkout_legal', wc_gzd_get_hook_priority( 'checkout_legal' ) );
76
- add_action( 'woocommerce_review_order_after_payment', 'woocommerce_gzd_template_checkout_set_terms_manually', wc_gzd_get_hook_priority( 'checkout_set_terms' ) );
 
 
 
77
  // Temporarily remove order button from payment.php - then add again to show after product table
78
  add_action( 'woocommerce_review_order_before_submit', 'woocommerce_gzd_template_set_order_button_remove_filter', PHP_INT_MAX );
79
  add_action( 'woocommerce_review_order_after_submit', 'woocommerce_gzd_template_set_order_button_show_filter', PHP_INT_MAX );
80
  add_action( 'woocommerce_gzd_review_order_before_submit', 'woocommerce_gzd_template_set_order_button_show_filter', PHP_INT_MAX );
 
 
 
 
 
 
 
 
 
 
 
 
81
  if ( get_option( 'woocommerce_gzd_checkout_legal_digital_checkbox' ) == 'yes' )
82
  add_action( 'woocommerce_review_order_after_payment', 'woocommerce_gzd_digital_checkbox', wc_gzd_get_hook_priority( 'checkout_digital_checkbox' ) );
83
 
84
  // Add payment title heading
85
  add_action( 'woocommerce_review_order_before_payment', 'woocommerce_gzd_template_checkout_payment_title' );
86
- // Remove default term box
87
- add_filter( 'woocommerce_checkout_show_terms', 'woocommerce_gzd_remove_term_checkbox' );
88
 
89
  }
90
 
65
  add_action( 'woocommerce_before_order_notes', 'woocommerce_gzd_template_checkout_edit_data_notice', wc_gzd_get_hook_priority( 'checkout_edit_data_notice' ), 1 );
66
 
67
  // Do only hook if is no ajax request - fallback if theme misses no-ajax-check before applying hooks & filters
68
+ if ( version_compare( WC_VERSION, '2.3', '>=' ) ) {
69
 
70
+ // Remove default priorities
71
+ remove_action( 'woocommerce_checkout_order_review', 'woocommerce_order_review', 10 );
72
+ remove_action( 'woocommerce_checkout_order_review', 'woocommerce_checkout_payment', 20 );
73
+
74
  // Make sure payment form goes before order review
75
  WC_GZD_Hook_Priorities::instance()->change_priority( 'woocommerce_checkout_order_review', 'woocommerce_order_review', wc_gzd_get_hook_priority( 'checkout_order_review' ) );
76
  WC_GZD_Hook_Priorities::instance()->change_priority( 'woocommerce_checkout_order_review', 'woocommerce_checkout_payment', wc_gzd_get_hook_priority( 'checkout_payment' ) );
77
 
78
+ // Load ajax relevant hooks
79
+ add_action( 'init', 'woocommerce_gzd_checkout_load_ajax_relevant_hooks' );
80
+
81
+ // Remove WooCommerce Terms checkbox
82
+ add_filter( 'woocommerce_checkout_show_terms', 'woocommerce_gzd_template_set_wc_terms_hide', 100 );
83
+
84
  // Temporarily remove order button from payment.php - then add again to show after product table
85
  add_action( 'woocommerce_review_order_before_submit', 'woocommerce_gzd_template_set_order_button_remove_filter', PHP_INT_MAX );
86
  add_action( 'woocommerce_review_order_after_submit', 'woocommerce_gzd_template_set_order_button_show_filter', PHP_INT_MAX );
87
  add_action( 'woocommerce_gzd_review_order_before_submit', 'woocommerce_gzd_template_set_order_button_show_filter', PHP_INT_MAX );
88
+
89
+ }
90
+
91
+ function woocommerce_gzd_checkout_load_ajax_relevant_hooks() {
92
+
93
+ if ( is_ajax() )
94
+ return;
95
+
96
+ add_action( 'woocommerce_checkout_order_review', 'woocommerce_gzd_template_order_submit', wc_gzd_get_hook_priority( 'checkout_order_submit' ) );
97
+ add_action( 'woocommerce_review_order_after_payment', 'woocommerce_gzd_template_checkout_legal', wc_gzd_get_hook_priority( 'checkout_legal' ) );
98
+ add_action( 'woocommerce_review_order_after_payment', 'woocommerce_gzd_template_checkout_set_terms_manually', wc_gzd_get_hook_priority( 'checkout_set_terms' ) );
99
+
100
  if ( get_option( 'woocommerce_gzd_checkout_legal_digital_checkbox' ) == 'yes' )
101
  add_action( 'woocommerce_review_order_after_payment', 'woocommerce_gzd_digital_checkbox', wc_gzd_get_hook_priority( 'checkout_digital_checkbox' ) );
102
 
103
  // Add payment title heading
104
  add_action( 'woocommerce_review_order_before_payment', 'woocommerce_gzd_template_checkout_payment_title' );
 
 
105
 
106
  }
107
 
readme.txt CHANGED
@@ -4,7 +4,7 @@ Tags: woocommerce, german market, german, germany, deutsch, deutschland, de, de_
4
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=info@vendidero.de&item_name=Donation+for+WooCommerce+Germanized
5
  Requires at least: 3.8
6
  Tested up to: 4.3
7
- Stable tag: 1.3.6
8
  License: GPLv3
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
@@ -163,6 +163,11 @@ Bugs sowie Hilfe bei der Arbeit an WooCommerce Germanized werden gerne über uns
163
 
164
  == Changelog ==
165
 
 
 
 
 
 
166
  = 1.3.6 =
167
  * Feature - WC 2.4 compatibility
168
  * Fix - better checkbox html syntax
4
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=info@vendidero.de&item_name=Donation+for+WooCommerce+Germanized
5
  Requires at least: 3.8
6
  Tested up to: 4.3
7
+ Stable tag: 1.3.7
8
  License: GPLv3
9
  License URI: http://www.gnu.org/licenses/gpl-3.0.html
10
 
163
 
164
  == Changelog ==
165
 
166
+ = 1.3.7 =
167
+ * Feature - is_ajax double-check for nasty themes
168
+ * Fix - better checkout fallback mode
169
+ * Fix - digital checkbox markup
170
+
171
  = 1.3.6 =
172
  * Feature - WC 2.4 compatibility
173
  * Fix - better checkbox html syntax
templates/checkout/review-order-fallback.php DELETED
@@ -1,104 +0,0 @@
1
- <?php
2
- /**
3
- * Review order table
4
- *
5
- * @author WooThemes
6
- * @package WooCommerce/Templates
7
- * @version 2.3.0
8
- */
9
-
10
- if ( ! defined( 'ABSPATH' ) ) {
11
- exit;
12
- }
13
- ?>
14
- <table class="shop_table woocommerce-checkout-review-order-table">
15
- <thead>
16
- <tr>
17
- <th class="product-name"><?php _e( 'Product', 'woocommerce' ); ?></th>
18
- <th class="product-total"><?php _e( 'Total', 'woocommerce' ); ?></th>
19
- </tr>
20
- </thead>
21
- <tbody>
22
- <?php
23
- do_action( 'woocommerce_review_order_before_cart_contents' );
24
-
25
- foreach ( WC()->cart->get_cart() as $cart_item_key => $cart_item ) {
26
- $_product = apply_filters( 'woocommerce_cart_item_product', $cart_item['data'], $cart_item, $cart_item_key );
27
-
28
- if ( $_product && $_product->exists() && $cart_item['quantity'] > 0 && apply_filters( 'woocommerce_checkout_cart_item_visible', true, $cart_item, $cart_item_key ) ) {
29
- ?>
30
- <tr class="<?php echo esc_attr( apply_filters( 'woocommerce_cart_item_class', 'cart_item', $cart_item, $cart_item_key ) ); ?>">
31
- <td class="product-name">
32
- <?php echo apply_filters( 'woocommerce_cart_item_name', $_product->get_title(), $cart_item, $cart_item_key ); ?>
33
- <?php echo apply_filters( 'woocommerce_checkout_cart_item_quantity', ' <strong class="product-quantity">' . sprintf( '&times; %s', $cart_item['quantity'] ) . '</strong>', $cart_item, $cart_item_key ); ?>
34
- <?php echo WC()->cart->get_item_data( $cart_item ); ?>
35
- </td>
36
- <td class="product-total">
37
- <?php echo apply_filters( 'woocommerce_cart_item_subtotal', WC()->cart->get_product_subtotal( $_product, $cart_item['quantity'] ), $cart_item, $cart_item_key ); ?>
38
- </td>
39
- </tr>
40
- <?php
41
- }
42
- }
43
-
44
- do_action( 'woocommerce_review_order_after_cart_contents' );
45
- ?>
46
- </tbody>
47
- <tfoot>
48
-
49
- <tr class="cart-subtotal">
50
- <th><?php _e( 'Subtotal', 'woocommerce' ); ?></th>
51
- <td><?php wc_cart_totals_subtotal_html(); ?></td>
52
- </tr>
53
-
54
- <?php foreach ( WC()->cart->get_coupons() as $code => $coupon ) : ?>
55
- <tr class="cart-discount coupon-<?php echo esc_attr( $code ); ?>">
56
- <th><?php wc_cart_totals_coupon_label( $coupon ); ?></th>
57
- <td><?php wc_cart_totals_coupon_html( $coupon ); ?></td>
58
- </tr>
59
- <?php endforeach; ?>
60
-
61
- <?php if ( WC()->cart->needs_shipping() && WC()->cart->show_shipping() ) : ?>
62
-
63
- <?php do_action( 'woocommerce_review_order_before_shipping' ); ?>
64
-
65
- <?php wc_cart_totals_shipping_html(); ?>
66
-
67
- <?php do_action( 'woocommerce_review_order_after_shipping' ); ?>
68
-
69
- <?php endif; ?>
70
-
71
- <?php foreach ( WC()->cart->get_fees() as $fee ) : ?>
72
- <tr class="fee">
73
- <th><?php echo esc_html( $fee->name ); ?></th>
74
- <td><?php wc_cart_totals_fee_html( $fee ); ?></td>
75
- </tr>
76
- <?php endforeach; ?>
77
-
78
- <?php if ( WC()->cart->tax_display_cart === 'excl' ) : ?>
79
- <?php if ( get_option( 'woocommerce_tax_total_display' ) === 'itemized' ) : ?>
80
- <?php foreach ( WC()->cart->get_tax_totals() as $code => $tax ) : ?>
81
- <tr class="tax-rate tax-rate-<?php echo sanitize_title( $code ); ?>">
82
- <th><?php echo esc_html( $tax->label ); ?></th>
83
- <td><?php echo wp_kses_post( $tax->formatted_amount ); ?></td>
84
- </tr>
85
- <?php endforeach; ?>
86
- <?php else : ?>
87
- <tr class="tax-total">
88
- <th><?php echo esc_html( WC()->countries->tax_or_vat() ); ?></th>
89
- <td><?php echo wc_price( WC()->cart->get_taxes_total() ); ?></td>
90
- </tr>
91
- <?php endif; ?>
92
- <?php endif; ?>
93
-
94
- <?php do_action( 'woocommerce_review_order_before_order_total' ); ?>
95
-
96
- <tr class="order-total">
97
- <th><?php _e( 'Total', 'woocommerce' ); ?></th>
98
- <td><?php wc_cart_totals_order_total_html(); ?></td>
99
- </tr>
100
-
101
- <?php do_action( 'woocommerce_review_order_after_order_total' ); ?>
102
-
103
- </tfoot>
104
- </table>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
woocommerce-germanized.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: WooCommerce Germanized
4
  * Plugin URI: https://www.vendidero.de/woocommerce-germanized
5
  * Description: Extends WooCommerce to become a legally compliant store for the german market.
6
- * Version: 1.3.6
7
  * Author: Vendidero
8
  * Author URI: https://vendidero.de
9
  * Requires at least: 3.8
@@ -26,7 +26,7 @@ final class WooCommerce_Germanized {
26
  *
27
  * @var string
28
  */
29
- public $version = '1.3.6';
30
 
31
  /**
32
  * Single instance of WooCommerce Germanized Main Class
@@ -154,12 +154,16 @@ final class WooCommerce_Germanized {
154
 
155
  add_filter( 'woocommerce_locate_template', array( $this, 'filter_templates' ), PHP_INT_MAX, 3 );
156
 
157
- if ( version_compare( WC()->version, '2.3', '<' ) ) {
 
158
  add_filter( 'woocommerce_gzd_default_plugin_template', array( $this, 'filter_templates_old_version' ), 0, 2 );
 
159
  } else {
 
160
  add_filter( 'woocommerce_gzd_important_templates', array( $this, 'set_critical_templates_2_3' ) );
 
161
  if ( get_option( 'woocommerce_gzd_display_checkout_fallback' ) == 'yes' )
162
- add_filter( 'woocommerce_gzd_template_name', array( $this, 'set_review_order_fallback' ) );
163
  }
164
 
165
  add_filter( 'woocommerce_get_settings_pages', array( $this, 'add_settings' ) );
@@ -176,7 +180,7 @@ final class WooCommerce_Germanized {
176
  add_filter( 'woocommerce_get_order_item_totals', array( $this, 'order_item_totals' ), 0, 2 );
177
  // Unsure wether this could lead to future problems - tax classes with same name wont be merged anylonger
178
  //add_filter( 'woocommerce_rate_code', array( $this, 'prevent_tax_name_merge' ), PHP_INT_MAX, 2 );
179
-
180
  // Adjust virtual Product Price and tax class
181
  add_filter( 'woocommerce_get_price_including_tax', array( $this, 'set_virtual_product_price' ), PHP_INT_MAX, 3 );
182
  // Fallback gzd_product injection if not using wc_get_product
@@ -467,10 +471,16 @@ final class WooCommerce_Germanized {
467
  * @param string $template_name
468
  * @return string
469
  */
470
- public function set_review_order_fallback( $template_name ) {
471
- if ( strstr( $template_name, "review-order.php" ) )
472
- return 'checkout/review-order-fallback.php';
473
- return $template_name;
 
 
 
 
 
 
474
  }
475
 
476
  /**
@@ -792,10 +802,16 @@ final class WooCommerce_Germanized {
792
  * @return adjusted price
793
  */
794
  public function set_virtual_product_price( $price, $qty, $product ) {
795
- if ( ! $product->gzd_product->is_virtual_vat_exception() || ! isset( WC()->cart ) || ! WC()->cart->is_virtual_taxable() )
 
796
  return $price;
 
 
 
 
797
  if ( get_option( 'woocommerce_prices_include_tax' ) === 'yes' )
798
  return $product->get_price() * $qty;
 
799
  return $price;
800
  }
801
 
3
  * Plugin Name: WooCommerce Germanized
4
  * Plugin URI: https://www.vendidero.de/woocommerce-germanized
5
  * Description: Extends WooCommerce to become a legally compliant store for the german market.
6
+ * Version: 1.3.7
7
  * Author: Vendidero
8
  * Author URI: https://vendidero.de
9
  * Requires at least: 3.8
26
  *
27
  * @var string
28
  */
29
+ public $version = '1.3.7';
30
 
31
  /**
32
  * Single instance of WooCommerce Germanized Main Class
154
 
155
  add_filter( 'woocommerce_locate_template', array( $this, 'filter_templates' ), PHP_INT_MAX, 3 );
156
 
157
+ if ( version_compare( get_option( 'woocommerce_version' ), '2.3', '<' ) ) {
158
+
159
  add_filter( 'woocommerce_gzd_default_plugin_template', array( $this, 'filter_templates_old_version' ), 0, 2 );
160
+
161
  } else {
162
+
163
  add_filter( 'woocommerce_gzd_important_templates', array( $this, 'set_critical_templates_2_3' ) );
164
+
165
  if ( get_option( 'woocommerce_gzd_display_checkout_fallback' ) == 'yes' )
166
+ add_filter( 'woocommerce_germanized_filter_template', array( $this, 'set_checkout_fallback' ), 10, 3 );
167
  }
168
 
169
  add_filter( 'woocommerce_get_settings_pages', array( $this, 'add_settings' ) );
180
  add_filter( 'woocommerce_get_order_item_totals', array( $this, 'order_item_totals' ), 0, 2 );
181
  // Unsure wether this could lead to future problems - tax classes with same name wont be merged anylonger
182
  //add_filter( 'woocommerce_rate_code', array( $this, 'prevent_tax_name_merge' ), PHP_INT_MAX, 2 );
183
+
184
  // Adjust virtual Product Price and tax class
185
  add_filter( 'woocommerce_get_price_including_tax', array( $this, 'set_virtual_product_price' ), PHP_INT_MAX, 3 );
186
  // Fallback gzd_product injection if not using wc_get_product
471
  * @param string $template_name
472
  * @return string
473
  */
474
+ public function set_checkout_fallback( $template, $template_name, $template_path ) {
475
+
476
+ $path = WC()->plugin_path() . '/templates/';
477
+
478
+ if ( strstr( $template_name, 'review-order.php' ) )
479
+ return trailingslashit( $path ) . 'checkout/review-order.php';
480
+ else if ( strstr( $template_name, 'form-checkout.php' ) )
481
+ return trailingslashit( $path ) . 'checkout/form-checkout.php';
482
+
483
+ return $template;
484
  }
485
 
486
  /**
802
  * @return adjusted price
803
  */
804
  public function set_virtual_product_price( $price, $qty, $product ) {
805
+
806
+ if ( ! is_object( $product ) )
807
  return $price;
808
+
809
+ if ( ! $product || ! $product->gzd_product->is_virtual_vat_exception() || ! isset( WC()->cart ) || ! WC()->cart->is_virtual_taxable() )
810
+ return $price;
811
+
812
  if ( get_option( 'woocommerce_prices_include_tax' ) === 'yes' )
813
  return $product->get_price() * $qty;
814
+
815
  return $price;
816
  }
817