From 856be871e3af29bc2f04c68c4119c054f38fb5aa Mon Sep 17 00:00:00 2001 From: TheCartpenter Date: Tue, 9 Jul 2024 22:20:44 -0400 Subject: [PATCH] More work on indents --- .../payment/paypal/applepay_button.twig | 733 +++++----- .../extension/payment/paypal/auth.twig | 371 ++--- .../extension/payment/paypal/button.twig | 739 +++++----- .../extension/payment/paypal/card.twig | 440 +++--- .../extension/payment/paypal/contact.twig | 287 ++-- .../extension/payment/paypal/dashboard.twig | 257 ++-- .../extension/payment/paypal/general.twig | 523 +++---- .../payment/paypal/googlepay_button.twig | 669 ++++----- .../extension/payment/paypal/message.twig | 176 +-- .../payment/paypal/message_configurator.twig | 347 ++--- .../payment/paypal/message_setting.twig | 265 ++-- .../payment/paypal/order_status.twig | 130 +- .../extension/payment/paypal/confirm.twig | 1254 +++++++++-------- .../payment/paypal/payment_address.twig | 620 ++++---- .../payment/paypal/shipping_address.twig | 386 ++--- 15 files changed, 3653 insertions(+), 3544 deletions(-) diff --git a/upload/admin/view/template/extension/payment/paypal/applepay_button.twig b/upload/admin/view/template/extension/payment/paypal/applepay_button.twig index b03b53df5..083e838d6 100644 --- a/upload/admin/view/template/extension/payment/paypal/applepay_button.twig +++ b/upload/admin/view/template/extension/payment/paypal/applepay_button.twig @@ -1,299 +1,300 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
- -
-
- {% for applepay_button in setting['applepay_button'] %} -
-
-
- {% if (applepay_button['page_code'] == 'checkout') %} -
-
{{ text_checkout }}
-
-
{{ text_step_payment_method }}
-
-
-
{{ text_step_confirm_order }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
- -
-
- {% endif %} - {% if (applepay_button['page_code'] == 'cart') %} -
-
{{ text_cart }}
-
-
-
{{ text_cart_product_image }}
-
{{ text_cart_product_name }}
-
{{ text_cart_product_model }}
-
{{ text_cart_product_quantity }}
-
{{ text_cart_product_price }}
-
{{ text_cart_product_total }}
-
-
-
-
{{ text_cart_product_name_value }}
-
{{ text_cart_product_model_value }}
-
{{ text_cart_product_quantity_value }}
-
{{ text_cart_product_price_value }}
-
{{ text_cart_product_total_value }}
-
-
-
-
{{ text_step_coupon }}
-
-
-
{{ text_step_shipping }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
-
- -
-
-
- -
-
- {% endif %} - {% if (applepay_button['page_code'] == 'product') %} -
-
-
-
-
-
-
{{ text_product_name }}
-
{{ text_product_price }}
-
{{ text_product_manufacturer }}
-
{{ text_product_model }}
-
{{ text_product_stock }}
- -
- -
-
-
-
- {% endif %} -
-
-
-
-
- {{ text_applepay_button_settings }} -
-
-
- - - -
-
-
- {% if text_applepay_alert %} -
-

{{ text_applepay_alert }}

-
-
-

{{ text_applepay_step_1 }}

-
-
- {{ button_download }} -
-
- -
-
-
-
-

{{ text_applepay_step_2 }}

-
- {% endif %} - {% if (applepay_button['page_code'] != 'checkout') %} -
-
-
- - -
-
-
-
- - -
-
-
- {% endif %} -
-
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
-
-
-
- {% endfor %} -
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+ +
+
+ {% for applepay_button in setting['applepay_button'] %} +
+
+
+ {% if (applepay_button['page_code'] == 'checkout') %} +
+
{{ text_checkout }}
+
+
{{ text_step_payment_method }}
+
+
+
{{ text_step_confirm_order }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+ +
+
+ {% endif %} + {% if (applepay_button['page_code'] == 'cart') %} +
+
{{ text_cart }}
+
+
+
{{ text_cart_product_image }}
+
{{ text_cart_product_name }}
+
{{ text_cart_product_model }}
+
{{ text_cart_product_quantity }}
+
{{ text_cart_product_price }}
+
{{ text_cart_product_total }}
+
+
+
+
+
+
{{ text_cart_product_name_value }}
+
{{ text_cart_product_model_value }}
+
{{ text_cart_product_quantity_value }}
+
{{ text_cart_product_price_value }}
+
{{ text_cart_product_total_value }}
+
+
+
+
{{ text_step_coupon }}
+
+
+
{{ text_step_shipping }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+
+ +
+
+
+ +
+
+ {% endif %} + {% if (applepay_button['page_code'] == 'product') %} +
+
+
+
+
+
+
{{ text_product_name }}
+
{{ text_product_price }}
+
{{ text_product_manufacturer }}
+
{{ text_product_model }}
+
{{ text_product_stock }}
+ +
+ +
+
+
+
+ {% endif %} +
+
+
+
+
+ {{ text_applepay_button_settings }} +
+
+
+ + + +
+
+
+ {% if text_applepay_alert %} +
+

{{ text_applepay_alert }}

+
+
+

{{ text_applepay_step_1 }}

+
+
+ {{ button_download }} +
+
+ +
+
+
+
+

{{ text_applepay_step_2 }}

+
+ {% endif %} + {% if (applepay_button['page_code'] != 'checkout') %} +
+
+
+ + +
+
+
+
+ + +
+
+
+ {% endif %} +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ {% endfor %} +
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/auth.twig b/upload/admin/view/template/extension/payment/paypal/auth.twig index f1441acd4..6031dce9f 100644 --- a/upload/admin/view/template/extension/payment/paypal/auth.twig +++ b/upload/admin/view/template/extension/payment/paypal/auth.twig @@ -1,200 +1,207 @@ {{ header }}{{ column_left }}
-
-
-
- -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- -
{{ text_welcome }}
-
-
-
- - -
-
-
-
- - -
-
-
- - -
{{ text_support }}
-
-
-
-
+
+
+
+
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ +
{{ text_welcome }}
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +
{{ text_support }}
+
+
+
+
- - + diff --git a/upload/admin/view/template/extension/payment/paypal/button.twig b/upload/admin/view/template/extension/payment/paypal/button.twig index 02366993f..73d1e304f 100644 --- a/upload/admin/view/template/extension/payment/paypal/button.twig +++ b/upload/admin/view/template/extension/payment/paypal/button.twig @@ -1,300 +1,301 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
- -
-
- {% for button in setting['button'] %} -
-
-
- {% if (button['page_code'] == 'checkout') %} -
-
{{ text_checkout }}
-
-
{{ text_step_payment_method }}
-
-
-
{{ text_step_confirm_order }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
- -
-
- {% endif %} - {% if (button['page_code'] == 'cart') %} -
-
{{ text_cart }}
-
-
-
{{ text_cart_product_image }}
-
{{ text_cart_product_name }}
-
{{ text_cart_product_model }}
-
{{ text_cart_product_quantity }}
-
{{ text_cart_product_price }}
-
{{ text_cart_product_total }}
-
-
-
-
{{ text_cart_product_name_value }}
-
{{ text_cart_product_model_value }}
-
{{ text_cart_product_quantity_value }}
-
{{ text_cart_product_price_value }}
-
{{ text_cart_product_total_value }}
-
-
-
-
{{ text_step_coupon }}
-
-
-
{{ text_step_shipping }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
-
- -
-
-
- -
-
- {% endif %} - {% if (button['page_code'] == 'product') %} -
-
-
-
-
-
-
{{ text_product_name }}
-
{{ text_product_price }}
-
{{ text_product_manufacturer }}
-
{{ text_product_model }}
-
{{ text_product_stock }}
- -
- -
-
-
-
- {% endif %} -
-
-
-
-
- {{ text_button_settings }} -
-
-
- - - -
-
-
- {% if (button['page_code'] != 'checkout') %} -
-
-
- - -
-
-
-
- - -
-
-
- {% endif %} -
-
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
- -
-
- {% for column_button_funding in setting['button_funding']|batch(setting['button_funding']|length / 2|round(1, 'ceil')) %} -
- {% for button_funding in column_button_funding %} -
- - -
- {% endfor %} -
- {% endfor %} -
-
-
-
-
-
- {% endfor %} -
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+ +
+
+ {% for button in setting['button'] %} +
+
+
+ {% if (button['page_code'] == 'checkout') %} +
+
{{ text_checkout }}
+
+
{{ text_step_payment_method }}
+
+
+
{{ text_step_confirm_order }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+ +
+
+ {% endif %} + {% if (button['page_code'] == 'cart') %} +
+
{{ text_cart }}
+
+
+
{{ text_cart_product_image }}
+
{{ text_cart_product_name }}
+
{{ text_cart_product_model }}
+
{{ text_cart_product_quantity }}
+
{{ text_cart_product_price }}
+
{{ text_cart_product_total }}
+
+
+
+
+
+
{{ text_cart_product_name_value }}
+
{{ text_cart_product_model_value }}
+
{{ text_cart_product_quantity_value }}
+
{{ text_cart_product_price_value }}
+
{{ text_cart_product_total_value }}
+
+
+
+
{{ text_step_coupon }}
+
+
+
{{ text_step_shipping }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+
+ +
+
+
+ +
+
+ {% endif %} + {% if (button['page_code'] == 'product') %} +
+
+
+
+
+
+
{{ text_product_name }}
+
{{ text_product_price }}
+
{{ text_product_manufacturer }}
+
{{ text_product_model }}
+
{{ text_product_stock }}
+ +
+ +
+
+
+
+ {% endif %} +
+
+
+
+
+ {{ text_button_settings }} +
+
+
+ + + +
+
+
+ {% if (button['page_code'] != 'checkout') %} +
+
+
+ + +
+
+
+
+ + +
+
+
+ {% endif %} +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ +
+
+ {% for column_button_funding in setting['button_funding']|batch(setting['button_funding']|length / 2|round(1, 'ceil')) %} +
+ {% for button_funding in column_button_funding %} +
+ + +
+ {% endfor %} +
+ {% endfor %} +
+
+
+
+
+
+ {% endfor %} +
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/card.twig b/upload/admin/view/template/extension/payment/paypal/card.twig index f016444d7..abbbe7196 100644 --- a/upload/admin/view/template/extension/payment/paypal/card.twig +++ b/upload/admin/view/template/extension/payment/paypal/card.twig @@ -1,173 +1,172 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
-
-
-
-
{{ text_checkout }}
-
-
{{ text_step_payment_method }}
-
-
-
{{ text_step_confirm_order }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
- -
-
-
-
-
-
-
- {{ text_card_settings }} -
-
-
- - - -
-
-
-
- - -
-
- - -
-
- - -
-
- -
-
- -

{{ help_card_secure_scenario }}

-
- {% for card_secure_scenario in setting['card_secure_scenario'] %} -
- - -
- {% endfor %} -
-
-
-
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+
+
+
+
{{ text_checkout }}
+
+
{{ text_step_payment_method }}
+
+
+
{{ text_step_confirm_order }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+ +
+
+
+
+
+
+
+ {{ text_card_settings }} +
+
+
+ + + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+ +

{{ help_card_secure_scenario }}

+
+ {% for card_secure_scenario in setting['card_secure_scenario'] %} +
+ + +
+ {% endfor %} +
+
+
+
+
+
+
+
+
{{ footer }} \ No newline at end of file diff --git a/upload/admin/view/template/extension/payment/paypal/contact.twig b/upload/admin/view/template/extension/payment/paypal/contact.twig index 198b80f3c..502de5fb2 100644 --- a/upload/admin/view/template/extension/payment/paypal/contact.twig +++ b/upload/admin/view/template/extension/payment/paypal/contact.twig @@ -1,149 +1,148 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
-
-
- {{ text_contact_business }} -
-
- - - - - - -
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
- - -
-
-
- - -
-
- {{ text_contact_product }} -
- - -
-
- -
-
-
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+
+
+ {{ text_contact_business }} +
+
+ + + + + + +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+ {{ text_contact_product }} +
+ + +
+
+ +
+
+
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/general.twig b/upload/admin/view/template/extension/payment/paypal/general.twig index 7174d0b79..44dfdbfde 100644 --- a/upload/admin/view/template/extension/payment/paypal/general.twig +++ b/upload/admin/view/template/extension/payment/paypal/general.twig @@ -1,215 +1,214 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
- -
- -
-
- -

{{ text_connect }}

-
-
-
-
- -
- - -
-
-
- -
- - -
-
-
-
-
- -
- - -
-
-
-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
- - -
- - - - -
-
-
-
-
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+ +
+ +
+
+ +

{{ text_connect }}

+
+
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+
+
+ +
+ + +
+
+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+ + + + +
+
+
+
+
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig b/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig index 4637efaaa..4fbc3f205 100644 --- a/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig +++ b/upload/admin/view/template/extension/payment/paypal/googlepay_button.twig @@ -1,284 +1,285 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
- -
-
- {% for googlepay_button in setting['googlepay_button'] %} -
-
-
- {% if (googlepay_button['page_code'] == 'checkout') %} -
-
{{ text_checkout }}
-
-
{{ text_step_payment_method }}
-
-
-
{{ text_step_confirm_order }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
- -
-
- {% endif %} - {% if (googlepay_button['page_code'] == 'cart') %} -
-
{{ text_cart }}
-
-
-
{{ text_cart_product_image }}
-
{{ text_cart_product_name }}
-
{{ text_cart_product_model }}
-
{{ text_cart_product_quantity }}
-
{{ text_cart_product_price }}
-
{{ text_cart_product_total }}
-
-
-
-
{{ text_cart_product_name_value }}
-
{{ text_cart_product_model_value }}
-
{{ text_cart_product_quantity_value }}
-
{{ text_cart_product_price_value }}
-
{{ text_cart_product_total_value }}
-
-
-
-
{{ text_step_coupon }}
-
-
-
{{ text_step_shipping }}
-
-
-
-
-
-
{{ text_cart_sub_total }}
-
{{ text_cart_product_total_value }}
-
-
-
{{ text_cart_total }}
-
{{ text_cart_product_total_value }}
-
-
-
-
-
-
- -
-
-
- -
-
- {% endif %} - {% if (googlepay_button['page_code'] == 'product') %} -
-
-
-
-
-
-
{{ text_product_name }}
-
{{ text_product_price }}
-
{{ text_product_manufacturer }}
-
{{ text_product_model }}
-
{{ text_product_stock }}
- -
- -
-
-
-
- {% endif %} -
-
-
-
-
- {{ text_googlepay_button_settings }} -
-
-
- - - -
-
-
- {% if (googlepay_button['page_code'] != 'checkout') %} -
-
-
- - -
-
-
-
- - -
-
-
- {% endif %} -
-
-
- - -
-
- - -
-
- - -
-
-
-
- - -
-
- - -
-
-
-
-
-
-
- {% endfor %} -
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+ +
+
+ {% for googlepay_button in setting['googlepay_button'] %} +
+
+
+ {% if (googlepay_button['page_code'] == 'checkout') %} +
+
{{ text_checkout }}
+
+
{{ text_step_payment_method }}
+
+
+
{{ text_step_confirm_order }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+ +
+
+ {% endif %} + {% if (googlepay_button['page_code'] == 'cart') %} +
+
{{ text_cart }}
+
+
+
{{ text_cart_product_image }}
+
{{ text_cart_product_name }}
+
{{ text_cart_product_model }}
+
{{ text_cart_product_quantity }}
+
{{ text_cart_product_price }}
+
{{ text_cart_product_total }}
+
+
+
+
+
+
{{ text_cart_product_name_value }}
+
{{ text_cart_product_model_value }}
+
{{ text_cart_product_quantity_value }}
+
{{ text_cart_product_price_value }}
+
{{ text_cart_product_total_value }}
+
+
+
+
{{ text_step_coupon }}
+
+
+
{{ text_step_shipping }}
+
+
+
+
+
+
{{ text_cart_sub_total }}
+
{{ text_cart_product_total_value }}
+
+
+
{{ text_cart_total }}
+
{{ text_cart_product_total_value }}
+
+
+
+
+
+
+ +
+
+
+ +
+
+ {% endif %} + {% if (googlepay_button['page_code'] == 'product') %} +
+
+
+
+
+
+
{{ text_product_name }}
+
{{ text_product_price }}
+
{{ text_product_manufacturer }}
+
{{ text_product_model }}
+
{{ text_product_stock }}
+ +
+ +
+
+
+
+ {% endif %} +
+
+
+
+
+ {{ text_googlepay_button_settings }} +
+
+
+ + + +
+
+
+ {% if (googlepay_button['page_code'] != 'checkout') %} +
+
+
+ + +
+
+
+
+ + +
+
+
+ {% endif %} +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+ {% endfor %} +
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/message.twig b/upload/admin/view/template/extension/payment/paypal/message.twig index 8221e95ec..d29f19749 100644 --- a/upload/admin/view/template/extension/payment/paypal/message.twig +++ b/upload/admin/view/template/extension/payment/paypal/message.twig @@ -256,9 +256,9 @@
{% set setting_message = setting.message %} -
- - {% for message_text_color in setting.message_text_color %} {% if message_text_color.code == message.text_color %} @@ -319,14 +319,15 @@
{{ footer }} \ No newline at end of file diff --git a/upload/admin/view/template/extension/payment/paypal/message_configurator.twig b/upload/admin/view/template/extension/payment/paypal/message_configurator.twig index 0a5442f95..3246d3db0 100644 --- a/upload/admin/view/template/extension/payment/paypal/message_configurator.twig +++ b/upload/admin/view/template/extension/payment/paypal/message_configurator.twig @@ -1,192 +1,193 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
- {{ text_tab_dashboard }} - -
-
- {% for message in setting['message'] %} - - - - - - - - - {% endfor %} -
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+ {{ text_tab_dashboard }} + +
+
+ {% for message in setting['message'] %} + + + + + + + + + {% endfor %} +
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/message_setting.twig b/upload/admin/view/template/extension/payment/paypal/message_setting.twig index 5d9c73e9a..79bb76930 100644 --- a/upload/admin/view/template/extension/payment/paypal/message_setting.twig +++ b/upload/admin/view/template/extension/payment/paypal/message_setting.twig @@ -1,144 +1,147 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
- -
-
- {% for message in setting['message'] %} - {% if (message['page_code'] != 'checkout') %} -
-
-
-
- {{ text_message_settings }} -
-
- {% if text_message_alert %} - {#
-

{{ text_message_alert }}

-
-
-

{{ text_message_footnote }}

-
#} - {% endif %} -
-
-
- - -
-
-
-
- - -
-
-
-
-
- {% endif %} - {% endfor %} -
-
-
-
-
-
+
+
+
+ +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+ +
+
+ {% for message in setting['message'] %} + {% if (message['page_code'] != 'checkout') %} +
+
+
+
+ {{ text_message_settings }} +
+
+ {% if text_message_alert %} + {# +
+

{{ text_message_alert }}

+
+
+

{{ text_message_footnote }}

+
+ #} + {% endif %} +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ {% endif %} + {% endfor %} +
+
+
+
+
+
diff --git a/upload/admin/view/template/extension/payment/paypal/order_status.twig b/upload/admin/view/template/extension/payment/paypal/order_status.twig index 2fda3d8c3..8e30c7655 100644 --- a/upload/admin/view/template/extension/payment/paypal/order_status.twig +++ b/upload/admin/view/template/extension/payment/paypal/order_status.twig @@ -1,70 +1,70 @@ {{ header }}{{ column_left }}
-
-
-
- - -
-

{{ heading_title_main }}

- -
-
-
- {% if error_warning %} -
{{ error_warning }}
- {% endif %} - {% if text_version %} -
{{ text_version }}
- {% endif %} -
-
-

{{ text_edit }}

-
-
-
- {{ text_tab_dashboard }} - -
-
- {% for column_paypal_order_status in setting['order_status']|batch(setting['order_status']|length / 2|round(1, 'ceil')) %} -
- {% for paypal_order_status in column_paypal_order_status %} -
- - -
- {% endfor %} -
- {% endfor %} -
-
-
-
-
-
+
+
+
+ + +
+

{{ heading_title_main }}

+ +
+
+
+ {% if error_warning %} +
{{ error_warning }}
+ {% endif %} + {% if text_version %} +
{{ text_version }}
+ {% endif %} +
+
+

{{ text_edit }}

+
+
+
+ {{ text_tab_dashboard }} + +
+
+ {% for column_paypal_order_status in setting['order_status']|batch(setting['order_status']|length / 2|round(1, 'ceil')) %} +
+ {% for paypal_order_status in column_paypal_order_status %} +
+ + +
+ {% endfor %} +
+ {% endfor %} +
+
+
+
+
+
diff --git a/upload/catalog/view/theme/default/template/extension/payment/paypal/payment_address.twig b/upload/catalog/view/theme/default/template/extension/payment/paypal/payment_address.twig index 8909b2063..3f123444e 100644 --- a/upload/catalog/view/theme/default/template/extension/payment/paypal/payment_address.twig +++ b/upload/catalog/view/theme/default/template/extension/payment/paypal/payment_address.twig @@ -1,312 +1,312 @@ \ No newline at end of file diff --git a/upload/catalog/view/theme/default/template/extension/payment/paypal/shipping_address.twig b/upload/catalog/view/theme/default/template/extension/payment/paypal/shipping_address.twig index a4bcf4d5f..2a338748b 100644 --- a/upload/catalog/view/theme/default/template/extension/payment/paypal/shipping_address.twig +++ b/upload/catalog/view/theme/default/template/extension/payment/paypal/shipping_address.twig @@ -1,195 +1,195 @@ \ No newline at end of file