TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction d'un bogue sur prise en compte de la LivraisonForfaitaire dans OrderCreation

Browse Source
This commit is contained in:
TheCoreDev
2021-11-11 14:50:21 +01:00
parent 50b55fba14
commit c51923cc1b
29 changed files with 6 additions and 2822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
local/modules/OrderCreation/Controller/Admin/OrderCreationAdminController.php
View File

@@ -157,11 +157,12 @@ class OrderCreationAdminController extends BaseAdminController
$event->setRedirect(0);
}
$deliveryModuleId = $formValidate->get(OrderCreationCreateForm::FIELD_NAME_DELIVERY_MODULE_ID)->getData();
$event
->setContainer($this->getContainer())
->setCustomerId($formValidate->get(OrderCreationCreateForm::FIELD_NAME_CUSTOMER_ID)->getData())
->setDeliveryAddressId($formValidate->get(OrderCreationCreateForm::FIELD_NAME_DELIVERY_ADDRESS_ID)->getData())
->setDeliveryModuleId($formValidate->get(OrderCreationCreateForm::FIELD_NAME_DELIVERY_MODULE_ID)->getData())
->setDeliveryModuleId($deliveryModuleId)
->setInvoiceAddressId($formValidate->get(OrderCreationCreateForm::FIELD_NAME_INVOICE_ADDRESS_ID)->getData())
->setPaymentModuleId($formValidate->get(OrderCreationCreateForm::FIELD_NAME_PAYMENT_MODULE_ID)->getData())
->setProductSaleElementIds($formValidate->get(OrderCreationCreateForm::FIELD_NAME_PRODUCT_SALE_ELEMENT_ID)->getData())

4
local/modules/OrderCreation/templates/backOffice/default/customer-edit-js.html
View File

@@ -150,7 +150,7 @@
$listDelivery.removeClass('loading');
$listDelivery.html(response);
$('#list-delivery input.delivery-method').each(function () {
$('#list-delivery input.js-change-delivery-method').each(function () {
if ($(this).is(':checked')) {
$('#delivery-module').val($(this).val());
}
@@ -185,7 +185,7 @@
}
});
$listDelivery.on('change', '.delivery-method', function () {
$listDelivery.on('change', '.js-change-delivery-method', function () {
$('#delivery-module').val($(this).val());
});

3
local/modules/OrderCreation/templates/backOffice/default/forms/create-order-form.html
View File

@@ -103,6 +103,7 @@
<div class="row">
<div class="col-md-12">
<input type="hidden" id="delivery-module">
{custom_render_form_field field='delivery-module'}
<div id="list-delivery">
<div class="alert alert-danger">
@@ -125,7 +126,7 @@
</div>
<div class="col-md-6">
<div "id="create-order-form-td-check-payment-redirect">
<div id="create-order-form-td-check-payment-redirect">
{render_form_field field='redirects_payment'}
</div>
</div>