Skip to content

[Forwardport] Allow 3rd party modules to perform actions after totals calculation #17328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 5, 2018
Merged

[Forwardport] Allow 3rd party modules to perform actions after totals calculation #17328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65740bc
Allow 3rd party modules to perform actions after totals calculation
navarr Jul 25, 2018
203749c
Update test to expect a deferral instead of undefined
navarr Jul 26, 2018
3a795e7
Move new variables to top of scope to fall in line with convention
navarr Jul 27, 2018
cde4938
Fixed code style issues
Jul 30, 2018
fff8743
Fix styling issues
navarr Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/Magento/Checkout/view/frontend/web/js/model/cart/totals-processor/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ define([
payload.addressInformation['shipping_carrier_code'] = quote.shippingMethod()['carrier_code'];
}

storage.post(
return storage.post(
serviceUrl, JSON.stringify(payload), false
).done(function (result) {
var data = {
Expand Down Expand Up @@ -96,7 +96,7 @@ define([
) {
quote.setTotals(cartCache.get('totals'));
} else {
loadFromServer(address);
return loadFromServer(address);
}
}
};
Expand Down
12 changes: 8 additions & 4 deletions ...e/tests/app/code/Magento/Checkout/frontend/js/model/cart/totals-processor/default.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ define([
});

it('estimateTotals if data wasn\'t cached and request was successfully sent', function () {
var deferral = new $.Deferred();

spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(true);
spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
ko.observable({
Expand All @@ -124,9 +126,9 @@ define([
data.shippingMethodCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['method_code'];
data.shippingCarrierCode = mocks['Magento_Checkout/js/model/quote'].shippingMethod()['carrier_code'];

return new $.Deferred().resolve(result);
return deferral.resolve(result);
});
expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
expect(mocks['Magento_Checkout/js/model/quote'].setTotals).toHaveBeenCalledWith(totals);
expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
Expand All @@ -136,6 +138,8 @@ define([
});

it('estimateTotals if data wasn\'t cached and request returns error', function () {
var deferral = new $.Deferred();

spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'isChanged').and.returnValue(true);
spyOn(mocks['Magento_Customer/js/customer-data'], 'get').and.returnValue(
ko.observable({
Expand All @@ -144,9 +148,9 @@ define([
);
spyOn(mocks['Magento_Checkout/js/model/cart/cache'], 'get');
spyOn(mocks['mage/storage'], 'post').and.callFake(function () {
return new $.Deferred().reject('Error Message');
return deferral.reject('Error Message');
});
expect(defaultProcessor.estimateTotals(address)).toBeUndefined();
expect(defaultProcessor.estimateTotals(address)).toBe(deferral);
expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(0)[0]).toBe(true);
expect(mocks['Magento_Checkout/js/model/totals'].isLoading.calls.argsFor(1)[0]).toBe(false);
expect(mocks['mage/storage'].post).toHaveBeenCalled();
Expand Down