@evershop/evershop 1.1.0 → 1.2.1

package/src/modules/checkout/migration/Version-1.0.0.js

@@ -21,9 +21,13 @@ module.exports = exports = async (connection) => {
   "discount_amount" decimal(12,4) DEFAULT NULL,
   "sub_total" decimal(12,4) NOT NULL,
   "sub_total_incl_tax" decimal(12,4) NOT NULL,
+  "sub_total_with_discount" decimal(12,4) NOT NULL,
+  "sub_total_with_discount_incl_tax" decimal(12,4) NOT NULL,
   "total_qty" INT NOT NULL,
   "total_weight" decimal(12,4) DEFAULT NULL,
   "tax_amount" decimal(12,4) NOT NULL,
+  "tax_amount_before_discount" decimal(12,4) NOT NULL,
+  "shipping_tax_amount" decimal(12,4) NOT NULL,
   "grand_total" decimal(12,4) NOT NULL,
   "shipping_method" varchar DEFAULT NULL,
   "shipping_method_name" varchar DEFAULT NULL,
@@ -75,9 +79,12 @@ module.exports = exports = async (connection) => {
   "final_price_incl_tax" decimal(12,4) NOT NULL,
   "tax_percent" decimal(12,4) NOT NULL,
   "tax_amount" decimal(12,4) NOT NULL,
+  "tax_amount_before_discount" decimal(12,4) NOT NULL,
   "discount_amount" decimal(12,4) NOT NULL,
   "sub_total" decimal(12,4) NOT NULL,
+  "line_total_with_discount" decimal(12,4) NOT NULL,
   "total" decimal(12,4) NOT NULL,
+  "line_total_with_discount_incl_tax" decimal(12,4) NOT NULL,
   "variant_group_id" INT DEFAULT NULL,
   "variant_options" text DEFAULT NULL,
   "product_custom_options" text DEFAULT NULL,
@@ -118,9 +125,13 @@ module.exports = exports = async (connection) => {
   "discount_amount" decimal(12,4) DEFAULT NULL,
   "sub_total" decimal(12,4) NOT NULL,
   "sub_total_incl_tax" decimal(12,4) NOT NULL,
+  "sub_total_with_discount" decimal(12,4) NOT NULL,
+  "sub_total_with_discount_incl_tax" decimal(12,4) NOT NULL,
   "total_qty" INT NOT NULL,
   "total_weight" decimal(12,4) DEFAULT NULL,
   "tax_amount" decimal(12,4) NOT NULL,
+  "tax_amount_before_discount" decimal(12,4) NOT NULL,
+  "shipping_tax_amount" decimal(12,4) NOT NULL,
   "shipping_note" text DEFAULT NULL,
   "grand_total" decimal(12,4) NOT NULL,
   "shipping_method" varchar DEFAULT NULL,
@@ -194,9 +205,12 @@ module.exports = exports = async (connection) => {
   "final_price_incl_tax" decimal(12,4) NOT NULL,
   "tax_percent" decimal(12,4) NOT NULL,
   "tax_amount" decimal(12,4) NOT NULL,
+  "tax_amount_before_discount" decimal(12,4) NOT NULL,
   "discount_amount" decimal(12,4) NOT NULL,
   "sub_total" decimal(12,4) NOT NULL,
+  "line_total_with_discount" decimal(12,4) NOT NULL,
   "total" decimal(12,4) NOT NULL,
+  "line_total_with_discount_incl_tax" decimal(12,4) NOT NULL,
   "variant_group_id" INT DEFAULT NULL,
   "variant_options" text DEFAULT NULL,
   "product_custom_options" text DEFAULT NULL,

package/src/modules/checkout/migration/Version-1.0.6.js

@@ -0,0 +1,201 @@
+const { execute } = require('@evershop/postgres-query-builder');
+
+// eslint-disable-next-line no-multi-assign
+module.exports = exports = async (connection) => {
+  // Rename sub_total column to line_total
+  await execute(
+    connection,
+    `ALTER TABLE "cart_item" RENAME COLUMN sub_total TO line_total`
+  );
+
+  await execute(
+    connection,
+    `ALTER TABLE "order_item" RENAME COLUMN sub_total TO line_total`
+  );
+
+  // Rename total column to line_total_incl_tax
+  await execute(
+    connection,
+    `ALTER TABLE "cart_item" RENAME COLUMN total TO line_total_incl_tax`
+  );
+
+  await execute(
+    connection,
+    `ALTER TABLE "order_item" RENAME COLUMN total TO line_total_incl_tax`
+  );
+
+  // Add a column 'tax_amount_before_discount' to the cart item table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart_item" ADD COLUMN IF NOT EXISTS "tax_amount_before_discount" decimal(12,4)'
+  );
+
+  // Add a column 'tax_amount_before_discount' to the order item table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order_item" ADD COLUMN IF NOT EXISTS "tax_amount_before_discount" decimal(12,4)'
+  );
+
+  // Add a column 'tax_amount_before_discount' to the cart table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart" ADD COLUMN IF NOT EXISTS "tax_amount_before_discount" decimal(12,4)'
+  );
+
+  // Add a column 'tax_amount_before_discount' to the order table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order" ADD COLUMN IF NOT EXISTS "tax_amount_before_discount" decimal(12,4)'
+  );
+
+  // Add a column 'line_total_with_discount' to the cart item table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart_item" ADD COLUMN IF NOT EXISTS "line_total_with_discount" decimal(12,4)'
+  );
+
+  // Add a column 'line_total_with_discount_incl_tax' to the cart item table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart_item" ADD COLUMN IF NOT EXISTS "line_total_with_discount_incl_tax" decimal(12,4)'
+  );
+
+  // Add a column 'line_total_with_discount' to the order item table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order_item" ADD COLUMN IF NOT EXISTS "line_total_with_discount" decimal(12,4)'
+  );
+
+  // Add a column 'line_total_with_discount_incl_tax' to the order item table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order_item" ADD COLUMN IF NOT EXISTS "line_total_with_discount_incl_tax" decimal(12,4)'
+  );
+
+  // Add a column 'sub_total_with_discount' to the cart table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart" ADD COLUMN IF NOT EXISTS "sub_total_with_discount" decimal(12,4)'
+  );
+
+  // Add a column 'sub_total_with_discount' to the order table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order" ADD COLUMN IF NOT EXISTS "sub_total_with_discount" decimal(12,4)'
+  );
+
+  // Add a column 'sub_total_with_discount_incl_tax' to the cart table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart" ADD COLUMN IF NOT EXISTS "sub_total_with_discount_incl_tax" decimal(12,4)'
+  );
+
+  // Add a column 'sub_total_with_discount_incl_tax' to the order table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order" ADD COLUMN IF NOT EXISTS "sub_total_with_discount_incl_tax" decimal(12,4)'
+  );
+
+  // Add a column 'shipping_tax_amount' to the cart table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart" ADD COLUMN IF NOT EXISTS "shipping_tax_amount" decimal(12,4)'
+  );
+
+  // Add a column 'shipping_tax_amount' to the order table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order" ADD COLUMN IF NOT EXISTS "shipping_tax_amount" decimal(12,4)'
+  );
+
+  // Calculate the value for the new columns 'tax_amount_before_discount', 'line_total_with_discount', 'line_total_with_discount_incl_tax', 'sub_total'
+
+  await execute(
+    connection,
+    `UPDATE "cart_item" SET tax_amount_before_discount = ROUND(COALESCE(final_price, 0) * (COALESCE(tax_percent, 0) / 100), 2) * qty`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order_item" SET tax_amount_before_discount = ROUND(COALESCE(final_price, 0) * (COALESCE(tax_percent, 0) / 100), 2) * qty`
+  );
+
+  // Calculate the tax_amount_before_discount on cart and order by summing up the tax_amount_before_discount of all items
+  await execute(
+    connection,
+    `UPDATE "cart" SET tax_amount_before_discount = (SELECT SUM(tax_amount_before_discount) FROM cart_item WHERE cart_item.cart_id = cart.cart_id)`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order" SET tax_amount_before_discount = (SELECT SUM(tax_amount_before_discount) FROM "order_item" WHERE "order_item".order_item_order_id = "order".order_id)`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "cart_item" SET line_total_with_discount = line_total`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "cart_item" SET line_total = COALESCE(final_price, 0) * qty`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order_item" SET line_total_with_discount = line_total`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order_item" SET line_total = COALESCE(final_price, 0) * qty`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "cart_item" SET line_total_with_discount_incl_tax = line_total_with_discount + tax_amount`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order_item" SET line_total_with_discount_incl_tax = line_total_with_discount + tax_amount`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "cart" SET sub_total_with_discount = (SELECT SUM(line_total_with_discount) FROM cart_item WHERE cart_item.cart_id = cart.cart_id)`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order" SET sub_total_with_discount = (SELECT SUM(line_total_with_discount) FROM "order_item" WHERE "order_item".order_item_order_id = "order".order_id)`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "cart" SET sub_total_with_discount_incl_tax = sub_total_with_discount + tax_amount`
+  );
+
+  await execute(
+    connection,
+    `UPDATE "order" SET sub_total_with_discount_incl_tax = sub_total_with_discount + tax_amount`
+  );
+
+  // Add a column 'total_tax_amount' to the cart table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "cart" ADD COLUMN IF NOT EXISTS "total_tax_amount" decimal(12,4)'
+  );
+
+  // Update the value for the new column 'total_tax_amount' on the cart table get value from the `tax_amount` column
+  await execute(connection, `UPDATE "cart" SET total_tax_amount = tax_amount`);
+
+  // Add a column 'total_tax_amount' to the order table if it does not exist
+  await execute(
+    connection,
+    'ALTER TABLE "order" ADD COLUMN IF NOT EXISTS "total_tax_amount" decimal(12,4)'
+  );
+
+  // Update the value for the new column 'total_tax_amount' on the cart table get value from the `tax_amount` column
+  await execute(connection, `UPDATE "order" SET total_tax_amount = tax_amount`);
+};

package/src/modules/checkout/pages/admin/shippingSetting/ShippingSetting.jsx

@@ -90,14 +90,14 @@ export default function ShippingSetting({ createShippingZoneApi }) {
 
   return (
     <div className="main-content-inner">
-      <div className="grid grid-cols-6 gap-x-2 grid-flow-row ">
+      <div className="grid grid-cols-6 gap-x-8 grid-flow-row ">
         <div className="col-span-2">
           <SettingMenu />
         </div>
         <div className="col-span-4">
           {countriesQueryData.fetching || zonesQueryData.fetching ? (
             <Card.Session title="Shipping">
-              <div className="flex justify-center p-2">
+              <div className="flex justify-center p-8">
                 <Spinner width={25} height={25} />
               </div>
             </Card.Session>

package/src/modules/checkout/pages/frontStore/all/[context]detectCurrentCart[auth].js

@@ -3,6 +3,8 @@ const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
 const {
   setContextValue
 } = require('../../../../graphql/services/contextHelper');
+const { getCartByUUID } = require('../../../services/getCartByUUID');
+const { saveCart } = require('../../../services/saveCart');
 
 module.exports = async (request, response, delegate, next) => {
   // Check if any cart is associated with the session id
@@ -13,6 +15,9 @@ module.exports = async (request, response, delegate, next) => {
     .load(pool);
 
   if (cart) {
+    const cartObject = await getCartByUUID(cart.uuid);
+    // Save the cart
+    await saveCart(cartObject);
     setContextValue(request, 'cartId', cart.uuid);
   } else {
     // Get the customer id from the session

package/src/modules/checkout/pages/frontStore/cart/ShoppingCart.jsx

@@ -12,8 +12,8 @@ function Title({ title }) {
   if (items.length <= 0) return null;
 
   return (
-    <div className="mb-3 text-center shopping-cart-heading">
-      <h1 className="shopping-cart-title mb-05">{title}</h1>
+    <div className="mb-12 text-center shopping-cart-heading">
+      <h1 className="shopping-cart-title mb-2">{title}</h1>
       <a href="/" className="underline">
         {_('Continue Shopping')}
       </a>
@@ -25,7 +25,7 @@ Title.propTypes = {
   title: PropTypes.string.isRequired
 };
 
-export default function ShoppingCart({ cart, setting, removeUrl }) {
+export default function ShoppingCart({ cart, setting }) {
   const { totalQty = 0, items = [] } = cart || {};
   if (totalQty <= 0) {
     return <Empty />;
@@ -46,14 +46,14 @@ export default function ShoppingCart({ cart, setting, removeUrl }) {
             ]}
           />
           <div className="cart-page-middle">
-            <div className="grid gap-4 grid-cols-1 md:grid-cols-4">
+            <div className="grid gap-16 grid-cols-1 md:grid-cols-4">
               <Area
                 id="shoppingCartLeft"
                 className="col-span-1 md:col-span-3"
                 coreComponents={[
                   {
                     component: { default: Items },
-                    props: { items, setting, cartId: cart.uuid, removeUrl },
+                    props: { items, setting },
                     sortOrder: 10,
                     id: 'shoppingCartTitle'
                   }
@@ -77,14 +77,13 @@ ShoppingCart.propTypes = {
     uuid: PropTypes.string.isRequired
   }).isRequired,
   setting: PropTypes.shape({
-    displayCheckoutPriceIncludeTax: PropTypes.bool
-  }).isRequired,
-  removeUrl: PropTypes.string.isRequired
+    priceIncludingTax: PropTypes.bool
+  }).isRequired
 };
 
 export const layout = {
   areaId: 'content',
-  sortOrder: 1
+  sortOrder: 10
 };
 
 export const query = `
@@ -116,20 +115,29 @@ export const query = `
           value
           text
         }
-        subTotal {
+        lineTotal {
+          value
+          text
+        }
+        lineTotal {
+          value
+          text
+        }
+        lineTotalInclTax {
           value
           text
         }
-        total {
+        lineTotalInclTax {
           value
           text
         }
         removeApi
+        updateQtyApi
         errors
       }
     }
     setting {
-      displayCheckoutPriceIncludeTax
+      priceIncludingTax
     }
   }
 `;

package/src/modules/checkout/pages/frontStore/cart/Summary.jsx

@@ -8,7 +8,7 @@ import { Total } from '@components/frontStore/checkout/checkout/summary/cart/Tot
 
 function Subtotal({ subTotal }) {
   return (
-    <div className="flex justify-between gap-3">
+    <div className="flex justify-between gap-12">
       <div>{_('Sub total')}</div>
       <div className="text-right">{subTotal.text}</div>
     </div>
@@ -16,11 +16,17 @@ function Subtotal({ subTotal }) {
 }
 
 Subtotal.propTypes = {
-  subTotal: PropTypes.number
+  subTotal: PropTypes.shape({
+    value: PropTypes.number,
+    text: PropTypes.string
+  })
 };
 
 Subtotal.defaultProps = {
-  subTotal: 0
+  subTotal: {
+    value: 0,
+    text: ''
+  }
 };
 
 function Discount({ discountAmount, coupon }) {
@@ -28,7 +34,7 @@ function Discount({ discountAmount, coupon }) {
     return null;
   }
   return (
-    <div className="flex justify-between gap-3">
+    <div className="flex justify-between gap-12">
       <div>{_('Discount(${coupon})', { coupon })}</div>
       <div className="text-right">{discountAmount.text}</div>
     </div>
@@ -36,12 +42,18 @@ function Discount({ discountAmount, coupon }) {
 }
 
 Discount.propTypes = {
-  discountAmount: PropTypes.number,
+  discountAmount: PropTypes.shape({
+    value: PropTypes.number,
+    text: PropTypes.string
+  }),
   coupon: PropTypes.string
 };
 
 Discount.defaultProps = {
-  discountAmount: 0,
+  discountAmount: {
+    value: 0,
+    text: ''
+  },
   coupon: ''
 };
 
@@ -51,19 +63,19 @@ function Summary({
     totalQty,
     subTotal,
     subTotalInclTax,
-    taxAmount,
+    totalTaxAmount,
     grandTotal,
     coupon,
     discountAmount
   },
-  setting: { displayCheckoutPriceIncludeTax }
+  setting: { priceIncludingTax }
 }) {
   if (totalQty === undefined || totalQty <= 0) {
     return null;
   }
   return (
     <div className="summary">
-      <div className="grid grid-cols-1 gap-2">
+      <div className="grid grid-cols-1 gap-8">
         <h4>{_('Order summary')}</h4>
         <Area
           id="shoppingCartSummary"
@@ -72,9 +84,7 @@ function Summary({
             {
               component: { default: Subtotal },
               props: {
-                subTotal: displayCheckoutPriceIncludeTax
-                  ? subTotalInclTax
-                  : subTotal
+                subTotal: priceIncludingTax ? subTotalInclTax : subTotal
               },
               sortOrder: 10,
               id: 'shoppingCartSubtotal'
@@ -88,10 +98,10 @@ function Summary({
             {
               // eslint-disable-next-line react/no-unstable-nested-components
               component: {
-                default: displayCheckoutPriceIncludeTax ? () => null : Tax
+                default: priceIncludingTax ? () => null : Tax
               },
               props: {
-                amount: taxAmount.text
+                amount: totalTaxAmount.text
               },
               sortOrder: 30,
               id: 'tax'
@@ -103,8 +113,8 @@ function Summary({
               },
               props: {
                 total: grandTotal.text,
-                taxAmount: taxAmount.text,
-                displayCheckoutPriceIncludeTax
+                totalTaxAmount: totalTaxAmount.text,
+                priceIncludingTax
               },
               sortOrder: 30,
               id: 'tax'
@@ -112,7 +122,7 @@ function Summary({
           ]}
         />
       </div>
-      <div className="shopping-cart-checkout-btn flex justify-between mt-2">
+      <div className="shopping-cart-checkout-btn flex justify-between mt-8">
         <Button url={checkoutUrl} title={_('CHECKOUT')} variant="primary" />
       </div>
     </div>
@@ -131,7 +141,7 @@ Summary.propTypes = {
       value: PropTypes.number,
       text: PropTypes.string
     }),
-    taxAmount: PropTypes.shape({
+    totalTaxAmount: PropTypes.shape({
       value: PropTypes.number,
       text: PropTypes.string
     }),
@@ -146,7 +156,7 @@ Summary.propTypes = {
     })
   }).isRequired,
   setting: PropTypes.shape({
-    displayCheckoutPriceIncludeTax: PropTypes.bool
+    priceIncludingTax: PropTypes.bool
   }).isRequired
 };
 
@@ -165,15 +175,16 @@ export const query = `
         value
         text
       }
-      grandTotal {
+      subTotalInclTax {
         value
         text
       }
-      subTotalInclTax {
+      grandTotal {
         value
         text
       }
-      taxAmount {
+      
+      totalTaxAmount {
         value
         text
       }
@@ -184,7 +195,7 @@ export const query = `
       coupon
     }
     setting {
-      displayCheckoutPriceIncludeTax
+      priceIncludingTax
     }
     checkoutUrl: url(routeId: "checkout")
   }

package/src/modules/checkout/pages/frontStore/cart/route.json

@@ -1,4 +1,5 @@
 {
   "methods": ["GET"],
-  "path": "/cart"
+  "path": "/cart",
+  "name": "Cart page"
 }

package/src/modules/checkout/pages/frontStore/checkout/Checkout.jsx

@@ -20,7 +20,7 @@ function Steps() {
 function Breadcrumb() {
   const steps = useCheckoutSteps();
   return (
-    <div className="mb-2 mt-1 flex checkout-breadcrumb">
+    <div className="mb-8 mt-4 flex checkout-breadcrumb">
       {steps.map((step, index) => {
         const separator =
           index < steps.length - 1 ? (
@@ -57,12 +57,12 @@ function CompletedSteps() {
   }
 
   return (
-    <div className="mt-1">
-      <div className="checkout-completed-steps border rounded px-2 border-divider divide-y">
+    <div className="mt-4">
+      <div className="checkout-completed-steps border rounded px-8 border-divider divide-y">
         {completedSteps.map((step) => (
           <div
             key={step.id}
-            className="grid gap-1 grid-cols-4 py-1 border-divider"
+            className="grid gap-4 grid-cols-4 py-4 border-divider"
           >
             <div className="col-span-1">
               <span>{step.previewTitle}</span>
@@ -105,7 +105,7 @@ export default function CheckoutPage({
         getPaymentMethodAPI={getPaymentMethodAPI}
         checkoutSuccessUrl={checkoutSuccessUrl}
       >
-        <div className="page-width grid grid-cols-1 md:grid-cols-2 gap-3">
+        <div className="page-width grid grid-cols-1 md:grid-cols-2 gap-12">
           <Area
             id="checkoutPageLeft"
             coreComponents={[

package/src/modules/checkout/pages/frontStore/checkout/Checkout.scss

@@ -38,3 +38,7 @@
 .checkout-breadcrumb {
   font-size: 12px;
 }
+
+.breadcrumb {
+  display: none;
+}

package/src/modules/checkout/pages/frontStore/checkout/ShippingMethods.jsx

@@ -172,7 +172,7 @@ export default function ShippingMethods({
           </svg>
         </div>
       )}
-      <h4 className="mt-3 mb-1">{_('Shipping Method')}</h4>
+      <h4 className="mt-12 mb-4">{_('Shipping Method')}</h4>
       {addressProvided === true && methods.length === 0 && (
         <div className="text-center p-3 border border-divider rounded text-textSubdued">
           {_('Sorry, there is no available method for your address')}
@@ -184,7 +184,7 @@ export default function ShippingMethods({
         </div>
       )}
       {methods.length > 0 && (
-        <div className="divide-y border rounded border-divider p-1 mb-2">
+        <div className="divide-y border rounded border-divider p-4 mb-8">
           <Field
             type="radio"
             name="method"