@evershop/evershop 1.0.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/build/client/index.js +1 -1
- package/bin/build/complie.js +1 -1
- package/bin/build/index.js +25 -1
- package/bin/build/server/index.js +1 -1
- package/bin/build/server/useDDL.js +1 -1
- package/bin/dev/index.js +2 -1
- package/bin/evershop +8 -7
- package/bin/extension/index.js +3 -3
- package/bin/install/index.js +1 -1
- package/bin/lib/addDefaultMiddlewareFuncs.js +9 -4
- package/bin/lib/app.js +1 -1
- package/bin/lib/bootstrap/migrate.js +1 -1
- package/bin/lib/buildEntry.js +16 -1
- package/bin/lib/onError.js +1 -1
- package/bin/lib/onListening.js +7 -4
- package/bin/lib/startUp.js +16 -9
- package/bin/lib/watch/watchComponents.js +16 -26
- package/bin/lib/watch/watchMF.js +1 -1
- package/bin/lib/watch/watchMR.js +1 -1
- package/bin/lib/watch/watchSchema.js +1 -1
- package/bin/user/changePassword.js +1 -1
- package/bin/user/create.js +1 -1
- package/package.json +10 -2
- package/src/components/admin/catalog/productEdit/category/CategoryItem.jsx +3 -8
- package/src/components/admin/catalog/productEdit/category/CategoryTree.jsx +15 -8
- package/src/components/admin/catalog/productEdit/category/CategoryTree.scss +10 -0
- package/src/components/admin/catalog/productEdit/variants/CreateVariant.jsx +2 -2
- package/src/components/admin/catalog/productEdit/variants/CreateVariantGroup.jsx +4 -9
- package/src/components/admin/catalog/productEdit/variants/EditVariant.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/New.jsx +2 -2
- package/src/components/admin/catalog/productEdit/variants/Search.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/SearchModal.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/Variant.jsx +1 -1
- package/src/components/admin/catalog/productEdit/variants/VariantModal.jsx +68 -12
- package/src/components/admin/catalog/productEdit/variants/Variants.jsx +1 -1
- package/src/components/admin/catalog/productGrid/rows/ThumbnailRow.jsx +1 -1
- package/src/components/admin/checkout/shippingSetting/Method.jsx +130 -0
- package/src/components/admin/{oms → checkout}/shippingSetting/MethodForm.jsx +127 -16
- package/src/components/admin/{oms → checkout}/shippingSetting/Methods.jsx +5 -5
- package/src/components/admin/checkout/shippingSetting/PriceBasedPrice.jsx +101 -0
- package/src/components/admin/checkout/shippingSetting/WeightBasedPrice.jsx +101 -0
- package/src/components/admin/{oms → checkout}/shippingSetting/Zone.jsx +40 -10
- package/src/components/admin/{oms → checkout}/shippingSetting/ZoneForm.jsx +1 -1
- package/src/components/admin/{oms → checkout}/shippingSetting/Zones.jsx +6 -3
- package/src/components/admin/cms/Card.jsx +3 -3
- package/src/components/admin/cms/PageHeading.jsx +3 -3
- package/src/components/admin/cms/widget/WidgetTypes.jsx +28 -0
- package/src/components/admin/cms/widget/grid/WidgetTypeRow.jsx +29 -0
- package/src/components/admin/oms/orderEdit/items/ItemVariantOptions.jsx +1 -1
- package/src/components/admin/oms/orderEdit/items/Name.jsx +1 -1
- package/src/components/admin/oms/orderGrid/headers/OrderDateColumnHeader.jsx +1 -1
- package/src/components/admin/promotion/couponEdit/AttributeGroupSelector.jsx +8 -8
- package/src/components/admin/promotion/couponEdit/BuyXGetY.jsx +2 -2
- package/src/components/admin/promotion/couponEdit/CategorySelector.jsx +10 -10
- package/src/components/admin/promotion/couponEdit/CollectionSelector.jsx +8 -8
- package/src/components/admin/promotion/couponEdit/ProductSkuSelector.jsx +30 -9
- package/src/components/admin/promotion/couponEdit/RequireProducts.jsx +2 -2
- package/src/components/admin/promotion/couponEdit/Setting.jsx +1 -1
- package/src/components/admin/promotion/couponEdit/TargetProducts.jsx +4 -4
- package/src/components/admin/tax/taxSetting/Rate.jsx +6 -6
- package/src/components/admin/tax/taxSetting/RateForm.jsx +5 -5
- package/src/components/admin/tax/taxSetting/Rates.jsx +6 -6
- package/src/components/admin/tax/taxSetting/TaxClass.jsx +3 -3
- package/src/components/admin/tax/taxSetting/TaxClassForm.jsx +1 -1
- package/src/components/admin/widgets/BasicMenuSetting.jsx +614 -0
- package/src/components/admin/widgets/BasicMenuSetting.scss +19 -0
- package/src/components/admin/widgets/CollectionProductsSetting.jsx +203 -0
- package/src/components/admin/widgets/TextBlockSetting.jsx +70 -0
- package/src/components/common/Area.jsx +31 -8
- package/src/components/common/Badge.jsx +1 -1
- package/src/components/common/Editor.jsx +191 -0
- package/src/components/common/Notification.scss +1 -0
- package/src/components/common/SimplePagination.jsx +2 -2
- package/src/components/common/context/checkout.jsx +8 -14
- package/src/components/common/form/Field.jsx +1 -1
- package/src/components/common/form/Form.jsx +1 -1
- package/src/components/common/form/fields/Checkbox.jsx +1 -1
- package/src/components/common/form/fields/Ckeditor.jsx +11 -11
- package/src/components/common/form/fields/Editor.jsx +326 -0
- package/src/components/common/form/fields/Editor.scss +29 -0
- package/src/components/common/form/fields/Input.jsx +2 -1
- package/src/components/common/form/fields/Radio.jsx +1 -1
- package/src/components/common/form/fields/editor/FileBrowser.jsx +419 -0
- package/src/components/common/form/fields/editor/FileBrowser.scss +37 -0
- package/src/components/common/form/fields/editor/GetColumnClasses.jsx +14 -0
- package/src/components/common/form/fields/editor/GetRowClasses.jsx +18 -0
- package/src/components/common/form/fields/editor/RowTemplates.jsx +154 -0
- package/src/components/common/form/validator.js +6 -2
- package/src/components/common/grid/Pagination.jsx +4 -4
- package/src/components/common/grid/headers/Dummy.jsx +1 -1
- package/src/components/common/grid/headers/FromTo.jsx +1 -1
- package/src/components/common/grid/headers/Sortable.jsx +148 -0
- package/src/components/common/grid/rows/StatusRow.jsx +1 -1
- package/src/components/common/grid/rows/ThumbnailRow.jsx +1 -1
- package/src/components/common/list/Filter.jsx +83 -0
- package/src/components/common/list/Filter.scss +39 -0
- package/src/components/common/modal/Alert.jsx +1 -1
- package/src/components/common/modal/Modal.jsx +1 -1
- package/src/components/frontStore/catalog/categoryView/filter/AttributeFilter.jsx +21 -7
- package/src/components/frontStore/catalog/categoryView/filter/CategoryFilter.jsx +61 -53
- package/src/components/frontStore/catalog/categoryView/filter/CategoryFilter.scss +5 -0
- package/src/components/frontStore/catalog/categoryView/filter/PriceFilter.jsx +20 -11
- package/src/components/frontStore/catalog/product/list/List.jsx +4 -4
- package/src/components/frontStore/catalog/product/list/Pagination.jsx +1 -1
- package/src/components/frontStore/catalog/product/list/SortOptions.jsx +4 -2
- package/src/components/frontStore/catalog/product/list/Sorting.jsx +7 -7
- package/src/components/frontStore/catalog/product/list/item/Name.jsx +1 -1
- package/src/components/frontStore/checkout/cart/Empty.jsx +3 -3
- package/src/components/frontStore/checkout/cart/items/ItemOptions.jsx +1 -1
- package/src/components/frontStore/checkout/cart/items/ItemVariantOptions.jsx +1 -1
- package/src/components/frontStore/checkout/cart/items/Items.jsx +20 -21
- package/src/components/frontStore/checkout/cart/items/Items.scss +47 -0
- package/src/components/frontStore/checkout/cart/items/Quantity.jsx +154 -0
- package/src/components/frontStore/checkout/checkout/StepTitle.jsx +1 -1
- package/src/components/frontStore/checkout/checkout/payment/paymentStep/StepContent.jsx +13 -10
- package/src/components/frontStore/checkout/checkout/shipment/StepContent.jsx +1 -1
- package/src/components/frontStore/checkout/checkout/summary/Cart.jsx +10 -12
- package/src/components/frontStore/checkout/checkout/summary/Items.jsx +9 -9
- package/src/components/frontStore/checkout/checkout/summary/cart/Total.jsx +6 -6
- package/src/components/frontStore/checkout/success/summary/items/ItemOptions.jsx +1 -1
- package/src/components/frontStore/checkout/success/summary/items/Items.jsx +9 -6
- package/src/components/frontStore/checkout/success/summary/order/OrderSummary.jsx +9 -13
- package/src/components/frontStore/checkout/success/summary/order/Total.jsx +5 -5
- package/src/components/frontStore/customer/address/addressForm/AddressFormLoadingSkeleton.jsx +2 -2
- package/src/components/frontStore/customer/address/addressForm/NameAndTelephone.jsx +1 -1
- package/src/components/frontStore/customer/address/addressForm/ProvinceAndPostcode.jsx +1 -1
- package/src/components/frontStore/customer/checkout/Edit.jsx +2 -2
- package/src/components/frontStore/customer/detail/Order.jsx +4 -4
- package/src/components/frontStore/stripe/checkout/CheckoutForm.jsx +9 -5
- package/src/components/frontStore/stripe/checkout/TestCards.jsx +1 -1
- package/src/components/frontStore/widgets/BasicMenu.jsx +129 -0
- package/src/{modules/catalog/pages/frontStore/homepage/FeaturedProducts.jsx → components/frontStore/widgets/CollectionProducts.jsx} +40 -32
- package/src/components/frontStore/widgets/TextBlock.jsx +46 -0
- package/src/lib/componee/getComponentsByRoute.js +15 -2
- package/src/lib/event/callSubscibers.js +14 -11
- package/src/lib/event/event-manager.js +2 -2
- package/src/lib/event/loadSubscribers.js +2 -2
- package/src/lib/helpers.js +3 -1
- package/src/lib/log/CustomColorize.js +22 -0
- package/src/lib/log/logger.js +153 -19
- package/src/lib/middleware/Handler.js +2 -3
- package/src/lib/middleware/async.js +5 -9
- package/src/lib/middleware/sync.js +5 -10
- package/src/lib/middleware/tests/app/app.js +1 -1
- package/src/lib/middleware/tests/app/modules/404page/pages/frontStore/product/route.json +2 -1
- package/src/lib/middlewares/static.js +3 -1
- package/src/lib/response/render.js +5 -6
- package/src/lib/router/Router.js +1 -1
- package/src/lib/router/buildAbsoluteUrl.js +1 -1
- package/src/lib/router/loadModuleRoutes.js +3 -0
- package/src/lib/router/registerAdminRoute.js +9 -1
- package/src/lib/router/registerFrontStoreRoute.js +2 -0
- package/src/lib/router/scanForRoutes.js +1 -0
- package/src/lib/router/tests/unit/unit.validateRoute.test.js +7 -1
- package/src/lib/util/buildFilterFromUrl.js +31 -64
- package/src/lib/util/defaultPaginationFilters.js +104 -0
- package/src/lib/util/filterOperationMapp.js +16 -0
- package/src/lib/util/getEnabledWidgets.js +28 -0
- package/src/lib/util/merge.js +67 -14
- package/src/lib/util/registry.js +44 -6
- package/src/lib/util/tests/unit/util.merge.test.js +21 -4
- package/src/lib/util/validateConfiguration.js +83 -0
- package/src/lib/webpack/createBaseConfig.js +4 -1
- package/src/lib/webpack/dev/createConfigClient.js +12 -2
- package/src/lib/webpack/loaders/AreaLoader.js +15 -4
- package/src/lib/webpack/loaders/loadTranslationFromCsv.js +1 -1
- package/src/lib/webpack/plugins/Tailwindcss.js +1 -1
- package/src/lib/webpack/util/parseGraphql.js +29 -16
- package/src/lib/webpack/util/parseGraphqlByFile.js +16 -2
- package/src/modules/auth/graphql/types/AdminUser/AdminUser.admin.resolvers.js +6 -6
- package/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx +55 -36
- package/src/modules/auth/pages/admin/all/AdminUser.jsx +3 -3
- package/src/modules/base/api/global/[apiResponse]apiErrorHandler.js +2 -2
- package/src/modules/base/bootstrap.js +79 -0
- package/src/modules/base/graphql/types/Route/Route.admin.graphql +15 -0
- package/src/modules/base/graphql/types/Route/Route.admin.resolvers.js +10 -0
- package/src/modules/base/pages/global/[response]errorHandler.js +2 -2
- package/src/modules/base/pages/global/response[errorHandler].js +23 -0
- package/src/modules/catalog/api/addProductToCategory/addProducts.js +1 -1
- package/src/modules/catalog/api/addProductToCollection/addProducts.js +35 -22
- package/src/modules/catalog/api/removeProductFromCollection/removeProducts.js +20 -5
- package/src/modules/catalog/bootstrap.js +188 -5
- package/src/modules/catalog/graphql/types/Attribute/Attribute.admin.graphql +2 -2
- package/src/modules/catalog/graphql/types/Attribute/Attribute.admin.resolvers.js +48 -276
- package/src/modules/catalog/graphql/types/Category/Category.graphql +19 -5
- package/src/modules/catalog/graphql/types/Category/Category.resolvers.js +36 -2
- package/src/modules/catalog/graphql/types/Collection/Collection.graphql +2 -2
- package/src/modules/catalog/graphql/types/Collection/Collection.resolvers.js +36 -2
- package/src/modules/catalog/graphql/types/Product/Attribute/ProductAttribute.resolvers.js +1 -0
- package/src/modules/catalog/graphql/types/Product/Product.graphql +1 -1
- package/src/modules/catalog/graphql/types/Product/Product.resolvers.js +35 -1
- package/src/modules/catalog/graphql/types/Product/Variant/Variant.graphql +2 -2
- package/src/modules/catalog/graphql/types/Product/Variant/Variant.resolvers.js +68 -92
- package/src/modules/catalog/graphql/types/Widget/CollectionProductsWidget/CollectionProductsWidget.graphql +11 -0
- package/src/modules/catalog/graphql/types/Widget/CollectionProductsWidget/CollectionProductsWidget.resolvers.js +8 -0
- package/src/modules/catalog/migration/Version-1.0.0.js +1 -0
- package/src/modules/catalog/migration/Version-1.0.7.js +10 -0
- package/src/modules/catalog/pages/admin/attributeEdit+attributeNew/FormContent.jsx +4 -4
- package/src/modules/catalog/pages/admin/attributeEdit+attributeNew/General.jsx +18 -14
- package/src/modules/catalog/pages/admin/attributeGrid/Grid.jsx +84 -41
- package/src/modules/catalog/pages/admin/attributeGrid/index.js +1 -1
- package/src/modules/catalog/pages/admin/categoryEdit/Products.jsx +9 -9
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/FormContent.jsx +4 -4
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/General.jsx +16 -18
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/Image.jsx +1 -2
- package/src/modules/catalog/pages/admin/categoryEdit+categoryNew/Status.jsx +16 -1
- package/src/modules/catalog/pages/admin/categoryGrid/Grid.jsx +50 -18
- package/src/modules/catalog/pages/admin/categoryGrid/index.js +1 -1
- package/src/modules/catalog/pages/admin/collectionEdit/Products.jsx +9 -9
- package/src/modules/catalog/pages/admin/collectionEdit+collectionNew/FormContent.jsx +2 -2
- package/src/modules/catalog/pages/admin/collectionEdit+collectionNew/General.jsx +2 -2
- package/src/modules/catalog/pages/admin/collectionGrid/Grid.jsx +48 -7
- package/src/modules/catalog/pages/admin/collectionGrid/index.js +1 -1
- package/src/modules/catalog/pages/admin/productEdit/Collection.jsx +7 -7
- package/src/modules/catalog/pages/admin/productEdit+productNew/Attributes.jsx +29 -25
- package/src/modules/catalog/pages/admin/productEdit+productNew/CustomOptions.jsss +4 -4
- package/src/modules/catalog/pages/admin/productEdit+productNew/FormContent.jsx +4 -4
- package/src/modules/catalog/pages/admin/productEdit+productNew/General.jsx +15 -17
- package/src/modules/catalog/pages/admin/productGrid/Grid.jsx +160 -28
- package/src/modules/catalog/pages/admin/productGrid/index.js +1 -2
- package/src/modules/catalog/pages/frontStore/all/SearchBox.jsx +2 -1
- package/src/modules/catalog/pages/frontStore/catalogSearch/General.jsx +2 -2
- package/src/modules/catalog/pages/frontStore/catalogSearch/Products.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/catalogSearch/[index]filters.js +4 -59
- package/src/modules/catalog/pages/frontStore/catalogSearch/index.js +11 -0
- package/src/modules/catalog/pages/frontStore/catalogSearch/route.json +2 -1
- package/src/modules/catalog/pages/frontStore/categoryView/CategoryView.jsx +19 -2
- package/src/modules/catalog/pages/frontStore/categoryView/Filter.jsx +22 -6
- package/src/modules/catalog/pages/frontStore/categoryView/Filter.scss +3 -0
- package/src/modules/catalog/pages/frontStore/categoryView/General.jsx +6 -8
- package/src/modules/catalog/pages/frontStore/categoryView/General.scss +0 -2
- package/src/modules/catalog/pages/frontStore/categoryView/Pagination.jsx +6 -0
- package/src/modules/catalog/pages/frontStore/categoryView/Products.jsx +8 -1
- package/src/modules/catalog/pages/frontStore/categoryView/[index]filters.js +5 -105
- package/src/modules/catalog/pages/frontStore/categoryView/route.json +2 -1
- package/src/modules/catalog/pages/frontStore/productView/Description.jsx +3 -3
- package/src/modules/catalog/pages/frontStore/productView/Form.jsx +12 -7
- package/src/modules/catalog/pages/frontStore/productView/Form.scss +1 -0
- package/src/modules/catalog/pages/frontStore/productView/GeneralInfo.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/productView/Images.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/productView/Layout.jsx +1 -1
- package/src/modules/catalog/pages/frontStore/productView/Options.jsx +2 -2
- package/src/modules/catalog/pages/frontStore/productView/Variants.jsx +106 -44
- package/src/modules/catalog/pages/frontStore/productView/route.json +2 -1
- package/src/modules/catalog/services/AttributeCollection.js +59 -0
- package/src/modules/catalog/services/AttributeGroupCollection.js +100 -0
- package/src/modules/catalog/services/CategoryCollection.js +26 -83
- package/src/modules/catalog/services/CollectionCollection.js +23 -71
- package/src/modules/catalog/services/ProductCollection.js +50 -216
- package/src/modules/catalog/services/attribute/deleteProductAttribute.js +15 -0
- package/src/modules/catalog/services/getAttributeGroupsBaseQuery.js +3 -0
- package/src/modules/catalog/services/getAttributesBaseQuery.js +3 -0
- package/src/modules/catalog/services/getCollectionsBaseQuery.js +0 -1
- package/src/modules/catalog/services/product/updateProduct.js +8 -2
- package/src/modules/catalog/services/registerCartItemProductUrlField.js +35 -0
- package/src/modules/catalog/services/registerCartItemVariantOptionsField.js +51 -0
- package/src/modules/catalog/services/registerDefaultAttributeCollectionFilters.js +149 -0
- package/src/modules/catalog/services/registerDefaultCategoryCollectionFilters.js +101 -0
- package/src/modules/catalog/services/registerDefaultCollectionCollectionFilters.js +65 -0
- package/src/modules/catalog/services/registerDefaultProductCollectionFilters.js +219 -0
- package/src/modules/catalog/subscribers/category_created/buildUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/category_deleted/deleteUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/category_updated/builUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/product_created/builUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/product_deleted/deleteUrlRewrite.js +1 -1
- package/src/modules/catalog/subscribers/product_image_added/localGenerateProductImageVariant.js +3 -3
- package/src/modules/checkout/api/addCartShippingMethod/saveShippingMethod.js +6 -1
- package/src/modules/checkout/api/addShippingNote/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/addShippingNote/payloadSchema.json +15 -0
- package/src/modules/checkout/api/addShippingNote/route.json +5 -0
- package/src/modules/checkout/api/addShippingNote/saveShippingNote.js +50 -0
- package/src/modules/checkout/api/createCart/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/createCart/createNewCart.js +119 -0
- package/src/modules/checkout/api/createCart/payloadSchema.json +44 -0
- package/src/modules/checkout/api/createCart/route.json +5 -0
- package/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js +58 -0
- package/src/modules/checkout/api/deleteShippingZone/route.json +5 -0
- package/src/modules/checkout/api/deleteShippingZoneMethod/deleteShippingZoneMethod.js +85 -0
- package/src/modules/checkout/api/deleteShippingZoneMethod/route.json +5 -0
- package/src/modules/checkout/api/getShippingMethods/sendMethods.js +37 -0
- package/src/modules/checkout/api/updateCartItemQty/[bodyParser]updateQty.js +49 -0
- package/src/modules/checkout/api/updateCartItemQty/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/updateCartItemQty/payloadSchema.json +21 -0
- package/src/modules/checkout/api/updateCartItemQty/route.json +5 -0
- package/src/modules/checkout/api/updateMineCartItemQty/[context]bodyParser[auth].js +5 -0
- package/src/modules/checkout/api/updateMineCartItemQty/[detectCurrentCart]updateQty.js +51 -0
- package/src/modules/checkout/api/updateMineCartItemQty/[getCurrentCustomer]detectCurrentCart.js +32 -0
- package/src/modules/checkout/api/updateMineCartItemQty/payloadSchema.json +21 -0
- package/src/modules/checkout/api/updateMineCartItemQty/route.json +5 -0
- package/src/modules/checkout/api/updateShippingMethod/[context]borderParser[auth].js +5 -0
- package/src/modules/checkout/api/updateShippingMethod/payloadSchema.json +12 -0
- package/src/modules/checkout/api/updateShippingMethod/route.json +5 -0
- package/src/modules/checkout/api/updateShippingMethod/updateShippingMethod.js +64 -0
- package/src/modules/checkout/api/updateShippingZoneMethod/payloadSchema.json +43 -1
- package/src/modules/checkout/api/updateShippingZoneMethod/updateShippingZoneMethod.js +17 -3
- package/src/modules/checkout/bootstrap.js +28 -1
- package/src/modules/checkout/graphql/types/Cart/Cart.graphql +22 -3
- package/src/modules/checkout/graphql/types/Cart/Cart.resolvers.js +18 -2
- package/src/modules/checkout/graphql/types/CheckoutSetting/CheckoutSetting.graphql +3 -0
- package/src/modules/checkout/graphql/types/CheckoutSetting/CheckoutSetting.resolvers.js +7 -0
- package/src/modules/checkout/graphql/types/ShippingMethod/ShippingMethod.graphql +1 -0
- package/src/modules/checkout/graphql/types/ShippingMethod/ShippingMethod.resolvers.js +4 -0
- package/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.graphql +21 -1
- package/src/modules/checkout/graphql/types/ShippingZone/ShippingZone.resolvers.js +34 -4
- package/src/modules/checkout/graphql/types/Weight/Weight.resolvers.js +8 -11
- package/src/modules/checkout/migration/Version-1.0.0.js +14 -0
- package/src/modules/checkout/migration/Version-1.0.5.js +28 -0
- package/src/modules/checkout/migration/Version-1.0.6.js +201 -0
- package/src/modules/{oms → checkout}/pages/admin/shippingSetting/ShippingSetting.jsx +67 -44
- package/src/modules/checkout/pages/frontStore/all/[auth]addCustomerToCart.js +3 -3
- package/src/modules/checkout/pages/frontStore/all/[context]detectCurrentCart[auth].js +5 -0
- package/src/modules/checkout/pages/frontStore/cart/ShoppingCart.jsx +17 -8
- package/src/modules/checkout/pages/frontStore/cart/Summary.jsx +18 -19
- package/src/modules/checkout/pages/frontStore/cart/route.json +2 -1
- package/src/modules/checkout/pages/frontStore/checkout/Checkout.jsx +5 -5
- package/src/modules/checkout/pages/frontStore/checkout/Checkout.scss +4 -0
- package/src/modules/checkout/pages/frontStore/checkout/PaymentStep.jsx +3 -2
- package/src/modules/checkout/pages/frontStore/checkout/ShippingMethods.jsx +25 -12
- package/src/modules/checkout/pages/frontStore/checkout/ShippingNote.jsx +105 -0
- package/src/modules/checkout/pages/frontStore/checkout/Summary.jsx +14 -14
- package/src/modules/checkout/pages/frontStore/checkout/SummaryMobile.jsx +129 -0
- package/src/modules/checkout/pages/frontStore/checkout/SummaryMobile.scss +7 -0
- package/src/modules/checkout/pages/frontStore/checkout/route.json +2 -1
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/CheckoutSuccess.jsx +1 -1
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/CheckoutSuccess.scss +4 -0
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/CustomerInfo.jsx +30 -32
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/ShippingNote.jsx +47 -0
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/Summary.jsx +12 -15
- package/src/modules/checkout/pages/frontStore/checkoutSuccess/route.json +2 -1
- package/src/modules/checkout/services/cart/Cart.js +41 -21
- package/src/modules/checkout/services/cart/DataObject.js +3 -3
- package/src/modules/checkout/services/cart/registerCartBaseFields.js +165 -41
- package/src/modules/checkout/services/cart/registerCartItemBaseFields.js +300 -373
- package/src/modules/checkout/services/toPrice.js +1 -1
- package/src/modules/checkout/tests/basicSetup.js +85 -0
- package/src/modules/checkout/tests/coupons.js +82 -0
- package/src/modules/checkout/tests/products.js +67 -0
- package/src/modules/checkout/tests/taxRates.js +3 -0
- package/src/modules/checkout/tests/unit/discountAmount.test.js +60 -0
- package/src/modules/checkout/tests/unit/grandTotal.test.js +83 -0
- package/src/modules/checkout/tests/unit/lineTotal.test.js +90 -0
- package/src/modules/checkout/tests/unit/lineTotalWithDiscount.test.js +103 -0
- package/src/modules/checkout/tests/unit/productPrice.test.js +67 -0
- package/src/modules/checkout/tests/unit/subTotal.test.js +85 -0
- package/src/modules/checkout/tests/unit/subTotalWithDiscount.test.js +117 -0
- package/src/modules/checkout/tests/unit/taxAmount.test.js +67 -0
- package/src/modules/checkout/tests/unit/taxAmountRounding.test.js +277 -0
- package/src/modules/cms/api/createWidget/[context]bodyParser[auth].js +5 -0
- package/src/modules/cms/api/createWidget/createWidget[finish].js +17 -0
- package/src/modules/cms/api/createWidget/finish[apiResponse].js +27 -0
- package/src/modules/cms/api/createWidget/payloadSchema.json +18 -0
- package/src/modules/cms/api/createWidget/route.json +5 -0
- package/src/modules/cms/api/deleteWidget/deleteWidget.js +27 -0
- package/src/modules/cms/api/deleteWidget/route.json +5 -0
- package/src/modules/cms/api/updateWidget/[context]bodyParser[auth].js +5 -0
- package/src/modules/cms/api/updateWidget/finish[apiResponse].js +27 -0
- package/src/modules/cms/api/updateWidget/payloadSchema.json +18 -0
- package/src/modules/cms/api/updateWidget/route.json +5 -0
- package/src/modules/cms/api/updateWidget/updateWidget[finish].js +17 -0
- package/src/modules/cms/bootstrap.js +239 -2
- package/src/modules/cms/graphql/types/CmsPage/CmsPage.graphql +1 -2
- package/src/modules/cms/graphql/types/CmsPage/CmsPage.resolvers.js +37 -12
- package/src/modules/cms/graphql/types/Widget/Widget.graphql +91 -0
- package/src/modules/cms/graphql/types/Widget/Widget.resolvers.js +142 -0
- package/src/modules/cms/migration/Version-1.1.0.js +22 -0
- package/src/modules/cms/migration/Version-1.1.1.js +103 -0
- package/src/modules/cms/pages/admin/adminNotFound/NotFound.jsx +4 -4
- package/src/modules/cms/pages/admin/all/CmsMenuGroup.jsx +12 -4
- package/src/modules/cms/pages/admin/all/Layout.scss +3 -2
- package/src/modules/cms/pages/admin/all/Notification.scss +1 -1
- package/src/modules/cms/pages/admin/all/SearchBox.jsx +1 -1
- package/src/modules/cms/pages/admin/all/search/NoResult.jsx +2 -2
- package/src/modules/cms/pages/admin/all/search/Results.jsx +3 -3
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/FormContent.jsx +7 -9
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/General.jsx +3 -3
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/Seo.jsx +1 -1
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/Status.jsx +40 -0
- package/src/modules/cms/pages/admin/cmsPageGrid/Grid.jsx +64 -12
- package/src/modules/cms/pages/admin/cmsPageGrid/index.js +1 -2
- package/src/modules/cms/pages/admin/dashboard/Layout.jsx +3 -3
- package/src/modules/cms/pages/admin/widgetEdit/WidgetForm.jsx +52 -0
- package/src/modules/cms/pages/admin/widgetEdit/index.js +36 -0
- package/src/modules/cms/pages/admin/widgetEdit/route.json +4 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/FormContent.jsx +69 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/FormContent.scss +7 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/General.jsx +185 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/PageHeading.jsx +37 -0
- package/src/modules/cms/pages/admin/widgetEdit+widgetNew/Setting.jsx +55 -0
- package/src/modules/cms/pages/admin/widgetGrid/Grid.jsx +415 -0
- package/src/modules/cms/pages/admin/widgetGrid/Heading.jsx +11 -0
- package/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx +52 -0
- package/src/modules/cms/pages/admin/widgetGrid/index.js +15 -0
- package/src/modules/cms/pages/admin/widgetGrid/route.json +4 -0
- package/src/modules/cms/pages/admin/widgetNew/WidgetNewForm.jsx +60 -0
- package/src/modules/cms/pages/admin/widgetNew/index.js +11 -0
- package/src/modules/cms/pages/admin/widgetNew/route.json +4 -0
- package/src/modules/cms/pages/admin/widgetNew/typeValidate.js +21 -0
- package/src/modules/cms/pages/frontStore/all/Breadcrumb.jsx +1 -1
- package/src/modules/cms/pages/frontStore/all/Footer.jsx +2 -2
- package/src/modules/cms/pages/frontStore/all/Layout.jsx +3 -3
- package/src/modules/cms/pages/frontStore/all/Layout.scss +13 -0
- package/src/modules/cms/pages/frontStore/all/Logo.jsx +2 -2
- package/src/modules/cms/pages/frontStore/all/Logo.scss +2 -4
- package/src/modules/cms/pages/frontStore/all/Notification.scss +1 -1
- package/src/modules/cms/pages/frontStore/cmsPageView/Layout.jsx +2 -2
- package/src/modules/cms/pages/frontStore/cmsPageView/View.jsx +5 -3
- package/src/modules/cms/pages/frontStore/cmsPageView/index.js +6 -12
- package/src/modules/cms/pages/frontStore/cmsPageView/route.json +2 -1
- package/src/modules/cms/pages/frontStore/homepage/route.json +2 -1
- package/src/modules/cms/pages/frontStore/notFound/NotFound.jsx +4 -4
- package/src/modules/cms/pages/frontStore/notFound/route.json +2 -1
- package/src/modules/cms/pages/frontStore/staticAsset/[context]staticAssets[auth].js +1 -1
- package/src/modules/cms/services/CMSPageCollection.js +23 -70
- package/src/modules/cms/services/WidgetCollection.js +62 -0
- package/src/modules/cms/services/getWidgetsBaseQuery.js +7 -0
- package/src/modules/cms/services/page/createPage.js +1 -2
- package/src/modules/cms/services/page/pageDataSchema.json +0 -4
- package/src/modules/cms/services/registerDefaultPageCollectionFilters.js +62 -0
- package/src/modules/cms/services/registerDefaultWidgetCollectionFilters.js +62 -0
- package/src/modules/cms/services/tailwind.admin.config.js +22 -102
- package/src/modules/cms/services/tailwind.frontStore.config.js +23 -108
- package/src/modules/cms/services/widget/createWidget.js +73 -0
- package/src/modules/cms/services/widget/deleteWidget.js +49 -0
- package/src/modules/cms/services/widget/loadWidgetInstances.js +54 -0
- package/src/modules/cms/services/widget/updateWidget.js +86 -0
- package/src/modules/cms/services/widget/widgetDataSchema.json +29 -0
- package/src/modules/cod/pages/admin/paymentSetting/CODSetting.jsx +2 -2
- package/src/modules/cod/pages/frontStore/checkout/CashOnDelivery.jsx +1 -1
- package/src/modules/customer/api/createCustomer/[bodyParser]createCustomer.js +2 -2
- package/src/modules/customer/api/resetPassword/[bodyParser]resetPassword.js +2 -2
- package/src/modules/customer/api/updatePassword/[bodyParser]updatePassword.js +2 -2
- package/src/modules/customer/bootstrap.js +50 -4
- package/src/modules/customer/graphql/types/Customer/Customer.admin.resolvers.js +2 -4
- package/src/modules/customer/pages/admin/customerEdit/CustomerEditForm.jsx +3 -3
- package/src/modules/customer/pages/admin/customerEdit+customerNew/OrderHistory.jsx +1 -1
- package/src/modules/customer/pages/admin/customerGrid/Grid.jsx +110 -16
- package/src/modules/customer/pages/admin/customerGrid/index.js +1 -2
- package/src/modules/customer/pages/frontStore/account/AccountDetails.jsx +3 -3
- package/src/modules/customer/pages/frontStore/account/Layout.jsx +3 -3
- package/src/modules/customer/pages/frontStore/account/OrderHistory.jsx +1 -1
- package/src/modules/customer/pages/frontStore/account/route.json +2 -1
- package/src/modules/customer/pages/frontStore/login/LoginForm.jsx +2 -3
- package/src/modules/customer/pages/frontStore/login/route.json +2 -1
- package/src/modules/customer/pages/frontStore/register/RegisterForm.jsx +2 -2
- package/src/modules/customer/pages/frontStore/register/route.json +2 -1
- package/src/modules/customer/pages/frontStore/resetPasswordPage/ResetPasswordForm.jsx +2 -2
- package/src/modules/customer/pages/frontStore/resetPasswordPage/route.json +2 -1
- package/src/modules/customer/pages/frontStore/updatePasswordPage/UpdatePasswordForm.jsx +3 -3
- package/src/modules/customer/pages/frontStore/updatePasswordPage/route.json +2 -1
- package/src/modules/customer/services/CustomerCollection.js +22 -103
- package/src/modules/customer/services/CustomerGroupCollection.js +20 -69
- package/src/modules/customer/services/registerDefaultCustomerCollectionFilters.js +90 -0
- package/src/modules/customer/services/registerDefaultCustomerGroupCollectionFilters.js +50 -0
- package/src/modules/graphql/pages/global/[bodyParser]buildQuery[graphql].js +239 -7
- package/src/modules/graphql/pages/global/[buildQuery]graphql[notification].js +13 -9
- package/src/modules/graphql/services/graphqlMiddleware.js +1 -1
- package/src/modules/oms/bootstrap.js +104 -3
- package/src/modules/oms/graphql/types/Order/Order.admin.resolvers.js +1 -1
- package/src/modules/oms/graphql/types/Order/Order.graphql +11 -2
- package/src/modules/oms/graphql/types/Order/Order.resolvers.js +9 -2
- package/src/modules/oms/pages/admin/dashboard/Bestsellers.jsx +2 -2
- package/src/modules/oms/pages/admin/dashboard/Lifetimesales.jsx +5 -5
- package/src/modules/oms/pages/admin/orderEdit/AddTrackingButton.jsx +1 -1
- package/src/modules/oms/pages/admin/orderEdit/Items.jsx +7 -7
- package/src/modules/oms/pages/admin/orderEdit/Layout.jsx +3 -3
- package/src/modules/oms/pages/admin/orderEdit/Payment.jsx +6 -6
- package/src/modules/oms/pages/admin/orderEdit/ShipButton.jsx +1 -1
- package/src/modules/oms/pages/admin/orderGrid/Grid.jsx +154 -53
- package/src/modules/oms/pages/admin/orderGrid/index.js +1 -2
- package/src/modules/oms/services/OrderCollection.js +18 -138
- package/src/modules/oms/services/registerDefaultOrderCollectionFilters.js +121 -0
- package/src/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.js +55 -24
- package/src/modules/paypal/pages/admin/paymentSetting/PaypalSetting.jsx +6 -6
- package/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx +3 -4
- package/src/modules/promotion/bootstrap.js +35 -101
- package/src/modules/promotion/graphql/types/Coupon/Coupon.admin.resolvers.js +2 -7
- package/src/modules/promotion/pages/admin/couponEdit+couponNew/DiscountType.jsx +1 -1
- package/src/modules/promotion/pages/admin/couponEdit+couponNew/FormContent.jsx +5 -5
- package/src/modules/promotion/pages/admin/couponGrid/Grid.jsx +159 -35
- package/src/modules/promotion/pages/admin/couponGrid/index.js +1 -2
- package/src/modules/promotion/pages/frontStore/cart/Coupon.jsx +2 -2
- package/src/modules/promotion/services/CouponCollection.js +21 -130
- package/src/modules/promotion/services/couponValidator.js +4 -7
- package/src/modules/promotion/services/discountCalculator.js +2 -7
- package/src/modules/promotion/services/registerCartItemPromotionFields.js +80 -0
- package/src/modules/promotion/services/registerCartPromotionFields.js +128 -0
- package/src/modules/promotion/services/registerDefaultCalculators.js +48 -20
- package/src/modules/promotion/services/registerDefaultCouponCollectionFilters.js +72 -0
- package/src/modules/promotion/services/registerDefaultValidators.js +16 -4
- package/src/modules/setting/pages/admin/paymentSetting/PaymentSetting.jsx +2 -2
- package/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx +98 -35
- package/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js +4 -2
- package/src/modules/stripe/pages/admin/paymentSetting/StripePayment.jsx +5 -5
- package/src/modules/stripe/pages/frontStore/checkout/Stripe.jsx +1 -1
- package/src/modules/tax/bootstrap.js +57 -5
- package/src/modules/tax/graphql/types/Product/Price/ProductPrice.resolvers.js +6 -39
- package/src/modules/tax/graphql/types/TaxSetting/TaxSetting.graphql +1 -2
- package/src/modules/tax/graphql/types/TaxSetting/TaxSetting.resolvers.js +1 -8
- package/src/modules/tax/pages/admin/taxSetting/TaxSetting.jsx +4 -4
- package/src/modules/tax/services/TaxClassCollection.js +22 -56
- package/src/modules/tax/services/calculateTaxAmount.js +12 -9
- package/src/modules/tax/services/registerCartItemTaxPercentField.js +76 -0
- package/src/modules/tax/services/registerDefaultTaxClassCollectionFilters.js +49 -0
- package/src/components/admin/oms/shippingSetting/Method.jsx +0 -73
- package/src/components/common/grid/headers/Basic.jsx +0 -55
- package/src/lib/log/debuger.js +0 -89
- package/src/modules/auth/services/adminSessionMiddleware.js +0 -0
- package/src/modules/catalog/pages/frontStore/homepage/FeaturedCategories.jsx +0 -58
- package/src/modules/cms/pages/admin/cmsPageEdit+cmsPageNew/StatusAndLayout.jsx +0 -61
- package/src/modules/cms/pages/frontStore/all/Menu.jsx +0 -46
- package/src/modules/cms/pages/frontStore/all/Menu.scss +0 -7
- package/src/modules/cms/pages/frontStore/all/MobileMenu.jsx +0 -73
- package/src/modules/cms/pages/frontStore/all/MobileMenu.scss +0 -35
- package/src/modules/cms/pages/frontStore/homepage/MainBanner.jsx +0 -31
- package/src/modules/cms/pages/frontStore/homepage/MainBanner.scss +0 -48
- package/src/modules/customer/pages/frontStore/login/LoginButton.jsx +0 -27
- /package/src/modules/{oms → checkout}/pages/admin/all/ShippingSettingMenu.jsx +0 -0
- /package/src/modules/{oms → checkout}/pages/admin/shippingSetting/index.js +0 -0
- /package/src/modules/{oms → checkout}/pages/admin/shippingSetting/route.json +0 -0
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
{
|
|
2
|
+
"type": "object",
|
|
3
|
+
"properties": {
|
|
4
|
+
"customer_full_name": {
|
|
5
|
+
"type": "string"
|
|
6
|
+
},
|
|
7
|
+
"customer_email": {
|
|
8
|
+
"type": ["string"],
|
|
9
|
+
"format": "email",
|
|
10
|
+
"errorMessage": {
|
|
11
|
+
"type": "Email is invalid"
|
|
12
|
+
}
|
|
13
|
+
},
|
|
14
|
+
"items": {
|
|
15
|
+
"type": "array",
|
|
16
|
+
"items": {
|
|
17
|
+
"type": "object",
|
|
18
|
+
"properties": {
|
|
19
|
+
"sku": {
|
|
20
|
+
"type": "string"
|
|
21
|
+
},
|
|
22
|
+
"qty": {
|
|
23
|
+
"type": "integer"
|
|
24
|
+
}
|
|
25
|
+
},
|
|
26
|
+
"required": ["sku", "qty"],
|
|
27
|
+
"additionalProperties": true,
|
|
28
|
+
"errorMessage": {
|
|
29
|
+
"properties": {
|
|
30
|
+
"sku": "Sku is required",
|
|
31
|
+
"qty": "Qty is invalid"
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
"required": ["items"],
|
|
38
|
+
"errorMessage": {
|
|
39
|
+
"required": {
|
|
40
|
+
"items": "Must provide at least one item"
|
|
41
|
+
}
|
|
42
|
+
},
|
|
43
|
+
"additionalProperties": true
|
|
44
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/* eslint-disable camelcase */
|
|
2
|
+
const {
|
|
3
|
+
rollback,
|
|
4
|
+
commit,
|
|
5
|
+
startTransaction,
|
|
6
|
+
del,
|
|
7
|
+
select
|
|
8
|
+
} = require('@evershop/postgres-query-builder');
|
|
9
|
+
const {
|
|
10
|
+
getConnection
|
|
11
|
+
} = require('@evershop/evershop/src/lib/postgres/connection');
|
|
12
|
+
const {
|
|
13
|
+
OK,
|
|
14
|
+
INTERNAL_SERVER_ERROR,
|
|
15
|
+
INVALID_PAYLOAD
|
|
16
|
+
} = require('@evershop/evershop/src/lib/util/httpStatus');
|
|
17
|
+
const { error } = require('@evershop/evershop/src/lib/log/logger');
|
|
18
|
+
|
|
19
|
+
// eslint-disable-next-line no-unused-vars
|
|
20
|
+
module.exports = async (request, response, deledate, next) => {
|
|
21
|
+
const { id } = request.params;
|
|
22
|
+
const connection = await getConnection();
|
|
23
|
+
await startTransaction(connection);
|
|
24
|
+
try {
|
|
25
|
+
// Load the shipping zone
|
|
26
|
+
const shippingZone = await select()
|
|
27
|
+
.from('shipping_zone')
|
|
28
|
+
.where('uuid', '=', id)
|
|
29
|
+
.load(connection);
|
|
30
|
+
|
|
31
|
+
if (!shippingZone) {
|
|
32
|
+
response.status(INVALID_PAYLOAD);
|
|
33
|
+
response.json({
|
|
34
|
+
error: {
|
|
35
|
+
status: INVALID_PAYLOAD,
|
|
36
|
+
message: 'Invalid zone id'
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
await del('shipping_zone').where('uuid', '=', id).execute(connection);
|
|
42
|
+
await commit(connection);
|
|
43
|
+
response.status(OK);
|
|
44
|
+
response.json({
|
|
45
|
+
data: shippingZone
|
|
46
|
+
});
|
|
47
|
+
} catch (e) {
|
|
48
|
+
error(e);
|
|
49
|
+
await rollback(connection);
|
|
50
|
+
response.status(INTERNAL_SERVER_ERROR);
|
|
51
|
+
response.json({
|
|
52
|
+
error: {
|
|
53
|
+
status: INTERNAL_SERVER_ERROR,
|
|
54
|
+
message: e.message
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
};
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/* eslint-disable camelcase */
|
|
2
|
+
const {
|
|
3
|
+
rollback,
|
|
4
|
+
commit,
|
|
5
|
+
startTransaction,
|
|
6
|
+
select,
|
|
7
|
+
del
|
|
8
|
+
} = require('@evershop/postgres-query-builder');
|
|
9
|
+
const {
|
|
10
|
+
getConnection
|
|
11
|
+
} = require('@evershop/evershop/src/lib/postgres/connection');
|
|
12
|
+
const {
|
|
13
|
+
OK,
|
|
14
|
+
INTERNAL_SERVER_ERROR,
|
|
15
|
+
INVALID_PAYLOAD
|
|
16
|
+
} = require('@evershop/evershop/src/lib/util/httpStatus');
|
|
17
|
+
|
|
18
|
+
// eslint-disable-next-line no-unused-vars
|
|
19
|
+
module.exports = async (request, response, deledate, next) => {
|
|
20
|
+
const { method_id, zone_id } = request.params;
|
|
21
|
+
const connection = await getConnection();
|
|
22
|
+
await startTransaction(connection);
|
|
23
|
+
try {
|
|
24
|
+
// Load the shipping zone
|
|
25
|
+
const shippingZone = await select()
|
|
26
|
+
.from('shipping_zone')
|
|
27
|
+
.where('uuid', '=', zone_id)
|
|
28
|
+
.load(connection, false);
|
|
29
|
+
|
|
30
|
+
if (!shippingZone) {
|
|
31
|
+
response.status(INVALID_PAYLOAD);
|
|
32
|
+
response.json({
|
|
33
|
+
error: {
|
|
34
|
+
status: INVALID_PAYLOAD,
|
|
35
|
+
message: 'Invalid zone id'
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
const zoneMethodQuery = select().from('shipping_method');
|
|
42
|
+
zoneMethodQuery
|
|
43
|
+
.innerJoin('shipping_zone_method')
|
|
44
|
+
.on(
|
|
45
|
+
'shipping_method.shipping_method_id',
|
|
46
|
+
'=',
|
|
47
|
+
'shipping_zone_method.method_id'
|
|
48
|
+
);
|
|
49
|
+
zoneMethodQuery
|
|
50
|
+
.where('shipping_zone_method.zone_id', '=', shippingZone.shipping_zone_id)
|
|
51
|
+
.and('shipping_method.uuid', '=', method_id);
|
|
52
|
+
|
|
53
|
+
const zoneMethod = await zoneMethodQuery.load(connection, false);
|
|
54
|
+
if (!zoneMethod) {
|
|
55
|
+
response.status(INVALID_PAYLOAD);
|
|
56
|
+
response.json({
|
|
57
|
+
error: {
|
|
58
|
+
status: INVALID_PAYLOAD,
|
|
59
|
+
message: 'Invalid method id'
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
// Delete the shipping zone method
|
|
66
|
+
await del('shipping_zone_method')
|
|
67
|
+
.where('method_id', '=', zoneMethod.shipping_method_id)
|
|
68
|
+
.and('zone_id', '=', shippingZone.shipping_zone_id)
|
|
69
|
+
.execute(connection);
|
|
70
|
+
await commit(connection);
|
|
71
|
+
response.status(OK);
|
|
72
|
+
response.json({
|
|
73
|
+
data: zoneMethod
|
|
74
|
+
});
|
|
75
|
+
} catch (e) {
|
|
76
|
+
await rollback(connection);
|
|
77
|
+
response.status(INTERNAL_SERVER_ERROR);
|
|
78
|
+
response.json({
|
|
79
|
+
error: {
|
|
80
|
+
status: INTERNAL_SERVER_ERROR,
|
|
81
|
+
message: e.message
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
};
|
|
@@ -131,6 +131,43 @@ module.exports = async (request, response, delegate, next) => {
|
|
|
131
131
|
...method,
|
|
132
132
|
cost: toPrice(jsonResponse.data.data.cost, true)
|
|
133
133
|
};
|
|
134
|
+
} else if (method.weight_based_cost) {
|
|
135
|
+
const totalWeight = cart.total_weight;
|
|
136
|
+
const weightBasedCost = method.weight_based_cost
|
|
137
|
+
.map(({ min_weight, cost }) => ({
|
|
138
|
+
min_weight: parseFloat(min_weight),
|
|
139
|
+
cost: toPrice(cost)
|
|
140
|
+
}))
|
|
141
|
+
.sort((a, b) => a.min_weight - b.min_weight);
|
|
142
|
+
|
|
143
|
+
let cost = 0;
|
|
144
|
+
for (let i = 0; i < weightBasedCost.length; i += 1) {
|
|
145
|
+
if (totalWeight >= weightBasedCost[i].min_weight) {
|
|
146
|
+
cost = weightBasedCost[i].cost;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
return {
|
|
150
|
+
...method,
|
|
151
|
+
cost: toPrice(cost, true)
|
|
152
|
+
};
|
|
153
|
+
} else if (method.price_based_cost) {
|
|
154
|
+
const subTotal = toPrice(cart.sub_total);
|
|
155
|
+
const priceBasedCost = method.price_based_cost
|
|
156
|
+
.map(({ min_price, cost }) => ({
|
|
157
|
+
min_price: toPrice(min_price),
|
|
158
|
+
cost: toPrice(cost)
|
|
159
|
+
}))
|
|
160
|
+
.sort((a, b) => a.min_price - b.min_price);
|
|
161
|
+
let cost = 0;
|
|
162
|
+
for (let i = 0; i < priceBasedCost.length; i += 1) {
|
|
163
|
+
if (subTotal >= priceBasedCost[i].min_price) {
|
|
164
|
+
cost = priceBasedCost[i].cost;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
return {
|
|
168
|
+
...method,
|
|
169
|
+
cost: toPrice(cost, true)
|
|
170
|
+
};
|
|
134
171
|
} else {
|
|
135
172
|
return {
|
|
136
173
|
...method,
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
const {
|
|
2
|
+
INVALID_PAYLOAD,
|
|
3
|
+
INTERNAL_SERVER_ERROR,
|
|
4
|
+
OK
|
|
5
|
+
} = require('@evershop/evershop/src/lib/util/httpStatus');
|
|
6
|
+
const {
|
|
7
|
+
translate
|
|
8
|
+
} = require('@evershop/evershop/src/lib/locale/translate/translate');
|
|
9
|
+
const { error } = require('@evershop/evershop/src/lib/log/logger');
|
|
10
|
+
const { getCartByUUID } = require('../../services/getCartByUUID');
|
|
11
|
+
const { saveCart } = require('../../services/saveCart');
|
|
12
|
+
|
|
13
|
+
module.exports = async (request, response, delegate, next) => {
|
|
14
|
+
try {
|
|
15
|
+
const { cart_id, item_id } = request.params;
|
|
16
|
+
const cart = await getCartByUUID(cart_id);
|
|
17
|
+
if (!cart) {
|
|
18
|
+
response.status(INVALID_PAYLOAD);
|
|
19
|
+
response.json({
|
|
20
|
+
error: {
|
|
21
|
+
message: translate('Invalid cart'),
|
|
22
|
+
status: INVALID_PAYLOAD
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const { action, qty } = request.body;
|
|
28
|
+
const item = await cart.updateItemQty(item_id, qty, action);
|
|
29
|
+
await saveCart(cart);
|
|
30
|
+
response.status(OK);
|
|
31
|
+
response.$body = {
|
|
32
|
+
data: {
|
|
33
|
+
item: item.export(),
|
|
34
|
+
count: cart.getItems().length,
|
|
35
|
+
cartId: cart.getData('uuid')
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
next();
|
|
39
|
+
} catch (err) {
|
|
40
|
+
error(err);
|
|
41
|
+
response.status(INTERNAL_SERVER_ERROR);
|
|
42
|
+
response.json({
|
|
43
|
+
error: {
|
|
44
|
+
status: INTERNAL_SERVER_ERROR,
|
|
45
|
+
message: err.message
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
};
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
{
|
|
2
|
+
"type": "object",
|
|
3
|
+
"properties": {
|
|
4
|
+
"action": {
|
|
5
|
+
"type": "string",
|
|
6
|
+
"enum": ["increase", "decrease"]
|
|
7
|
+
},
|
|
8
|
+
"qty": {
|
|
9
|
+
"type": ["string", "integer"],
|
|
10
|
+
"pattern": "^[1-9][0-9]*$"
|
|
11
|
+
}
|
|
12
|
+
},
|
|
13
|
+
"required": ["action", "qty"],
|
|
14
|
+
"additionalProperties": true,
|
|
15
|
+
"errorMessage": {
|
|
16
|
+
"properties": {
|
|
17
|
+
"action": "Action is required. It must be either 'increase' or 'decrease'",
|
|
18
|
+
"qty": "Qty is invalid"
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
const {
|
|
2
|
+
INVALID_PAYLOAD,
|
|
3
|
+
INTERNAL_SERVER_ERROR,
|
|
4
|
+
OK
|
|
5
|
+
} = require('@evershop/evershop/src/lib/util/httpStatus');
|
|
6
|
+
const {
|
|
7
|
+
translate
|
|
8
|
+
} = require('@evershop/evershop/src/lib/locale/translate/translate');
|
|
9
|
+
const { error } = require('@evershop/evershop/src/lib/log/logger');
|
|
10
|
+
const { getCartByUUID } = require('../../services/getCartByUUID');
|
|
11
|
+
const { saveCart } = require('../../services/saveCart');
|
|
12
|
+
const { getContextValue } = require('../../../graphql/services/contextHelper');
|
|
13
|
+
|
|
14
|
+
module.exports = async (request, response, delegate, next) => {
|
|
15
|
+
try {
|
|
16
|
+
const { item_id } = request.params;
|
|
17
|
+
const cartId = getContextValue(request, 'cartId');
|
|
18
|
+
const cart = await getCartByUUID(cartId);
|
|
19
|
+
if (!cart) {
|
|
20
|
+
response.status(INVALID_PAYLOAD);
|
|
21
|
+
response.json({
|
|
22
|
+
error: {
|
|
23
|
+
message: translate('Invalid cart'),
|
|
24
|
+
status: INVALID_PAYLOAD
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const { action, qty } = request.body;
|
|
30
|
+
const item = await cart.updateItemQty(item_id, qty, action);
|
|
31
|
+
await saveCart(cart);
|
|
32
|
+
response.status(OK);
|
|
33
|
+
response.$body = {
|
|
34
|
+
data: {
|
|
35
|
+
item: item.export(),
|
|
36
|
+
count: cart.getItems().length,
|
|
37
|
+
cartId: cart.getData('uuid')
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
next();
|
|
41
|
+
} catch (err) {
|
|
42
|
+
error(err);
|
|
43
|
+
response.status(INTERNAL_SERVER_ERROR);
|
|
44
|
+
response.json({
|
|
45
|
+
error: {
|
|
46
|
+
status: INTERNAL_SERVER_ERROR,
|
|
47
|
+
message: err.message
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
};
|
package/src/modules/checkout/api/updateMineCartItemQty/[getCurrentCustomer]detectCurrentCart.js
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
|
|
2
|
+
const { select } = require('@evershop/postgres-query-builder');
|
|
3
|
+
const { UNAUTHORIZED } = require('@evershop/evershop/src/lib/util/httpStatus');
|
|
4
|
+
const { setContextValue } = require('../../../graphql/services/contextHelper');
|
|
5
|
+
|
|
6
|
+
module.exports = async (request, response, delegate, next) => {
|
|
7
|
+
/**
|
|
8
|
+
* We firstly get the sessionID from the request.
|
|
9
|
+
* This API needs the client to send the session cookie in the request.
|
|
10
|
+
* Base on the sessionID, we can get the cart
|
|
11
|
+
*/
|
|
12
|
+
const { sessionID } = request.locals;
|
|
13
|
+
if (!sessionID) {
|
|
14
|
+
response.status(UNAUTHORIZED);
|
|
15
|
+
response.json({
|
|
16
|
+
error: {
|
|
17
|
+
status: UNAUTHORIZED,
|
|
18
|
+
message: 'Unauthorized'
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
} else {
|
|
22
|
+
const cart = await select()
|
|
23
|
+
.from('cart')
|
|
24
|
+
.where('sid', '=', sessionID)
|
|
25
|
+
.and('status', '=', 1)
|
|
26
|
+
.load(pool);
|
|
27
|
+
if (cart) {
|
|
28
|
+
setContextValue(request, 'cartId', cart.uuid);
|
|
29
|
+
}
|
|
30
|
+
next();
|
|
31
|
+
}
|
|
32
|
+
};
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
{
|
|
2
|
+
"type": "object",
|
|
3
|
+
"properties": {
|
|
4
|
+
"action": {
|
|
5
|
+
"type": "string",
|
|
6
|
+
"enum": ["increase", "decrease"]
|
|
7
|
+
},
|
|
8
|
+
"qty": {
|
|
9
|
+
"type": ["string", "integer"],
|
|
10
|
+
"pattern": "^[1-9][0-9]*$"
|
|
11
|
+
}
|
|
12
|
+
},
|
|
13
|
+
"required": ["action", "qty"],
|
|
14
|
+
"additionalProperties": true,
|
|
15
|
+
"errorMessage": {
|
|
16
|
+
"properties": {
|
|
17
|
+
"action": "Action is required. It must be either 'increase' or 'decrease'",
|
|
18
|
+
"qty": "Qty is invalid"
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/* eslint-disable camelcase */
|
|
2
|
+
const {
|
|
3
|
+
rollback,
|
|
4
|
+
commit,
|
|
5
|
+
startTransaction,
|
|
6
|
+
select,
|
|
7
|
+
update
|
|
8
|
+
} = require('@evershop/postgres-query-builder');
|
|
9
|
+
const {
|
|
10
|
+
getConnection
|
|
11
|
+
} = require('@evershop/evershop/src/lib/postgres/connection');
|
|
12
|
+
const {
|
|
13
|
+
OK,
|
|
14
|
+
INTERNAL_SERVER_ERROR,
|
|
15
|
+
INVALID_PAYLOAD
|
|
16
|
+
} = require('@evershop/evershop/src/lib/util/httpStatus');
|
|
17
|
+
const { error } = require('@evershop/evershop/src/lib/log/logger');
|
|
18
|
+
|
|
19
|
+
// eslint-disable-next-line no-unused-vars
|
|
20
|
+
module.exports = async (request, response, deledate, next) => {
|
|
21
|
+
const connection = await getConnection();
|
|
22
|
+
await startTransaction(connection);
|
|
23
|
+
const { name } = request.body;
|
|
24
|
+
const { id } = request.params;
|
|
25
|
+
try {
|
|
26
|
+
const method = await select()
|
|
27
|
+
.from('shipping_method')
|
|
28
|
+
.where('uuid', '=', id)
|
|
29
|
+
.load(connection);
|
|
30
|
+
|
|
31
|
+
if (!method) {
|
|
32
|
+
response.status(INVALID_PAYLOAD);
|
|
33
|
+
response.json({
|
|
34
|
+
error: {
|
|
35
|
+
status: INVALID_PAYLOAD,
|
|
36
|
+
message: 'Requested method not found'
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const newMethod = await update('shipping_method')
|
|
43
|
+
.given({
|
|
44
|
+
name
|
|
45
|
+
})
|
|
46
|
+
.where('uuid', '=', id)
|
|
47
|
+
.execute(connection);
|
|
48
|
+
await commit(connection);
|
|
49
|
+
response.status(OK);
|
|
50
|
+
response.json({
|
|
51
|
+
data: newMethod
|
|
52
|
+
});
|
|
53
|
+
} catch (e) {
|
|
54
|
+
error(e);
|
|
55
|
+
await rollback(connection);
|
|
56
|
+
response.status(INTERNAL_SERVER_ERROR);
|
|
57
|
+
response.json({
|
|
58
|
+
error: {
|
|
59
|
+
status: INTERNAL_SERVER_ERROR,
|
|
60
|
+
message: e.message
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
};
|
|
@@ -11,7 +11,49 @@
|
|
|
11
11
|
},
|
|
12
12
|
"calculation_type": {
|
|
13
13
|
"type": "string",
|
|
14
|
-
"enum": ["flat_rate", "api"]
|
|
14
|
+
"enum": ["flat_rate", "price_based_rate", "weight_based_rate", "api"]
|
|
15
|
+
},
|
|
16
|
+
"price_based_cost": {
|
|
17
|
+
"type": "array",
|
|
18
|
+
"items": {
|
|
19
|
+
"type": "object",
|
|
20
|
+
"properties": {
|
|
21
|
+
"min_price": {
|
|
22
|
+
"type": ["string", "number"],
|
|
23
|
+
"pattern": "^\\d+(\\.\\d{1,2})?$"
|
|
24
|
+
},
|
|
25
|
+
"cost": {
|
|
26
|
+
"type": ["string", "number"],
|
|
27
|
+
"pattern": "^\\d+(\\.\\d{1,2})?$"
|
|
28
|
+
}
|
|
29
|
+
},
|
|
30
|
+
"additionalProperties": false,
|
|
31
|
+
"required": [
|
|
32
|
+
"min_price",
|
|
33
|
+
"cost"
|
|
34
|
+
]
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
"weight_based_cost": {
|
|
38
|
+
"type": "array",
|
|
39
|
+
"items": {
|
|
40
|
+
"type": "object",
|
|
41
|
+
"properties": {
|
|
42
|
+
"min_weight": {
|
|
43
|
+
"type": ["string", "number"],
|
|
44
|
+
"pattern": "^\\d+(\\.\\d{1,2})?$"
|
|
45
|
+
},
|
|
46
|
+
"cost": {
|
|
47
|
+
"type": ["string", "number"],
|
|
48
|
+
"pattern": "^\\d+(\\.\\d{1,2})?$"
|
|
49
|
+
}
|
|
50
|
+
},
|
|
51
|
+
"additionalProperties": false,
|
|
52
|
+
"required": [
|
|
53
|
+
"min_weight",
|
|
54
|
+
"cost"
|
|
55
|
+
]
|
|
56
|
+
}
|
|
15
57
|
},
|
|
16
58
|
"condition_type": {
|
|
17
59
|
"type": "string",
|
|
@@ -20,7 +20,15 @@ module.exports = async (request, response, deledate, next) => {
|
|
|
20
20
|
const { method_id, zone_id } = request.params;
|
|
21
21
|
const connection = await getConnection();
|
|
22
22
|
await startTransaction(connection);
|
|
23
|
-
let {
|
|
23
|
+
let {
|
|
24
|
+
cost,
|
|
25
|
+
condition_type,
|
|
26
|
+
calculate_api,
|
|
27
|
+
price_based_cost,
|
|
28
|
+
weight_based_cost,
|
|
29
|
+
min,
|
|
30
|
+
max
|
|
31
|
+
} = request.body;
|
|
24
32
|
const { is_enabled, calculation_type } = request.body;
|
|
25
33
|
try {
|
|
26
34
|
// Load the shipping zone
|
|
@@ -65,9 +73,13 @@ module.exports = async (request, response, deledate, next) => {
|
|
|
65
73
|
}
|
|
66
74
|
|
|
67
75
|
if (calculation_type === 'api') {
|
|
68
|
-
cost = null;
|
|
76
|
+
cost = weight_based_cost = price_based_cost = null;
|
|
77
|
+
} else if (calculation_type === 'price_based_rate') {
|
|
78
|
+
calculate_api = cost = weight_based_cost = null;
|
|
79
|
+
} else if (calculation_type === 'weight_based_rate') {
|
|
80
|
+
calculate_api = cost = price_based_cost = null;
|
|
69
81
|
} else {
|
|
70
|
-
calculate_api = null;
|
|
82
|
+
calculate_api = weight_based_cost = price_based_cost = null;
|
|
71
83
|
}
|
|
72
84
|
if (condition_type === 'none') {
|
|
73
85
|
condition_type = null;
|
|
@@ -80,6 +92,8 @@ module.exports = async (request, response, deledate, next) => {
|
|
|
80
92
|
is_enabled,
|
|
81
93
|
calculate_api,
|
|
82
94
|
condition_type,
|
|
95
|
+
price_based_cost,
|
|
96
|
+
weight_based_cost,
|
|
83
97
|
max,
|
|
84
98
|
min
|
|
85
99
|
})
|