Created
December 14, 2018 11:33
-
-
Save torunar/d114ba8db956ba4ddf6803a77f94f5c1 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/lite_checkout/controllers/frontend/checkout.pre.php b/app/addons/lite_checkout/controllers/frontend/checkout.pre.php | |
index 708acb2799..322dcb46c6 100644 | |
--- a/app/addons/lite_checkout/controllers/frontend/checkout.pre.php | |
+++ b/app/addons/lite_checkout/controllers/frontend/checkout.pre.php | |
@@ -40,6 +40,8 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { | |
fn_lite_checkout_backup_chosen_shipping($cart); | |
} | |
+ $cart['calculate_shipping'] = fn_lite_checkout_is_shipping_recalculation_required($_REQUEST, Tygh::$app['session'], $_SERVER); | |
+ | |
return [CONTROLLER_STATUS_OK]; | |
} | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/addons/lite_checkout/schemas/lite_checkout/shipping_recalculation.php b/app/addons/lite_checkout/schemas/lite_checkout/shipping_recalculation.php | |
index 61d8d704e5..60f07938bd 100644 | |
--- a/app/addons/lite_checkout/schemas/lite_checkout/shipping_recalculation.php | |
+++ b/app/addons/lite_checkout/schemas/lite_checkout/shipping_recalculation.php | |
@@ -24,9 +24,11 @@ $schema = [ | |
], | |
'request' => [ | |
// rus_pickup | |
- 'select_store' => true, | |
- 'drop_select_store' => true, | |
+ 'select_store' => true, | |
+ 'drop_select_store' => true, | |
+ // boxberry | |
+ 'boxberry_selected_point' => true, | |
], | |
]; | |
-return $schema; | |
\ No newline at end of file | |
+return $schema; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/design/themes/responsive/templates/addons/lite_checkout/components/shipping_rates.tpl b/design/themes/responsive/templates/addons/lite_checkout/components/shipping_rates.tpl | |
index c12b44c093..76fa420e5c 100644 | |
--- a/design/themes/responsive/templates/addons/lite_checkout/components/shipping_rates.tpl | |
+++ b/design/themes/responsive/templates/addons/lite_checkout/components/shipping_rates.tpl | |
@@ -3,7 +3,7 @@ | |
<input type="hidden" | |
name="additional_result_ids[]" | |
- value="litecheckout_place_order,litecheckout_step_payment_methods,checkout*" | |
+ value="litecheckout_place_order,litecheckout_step_payment_methods,litecheckout_step_shipping_methods,checkout*" | |
/> | |
<div class="litecheckout__fields-row litecheckout__fields-row--wrapped shipping-method--wrapper"> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/js/addons/boxberry/boxberry.js b/js/addons/boxberry/boxberry.js | |
index e7505ea9ad..c21b1bdfe8 100644 | |
--- a/js/addons/boxberry/boxberry.js | |
+++ b/js/addons/boxberry/boxberry.js | |
@@ -25,7 +25,7 @@ | |
var data = {}; | |
data[callbackInput.getAttribute('name')] = result.id; | |
- data['update_step'] = $('.ty-step__container-active').find('input[name="update_step"]').val(); | |
+ data['update_step'] = $('.ty-step__container-active').find('input[name="update_step"]').val() || 'step_three'; | |
$("input[name='user_data[s_address]']").val(result.address); | |
$.ceAjax('request', fn_url('checkout.update_steps'), { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment