@ikas/storefront 0.0.164-alpha.4 → 0.0.164-alpha.5

package/build/components/checkout/model.d.ts

@@ -23,7 +23,6 @@ export default class CheckoutViewModel {
     step: CheckoutStep;
     merchantSettings?: IkasMerchantSettings;
     cardData?: CreditCardData | null;
-    paymentGatewayId?: string | null;
     paymentGateways: IkasPaymentGateway[];
     installmentInfo?: IkasInstallmentInfo | null;
     useDifferentAddress: boolean;
@@ -48,7 +47,6 @@ export default class CheckoutViewModel {
     getMerchantSettings: () => Promise<void>;
     get cart(): import("../../models/data/cart/index").IkasCart | null | undefined;
     get selectedPaymentGatewayIndex(): number;
-    get selectedPaymentGateway(): IkasPaymentGateway | undefined;
     get selectedInstallmentIndex(): number;
     get checkoutUrl(): string;
     get customerAddressOptions(): {

package/build/index.es.js

@@ -22809,7 +22809,6 @@ var CheckoutViewModel = /** @class */ (function () {
         this.isChangingShippingMethod = false;
         this.step = CheckoutStep.INFO;
         this.cardData = null;
-        this.paymentGatewayId = null;
         this.paymentGateways = [];
         this.installmentInfo = null;
         this.useDifferentAddress = false;
@@ -22842,7 +22841,7 @@ var CheckoutViewModel = /** @class */ (function () {
             });
         }); };
         this.initStep = function (queryParams) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, transactions;
+            var _a, transactions, paymentGatewayId_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -22914,6 +22913,10 @@ var CheckoutViewModel = /** @class */ (function () {
                         this.successTransaction = transactions.length
                             ? transactions[0]
                             : undefined;
+                        if (this.successTransaction) {
+                            paymentGatewayId_1 = this.successTransaction.paymentGatewayId;
+                            this.checkout.selectedPaymentGateway = this.paymentGateways.find(function (pg) { return pg.id === paymentGatewayId_1; });
+                        }
                         _b.label = 11;
                     case 11:
                         this.isCheckoutLoaded = true;
@@ -23093,7 +23096,7 @@ var CheckoutViewModel = /** @class */ (function () {
                                 orderedPaymentGateways.push(_pg);
                         });
                         this.paymentGateways = isLocal ? paymentGateways : orderedPaymentGateways;
-                        if (!this.paymentGatewayId)
+                        if (!this.checkout.selectedPaymentGateway)
                             this.setPaymentGateway(0);
                         return [2 /*return*/];
                 }
@@ -23244,7 +23247,7 @@ var CheckoutViewModel = /** @class */ (function () {
             if (oldOriginalValue.length < 6 && originalValue.length >= 6) {
                 _this.retrieveInstallmentInfo({
                     binNumber: originalValue.slice(0, 6),
-                    paymentGatewayId: _this.paymentGatewayId,
+                    paymentGatewayId: _this.checkout.selectedPaymentGateway.id,
                     price: _this.checkout.totalFinalPrice,
                 });
             }
@@ -23483,15 +23486,17 @@ var CheckoutViewModel = /** @class */ (function () {
         }); };
         this.createSaleTransaction = function () { return __awaiter(_this, void 0, void 0, function () {
             var response, transactionStatus, transactionSuccess, transactionPending;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, IkasCheckoutAPI.createSaleTransactionWithCheckout(this.checkout.id, this.paymentGatewayId, ((_a = this.selectedPaymentGateway) === null || _a === void 0 ? void 0 : _a.paymentMethodType) ===
-                            IkasPaymentMethodType.CREDIT_CARD && this.cardData
-                            ? this.cardData.toInput()
-                            : undefined)];
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.checkout.selectedPaymentGateway)
+                            return [2 /*return*/];
+                        return [4 /*yield*/, IkasCheckoutAPI.createSaleTransactionWithCheckout(this.checkout.id, this.checkout.selectedPaymentGateway.id, this.checkout.selectedPaymentGateway.paymentMethodType ===
+                                IkasPaymentMethodType.CREDIT_CARD && this.cardData
+                                ? this.cardData.toInput()
+                                : undefined)];
                     case 1:
-                        response = _b.sent();
+                        response = _a.sent();
                         transactionStatus = response === null || response === void 0 ? void 0 : response.transactionStatus;
                         transactionSuccess = transactionStatus &&
                             [
@@ -23502,7 +23507,7 @@ var CheckoutViewModel = /** @class */ (function () {
                         if (!transactionSuccess) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.onCheckoutTransactionSuccess()];
                     case 2:
-                        _b.sent();
+                        _a.sent();
                         return [3 /*break*/, 4];
                     case 3:
                         if (transactionPending && !!(response === null || response === void 0 ? void 0 : response.returnSlug)) {
@@ -23514,7 +23519,7 @@ var CheckoutViewModel = /** @class */ (function () {
                                 type: ErrorType.UNKNOWN,
                             };
                         }
-                        _b.label = 4;
+                        _a.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -23564,12 +23569,13 @@ var CheckoutViewModel = /** @class */ (function () {
         };
         this.setPaymentGateway = function (index) {
             var paymentGateway = _this.paymentGateways[index];
-            _this.paymentGatewayId = paymentGateway.id;
-            if (paymentGateway.paymentMethodType === IkasPaymentMethodType.CREDIT_CARD) {
-                _this.cardData = new CreditCardData();
-            }
             _this.checkout.selectedPaymentGateway = paymentGateway;
-            _this.installmentInfo = undefined;
+            if (_this.step !== CheckoutStep.SUCCESS) {
+                if (paymentGateway.paymentMethodType === IkasPaymentMethodType.CREDIT_CARD) {
+                    _this.cardData = new CreditCardData();
+                }
+                _this.installmentInfo = undefined;
+            }
         };
         this.setInstallmentCount = function (count) {
             if (!_this.cardData)
@@ -23634,15 +23640,7 @@ var CheckoutViewModel = /** @class */ (function () {
     Object.defineProperty(CheckoutViewModel.prototype, "selectedPaymentGatewayIndex", {
         get: function () {
             var _this = this;
-            return this.paymentGateways.findIndex(function (pg) { return pg.id === _this.paymentGatewayId; });
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CheckoutViewModel.prototype, "selectedPaymentGateway", {
-        get: function () {
-            var _this = this;
-            return this.paymentGateways.find(function (pg) { return pg.id === _this.paymentGatewayId; });
+            return this.paymentGateways.findIndex(function (pg) { var _a; return pg.id === ((_a = _this.checkout.selectedPaymentGateway) === null || _a === void 0 ? void 0 : _a.id); });
         },
         enumerable: false,
         configurable: true
@@ -23741,7 +23739,7 @@ var CheckoutViewModel = /** @class */ (function () {
                 return false;
             return (this.canProceedToShipping &&
                 !!((_a = this.checkout.billingAddress) === null || _a === void 0 ? void 0 : _a.isValid) &&
-                (((_b = this.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.paymentMethodType) ===
+                (((_b = this.checkout.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.paymentMethodType) ===
                     IkasPaymentMethodType.CREDIT_CARD
                     ? (_c = this.cardData) === null || _c === void 0 ? void 0 : _c.isValid : true));
         },
@@ -61145,14 +61143,15 @@ var CalculatedAdditionalPrices = observer(function (_a) {
     if (!vm.cart)
         return null;
     return (createElement(Fragment$1, null,
-        (((_b = vm.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.getCalculatedAdditionalPrices(vm.checkout.totalFinalPrice || 0, vm.checkout.shippingLines || null)) || [])
-            .filter(function (adjustment) { return adjustment.amount !== 0; })
-            .map(function (adjustment, index) { return (createElement("div", { className: styles$h.InfoRow, key: index },
-            createElement("div", { className: styles$h.Label }, adjustment.name),
-            createElement("div", { className: styles$h.Value },
-                createElement("span", null, adjustment.type === "DECREMENT" ? "- " : ""),
-                " ",
-                createElement("span", null, formatMoney(adjustment.amount, vm.cart.currencyCode))))); }), (_c = vm.checkout.giftPackageLines) === null || _c === void 0 ? void 0 :
+        vm.step !== CheckoutStep.SUCCESS &&
+            (((_b = vm.checkout.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.getCalculatedAdditionalPrices(vm.checkout.totalFinalPrice || 0, vm.checkout.shippingLines || null)) || [])
+                .filter(function (adjustment) { return adjustment.amount !== 0; })
+                .map(function (adjustment, index) { return (createElement("div", { className: styles$h.InfoRow, key: index },
+                createElement("div", { className: styles$h.Label }, adjustment.name),
+                createElement("div", { className: styles$h.Value },
+                    createElement("span", null, adjustment.type === "DECREMENT" ? "- " : ""),
+                    " ",
+                    createElement("span", null, formatMoney(adjustment.amount, vm.cart.currencyCode))))); }), (_c = vm.checkout.giftPackageLines) === null || _c === void 0 ? void 0 :
         _c.map(function (gpl, index) { return (createElement("div", { className: styles$h.InfoRow, key: index },
             createElement("div", { className: styles$h.Label },
                 createElement("div", { className: styles$h.GiftLabel },
@@ -62457,7 +62456,7 @@ var _slug_ = /*#__PURE__*/Object.freeze({
 });
 
 var CheckoutPage = function (_a) {
-    var checkoutId = _a.checkoutId, editorCheckout = _a.editorCheckout, checkoutSettingsStr = _a.checkoutSettingsStr, customizationProps = _a.customizationProps, configJson = _a.configJson, others = __rest(_a, ["checkoutId", "editorCheckout", "checkoutSettingsStr", "customizationProps", "configJson"]);
+    var checkoutId = _a.checkoutId, checkoutSettingsStr = _a.checkoutSettingsStr, customizationProps = _a.customizationProps, configJson = _a.configJson, others = __rest(_a, ["checkoutId", "checkoutSettingsStr", "customizationProps", "configJson"]);
     var router = useRouter();
     var _b = useState(), checkout = _b[0], setCheckout = _b[1];
     IkasStorefrontConfig.initWithJson(configJson);
@@ -62485,10 +62484,7 @@ var CheckoutPage = function (_a) {
     }, [customizationProps]);
     useEffect(function () {
         store.checkLocalization();
-        if (!editorCheckout)
-            getCheckout();
-        else
-            setCheckout(editorCheckout);
+        getCheckout();
     }, []);
     var getCheckout = useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
         var checkout;

package/build/index.js

@@ -22817,7 +22817,6 @@ var CheckoutViewModel = /** @class */ (function () {
         this.isChangingShippingMethod = false;
         this.step = CheckoutStep.INFO;
         this.cardData = null;
-        this.paymentGatewayId = null;
         this.paymentGateways = [];
         this.installmentInfo = null;
         this.useDifferentAddress = false;
@@ -22850,7 +22849,7 @@ var CheckoutViewModel = /** @class */ (function () {
             });
         }); };
         this.initStep = function (queryParams) { return __awaiter(_this, void 0, void 0, function () {
-            var _a, transactions;
+            var _a, transactions, paymentGatewayId_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -22922,6 +22921,10 @@ var CheckoutViewModel = /** @class */ (function () {
                         this.successTransaction = transactions.length
                             ? transactions[0]
                             : undefined;
+                        if (this.successTransaction) {
+                            paymentGatewayId_1 = this.successTransaction.paymentGatewayId;
+                            this.checkout.selectedPaymentGateway = this.paymentGateways.find(function (pg) { return pg.id === paymentGatewayId_1; });
+                        }
                         _b.label = 11;
                     case 11:
                         this.isCheckoutLoaded = true;
@@ -23101,7 +23104,7 @@ var CheckoutViewModel = /** @class */ (function () {
                                 orderedPaymentGateways.push(_pg);
                         });
                         this.paymentGateways = isLocal ? paymentGateways : orderedPaymentGateways;
-                        if (!this.paymentGatewayId)
+                        if (!this.checkout.selectedPaymentGateway)
                             this.setPaymentGateway(0);
                         return [2 /*return*/];
                 }
@@ -23252,7 +23255,7 @@ var CheckoutViewModel = /** @class */ (function () {
             if (oldOriginalValue.length < 6 && originalValue.length >= 6) {
                 _this.retrieveInstallmentInfo({
                     binNumber: originalValue.slice(0, 6),
-                    paymentGatewayId: _this.paymentGatewayId,
+                    paymentGatewayId: _this.checkout.selectedPaymentGateway.id,
                     price: _this.checkout.totalFinalPrice,
                 });
             }
@@ -23491,15 +23494,17 @@ var CheckoutViewModel = /** @class */ (function () {
         }); };
         this.createSaleTransaction = function () { return __awaiter(_this, void 0, void 0, function () {
             var response, transactionStatus, transactionSuccess, transactionPending;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, IkasCheckoutAPI.createSaleTransactionWithCheckout(this.checkout.id, this.paymentGatewayId, ((_a = this.selectedPaymentGateway) === null || _a === void 0 ? void 0 : _a.paymentMethodType) ===
-                            IkasPaymentMethodType.CREDIT_CARD && this.cardData
-                            ? this.cardData.toInput()
-                            : undefined)];
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.checkout.selectedPaymentGateway)
+                            return [2 /*return*/];
+                        return [4 /*yield*/, IkasCheckoutAPI.createSaleTransactionWithCheckout(this.checkout.id, this.checkout.selectedPaymentGateway.id, this.checkout.selectedPaymentGateway.paymentMethodType ===
+                                IkasPaymentMethodType.CREDIT_CARD && this.cardData
+                                ? this.cardData.toInput()
+                                : undefined)];
                     case 1:
-                        response = _b.sent();
+                        response = _a.sent();
                         transactionStatus = response === null || response === void 0 ? void 0 : response.transactionStatus;
                         transactionSuccess = transactionStatus &&
                             [
@@ -23510,7 +23515,7 @@ var CheckoutViewModel = /** @class */ (function () {
                         if (!transactionSuccess) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.onCheckoutTransactionSuccess()];
                     case 2:
-                        _b.sent();
+                        _a.sent();
                         return [3 /*break*/, 4];
                     case 3:
                         if (transactionPending && !!(response === null || response === void 0 ? void 0 : response.returnSlug)) {
@@ -23522,7 +23527,7 @@ var CheckoutViewModel = /** @class */ (function () {
                                 type: ErrorType.UNKNOWN,
                             };
                         }
-                        _b.label = 4;
+                        _a.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -23572,12 +23577,13 @@ var CheckoutViewModel = /** @class */ (function () {
         };
         this.setPaymentGateway = function (index) {
             var paymentGateway = _this.paymentGateways[index];
-            _this.paymentGatewayId = paymentGateway.id;
-            if (paymentGateway.paymentMethodType === IkasPaymentMethodType.CREDIT_CARD) {
-                _this.cardData = new CreditCardData();
-            }
             _this.checkout.selectedPaymentGateway = paymentGateway;
-            _this.installmentInfo = undefined;
+            if (_this.step !== CheckoutStep.SUCCESS) {
+                if (paymentGateway.paymentMethodType === IkasPaymentMethodType.CREDIT_CARD) {
+                    _this.cardData = new CreditCardData();
+                }
+                _this.installmentInfo = undefined;
+            }
         };
         this.setInstallmentCount = function (count) {
             if (!_this.cardData)
@@ -23642,15 +23648,7 @@ var CheckoutViewModel = /** @class */ (function () {
     Object.defineProperty(CheckoutViewModel.prototype, "selectedPaymentGatewayIndex", {
         get: function () {
             var _this = this;
-            return this.paymentGateways.findIndex(function (pg) { return pg.id === _this.paymentGatewayId; });
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(CheckoutViewModel.prototype, "selectedPaymentGateway", {
-        get: function () {
-            var _this = this;
-            return this.paymentGateways.find(function (pg) { return pg.id === _this.paymentGatewayId; });
+            return this.paymentGateways.findIndex(function (pg) { var _a; return pg.id === ((_a = _this.checkout.selectedPaymentGateway) === null || _a === void 0 ? void 0 : _a.id); });
         },
         enumerable: false,
         configurable: true
@@ -23749,7 +23747,7 @@ var CheckoutViewModel = /** @class */ (function () {
                 return false;
             return (this.canProceedToShipping &&
                 !!((_a = this.checkout.billingAddress) === null || _a === void 0 ? void 0 : _a.isValid) &&
-                (((_b = this.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.paymentMethodType) ===
+                (((_b = this.checkout.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.paymentMethodType) ===
                     IkasPaymentMethodType.CREDIT_CARD
                     ? (_c = this.cardData) === null || _c === void 0 ? void 0 : _c.isValid : true));
         },
@@ -61124,14 +61122,15 @@ var CalculatedAdditionalPrices = mobxReactLite.observer(function (_a) {
     if (!vm.cart)
         return null;
     return (React.createElement(React.Fragment, null,
-        (((_b = vm.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.getCalculatedAdditionalPrices(vm.checkout.totalFinalPrice || 0, vm.checkout.shippingLines || null)) || [])
-            .filter(function (adjustment) { return adjustment.amount !== 0; })
-            .map(function (adjustment, index) { return (React.createElement("div", { className: styles$h.InfoRow, key: index },
-            React.createElement("div", { className: styles$h.Label }, adjustment.name),
-            React.createElement("div", { className: styles$h.Value },
-                React.createElement("span", null, adjustment.type === "DECREMENT" ? "- " : ""),
-                " ",
-                React.createElement("span", null, formatMoney(adjustment.amount, vm.cart.currencyCode))))); }), (_c = vm.checkout.giftPackageLines) === null || _c === void 0 ? void 0 :
+        vm.step !== CheckoutStep.SUCCESS &&
+            (((_b = vm.checkout.selectedPaymentGateway) === null || _b === void 0 ? void 0 : _b.getCalculatedAdditionalPrices(vm.checkout.totalFinalPrice || 0, vm.checkout.shippingLines || null)) || [])
+                .filter(function (adjustment) { return adjustment.amount !== 0; })
+                .map(function (adjustment, index) { return (React.createElement("div", { className: styles$h.InfoRow, key: index },
+                React.createElement("div", { className: styles$h.Label }, adjustment.name),
+                React.createElement("div", { className: styles$h.Value },
+                    React.createElement("span", null, adjustment.type === "DECREMENT" ? "- " : ""),
+                    " ",
+                    React.createElement("span", null, formatMoney(adjustment.amount, vm.cart.currencyCode))))); }), (_c = vm.checkout.giftPackageLines) === null || _c === void 0 ? void 0 :
         _c.map(function (gpl, index) { return (React.createElement("div", { className: styles$h.InfoRow, key: index },
             React.createElement("div", { className: styles$h.Label },
                 React.createElement("div", { className: styles$h.GiftLabel },
@@ -62436,7 +62435,7 @@ var _slug_ = /*#__PURE__*/Object.freeze({
 });
 
 var CheckoutPage = function (_a) {
-    var checkoutId = _a.checkoutId, editorCheckout = _a.editorCheckout, checkoutSettingsStr = _a.checkoutSettingsStr, customizationProps = _a.customizationProps, configJson = _a.configJson, others = __rest(_a, ["checkoutId", "editorCheckout", "checkoutSettingsStr", "customizationProps", "configJson"]);
+    var checkoutId = _a.checkoutId, checkoutSettingsStr = _a.checkoutSettingsStr, customizationProps = _a.customizationProps, configJson = _a.configJson, others = __rest(_a, ["checkoutId", "checkoutSettingsStr", "customizationProps", "configJson"]);
     var router$1 = router.useRouter();
     var _b = React.useState(), checkout = _b[0], setCheckout = _b[1];
     IkasStorefrontConfig.initWithJson(configJson);
@@ -62464,10 +62463,7 @@ var CheckoutPage = function (_a) {
     }, [customizationProps]);
     React.useEffect(function () {
         store.checkLocalization();
-        if (!editorCheckout)
-            getCheckout();
-        else
-            setCheckout(editorCheckout);
+        getCheckout();
     }, []);
     var getCheckout = React.useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {
         var checkout;

package/build/pages/checkout/[id].d.ts

@@ -3,10 +3,8 @@ import * as React from "react";
 import { GetServerSideProps } from "next";
 import { ParsedUrlQuery } from "querystring";
 import { IkasCheckoutCustomizationProps } from "../../components/checkout/index";
-import { IkasCheckout } from "../../models/index";
 declare type Props = {
     checkoutId: string;
-    editorCheckout?: IkasCheckout;
     checkoutSettingsStr: string | null;
     customizationProps: IkasCheckoutCustomizationProps;
     returnPolicy: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "0.0.164-alpha.4",
+  "version": "0.0.164-alpha.5",
   "main": "./build/index.js",
   "module": "./build/index.es.js",
   "author": "Umut Ozan Yıldırım",