Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Changed payment/shipping id with key, keep accordion open for active payment/shipping method on checkout page

givanzf217f33ab29c
diff --git a/app/template/components/checkout/payment.tpl b/app/template/components/checkout/payment.tpl
index 7d27c92..880d1c0 100755
--- a/app/template/components/checkout/payment.tpl
+++ b/app/template/components/checkout/payment.tpl
@@ -19,19 +19,24 @@ $_default = (isset($vvveb_is_page_edit) && $vvveb_is_page_edit ) ? [0 => ['payme
$payments['payment'] = empty($payments['payment']) ? $_default : $payments['payment'];
if($payments && is_array($payments['payment'])) {
- foreach ($payments['payment'] as $index => $payment) {?>
+ foreach ($payments['payment'] as $key => $payment) {?>
- @payment|data-payment_id = $payment['payment_id']
+ @payment|data-key = $key
@payment input[data-v-payment-*] = $payment['@@__data-v-payment-(*)__@@']
- @payment input[data-v-payment-name][type=radio]|addNewAttribute = <?php if ($payment_method == $payment['name']) echo 'checked';?>
+ @payment input[data-v-payment-name][type=radio]|addNewAttribute = <?php if ($payment_method == $key) echo 'checked';?>
+
+ @payment .collapse|addClass = <?php if ($payment_method == $key) echo 'show';?>
@payment img[data-v-payment-*]|src = $payment['@@__data-v-payment-(*)__@@']
@payment [data-v-payment-render]|innerText = <?php echo $payment['@@__data-v-payment-(*)__@@'] ?? '';?>
+
@payment [data-v-payment-*]|innerText = $payment['@@__data-v-payment-(*)__@@']
+ @payment input[data-v-payment-key] = $key
+
@payment a[data-v-payment-*]|href = $payment['@@__data-v-payment-(*)__@@']
@payment|after = <?php
diff --git a/app/template/components/checkout/shipping.tpl b/app/template/components/checkout/shipping.tpl
index fe04a3d..a02597e 100755
--- a/app/template/components/checkout/shipping.tpl
+++ b/app/template/components/checkout/shipping.tpl
@@ -19,17 +19,21 @@ $_default = (isset($vvveb_is_page_edit) && $vvveb_is_page_edit ) ? [0 => ['shipp
$shippings['shipping'] = empty($shippings['shipping']) ? $_default : $shippings['shipping'];
if($shippings && is_array($shippings['shipping'])) {
- foreach ($shippings['shipping'] as $index => $shipping) {?>
-
- @shipping|data-shipping_id = $shipping['shipping_id']
+ foreach ($shippings['shipping'] as $key => $shipping) {?>
+ @shipping|data-key = $key
+
@shipping input[data-v-shipping-*] = $shipping['@@__data-v-shipping-(*)__@@']
- @payment input[data-v-shipping-name]|addNewAttribute = <?php if ($shipping_method == $shipping['name']) echo 'checked';?>
+ @shipping input[data-v-shipping-name]|addNewAttribute = <?php if ($shipping_method == $key) echo 'checked';?>
+
+ @shipping .collapse|addClass = <?php if ($shipping_method == $key) echo 'show';?>
@shipping img[data-v-shipping-*]|src = $shipping['@@__data-v-shipping-(*)__@@']
@shipping [data-v-shipping-*]|innerText = $shipping['@@__data-v-shipping-(*)__@@']
+
+ @shipping input[data-v-shipping-key] = $key
@shipping a[data-v-shipping-*]|href = $shipping['@@__data-v-shipping-(*)__@@']
diff --git a/public/themes/landing b/public/themes/landing
index 6b38256..a3b87db 160000
--- a/public/themes/landing
+++ b/public/themes/landing
@@ -1 +1 @@
-Subproject commit 6b3825630e4bbde5dc57f52e0d782403c58e8fd9
+Subproject commit a3b87dbebbb572b3d6d42f7f67e6e823645f01d7