-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #70 from EaDesgin/feature/Romcity-moved-from-bitbu…
…cket Romcity:moved from Bitbucket
- Loading branch information
Showing
11 changed files
with
131 additions
and
39 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,4 +57,4 @@ public function getConfigFileName($nameFile = self::NAME_FILE) | |
| return $this->getScopeConfig($nameFile); | ||
| } | ||
|
|
||
| } | ||
| } | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd"> | ||
| <module name="Eadesigndev_RomCity" setup_version="1.1.7"> | ||
| <module name="Eadesigndev_RomCity" setup_version="1.2.2"> | ||
| <sequence> | ||
| <module name="Magento_Checkout"/> | ||
| </sequence> | ||
| </module> | ||
| </config> | ||
| </config> | ||
| git c |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| define([ | ||
| 'ko', | ||
| 'jquery', | ||
| 'uiComponent', | ||
| 'Magento_Checkout/js/action/place-order', | ||
| 'Magento_Checkout/js/action/select-payment-method', | ||
| 'Magento_Checkout/js/model/quote', | ||
| 'Magento_Customer/js/model/customer', | ||
| 'Magento_Checkout/js/model/payment-service', | ||
| 'Magento_Checkout/js/checkout-data', | ||
| 'Magento_Checkout/js/model/checkout-data-resolver', | ||
| 'uiRegistry', | ||
| 'Magento_Checkout/js/model/payment/additional-validators', | ||
| 'Magento_Ui/js/model/messages', | ||
| 'uiLayout', | ||
| 'Magento_Checkout/js/action/redirect-on-success' | ||
| ], function ( | ||
| ko, | ||
| $, | ||
| Component, | ||
| placeOrderAction, | ||
| selectPaymentMethodAction, | ||
| quote, | ||
| customer, | ||
| paymentService, | ||
| checkoutData, | ||
| checkoutDataResolver, | ||
| registry, | ||
| additionalValidators, | ||
| Messages, | ||
| layout, | ||
| redirectOnSuccessAction | ||
| ) { | ||
| 'use strict'; | ||
|
|
||
| var mixin = { | ||
| afterPlaceOrder: function () { | ||
| localStorage.removeItem('city_id'); | ||
| localStorage.removeItem('city_id_value'); | ||
| } | ||
| }; | ||
| return function (target) { | ||
| return target.extend(mixin); | ||
| } | ||
| }); |
39 changes: 39 additions & 0 deletions
39
view/frontend/web/js/view/shipping-information/list-mixin.js
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| define([ | ||
| 'jquery', | ||
| 'ko', | ||
| 'mageUtils', | ||
| 'uiComponent', | ||
| 'uiLayout', | ||
| 'Magento_Checkout/js/model/quote' | ||
| ], function ($, ko, utils, Component, layout, quote) { | ||
| 'use strict'; | ||
|
|
||
| var mixin = { | ||
| initialize: function () { | ||
| var self = this; | ||
|
|
||
| this._super() | ||
| .initChildren(); | ||
|
|
||
| quote.shippingAddress.subscribe(function (address) { | ||
| var shippingCityId = $("#shipping-new-address-form [name = 'city_id'] option:selected"), | ||
| shippingCityIdValue = shippingCityId.text(); | ||
| if (shippingCityIdValue){ | ||
| address.city = shippingCityIdValue; | ||
| } | ||
| self.createRendererComponent(address); | ||
| }); | ||
|
|
||
| return this; | ||
| } | ||
| } | ||
| return function (target) { | ||
| return target.extend(mixin); | ||
| } | ||
|
|
||
| }); |