@evershop/evershop 1.1.0 → 1.2.0

package/src/modules/oms/bootstrap.js

@@ -1,4 +1,5 @@
 const config = require('config');
+const { merge } = require('@evershop/evershop/src/lib/util/merge');
 const registerDefaultOrderCollectionFilters = require('./services/registerDefaultOrderCollectionFilters');
 const {
   defaultPaginationFilters
@@ -6,8 +7,91 @@ const {
 const { addProcessor } = require('../../lib/util/registry');
 
 module.exports = () => {
-  // Default order status and carriers configuration
-  const orderStatusConfig = {
+  addProcessor('configuratonSchema', (schema) => {
+    merge(schema, {
+      properties: {
+        oms: {
+          type: 'object',
+          properties: {
+            order: {
+              type: 'object',
+              properties: {
+                shipmentStatus: {
+                  type: 'object',
+                  patternProperties: {
+                    '^[a-zA-Z_]+$': {
+                      type: 'object',
+                      properties: {
+                        name: {
+                          type: 'string'
+                        },
+                        badge: {
+                          type: 'string'
+                        },
+                        progress: {
+                          type: 'string'
+                        },
+                        isDefault: {
+                          type: 'boolean'
+                        }
+                      },
+                      required: ['name', 'badge', 'progress']
+                    }
+                  },
+                  additionalProperties: false
+                },
+                paymentStatus: {
+                  type: 'object',
+                  patternProperties: {
+                    '^[a-zA-Z_]+$': {
+                      type: 'object',
+                      properties: {
+                        name: {
+                          type: 'string'
+                        },
+                        badge: {
+                          type: 'string'
+                        },
+                        progress: {
+                          type: 'string'
+                        },
+                        isDefault: {
+                          type: 'boolean'
+                        }
+                      },
+                      required: ['name', 'badge', 'progress']
+                    }
+                  },
+                  additionalProperties: false
+                }
+              },
+              required: ['shipmentStatus', 'paymentStatus'],
+              additionalProperties: false
+            },
+            carriers: {
+              type: 'object',
+              additionalProperties: {
+                type: 'object',
+                properties: {
+                  name: {
+                    type: 'string'
+                  },
+                  trackingUrl: {
+                    type: 'string'
+                  }
+                },
+                required: ['name']
+              }
+            }
+          }
+        }
+      }
+    });
+    return schema;
+  });
+
+  // Default order configuration
+  const defaultOrderConfig = {
     order: {
       shipmentStatus: {
         processing: {
@@ -61,7 +145,7 @@ module.exports = () => {
       }
     }
   };
-  config.util.setModuleDefaults('oms', orderStatusConfig);
+  config.util.setModuleDefaults('oms', defaultOrderConfig);
 
   // Reigtering the default filters for attribute collection
   addProcessor(

package/src/modules/oms/graphql/types/Order/Order.graphql

@@ -33,9 +33,14 @@ type OrderItem {
   finalPriceInclTax: Price!
   taxPercent: Float!
   taxAmount: Price!
+  taxAmountBeforeDiscount: Price!
   discountAmount: Price!
-  subTotal: Price!
-  total: Price!
+  lineTotal: Price!
+  subTotal: Price! # Deprecated, this field is equivalent to lineTotal
+  lineTotalWithDiscount: Price!
+  lineTotalWithDiscountInclTax: Price!
+  lineTotalInclTax: Price!
+  total: Price! # Deprecated, this field is equivalent to lineTotalInclTax
   variantGroupId: Int
   variantOptions: String
   productCustomOptions: String
@@ -66,9 +71,13 @@ type Order implements ShoppingCart {
   discountAmount: Price!
   subTotal: Price!
   subTotalInclTax: Price!
+  subTotalWithDiscount: Price!
+  subTotalWithDiscountInclTax: Price!
   totalQty: Int!
   totalWeight: Weight!
   taxAmount: Price!
+  taxAmountBeforeDiscount: Price!
+  totalTaxAmount: Price!
   grandTotal: Price!
   shippingMethod: String
   shippingMethodName: String

package/src/modules/oms/graphql/types/Order/Order.resolvers.js

@@ -102,6 +102,12 @@ module.exports = {
         .where('product_id', '=', productId)
         .load(pool);
       return product ? buildUrl('productEdit', { id: product.uuid }) : null;
-    }
+    },
+    total: ({ lineTotalInclTax }) =>
+      // This field is deprecated, use lineTotalInclTax instead
+      lineTotalInclTax,
+    subTotal: ({ lineTotal }) =>
+      // This field is deprecated, use lineTotal instead
+      lineTotal
   }
 };

package/src/modules/oms/pages/admin/dashboard/Bestsellers.jsx

@@ -32,9 +32,9 @@ export default function BestSellers({ bestSellers, listUrl }) {
               <tr key={i}>
                 <td>
                   <div className=" flex justify-left">
-                    <div className="flex justify-start gap-1 items-center">
+                    <div className="flex justify-start gap-4 items-center">
                       <div
-                        className="grid-thumbnail text-border border border-divider p-075 rounded"
+                        className="grid-thumbnail text-border border border-divider p-3 rounded"
                         style={{ width: '6rem' }}
                       >
                         {p.image?.thumb && (

package/src/modules/oms/pages/admin/dashboard/Lifetimesales.jsx

@@ -64,22 +64,22 @@ export default function LifetimeSale({ api }) {
     return (
       <Card title="Lifetime Sales">
         <Card.Session>
-          <div className="grid grid-cols-1 gap-1">
-            <div className="flex space-x-1 items-center">
+          <div className="grid grid-cols-1 gap-4">
+            <div className="flex space-x-4 items-center">
               <Dot variant="info" />
               <div className="self-center">{orders} orders</div>
             </div>
-            <div className="flex space-x-1 items-center">
+            <div className="flex space-x-4 items-center">
               <Dot variant="info" />
               <div className="self-center">{total} lifetime sale</div>
             </div>
-            <div className="flex space-x-1 items-center">
+            <div className="flex space-x-4 items-center">
               <Dot variant="success" />
               <div className="self-center">
                 {completed_percentage}% of orders completed
               </div>
             </div>
-            <div className="flex space-x-1 items-center">
+            <div className="flex space-x-4 items-center">
               <Dot variant="critical" />
               <div className="self-center">
                 {cancelled_percentage}% of orders cancelled

package/src/modules/oms/pages/admin/orderEdit/AddTrackingButton.jsx

@@ -38,7 +38,7 @@ export default function AddTrackingButton({ order: { shipment }, carriers }) {
                     });
                   }}
                 >
-                  <div className="grid grid-cols-2 gap-1">
+                  <div className="grid grid-cols-2 gap-4">
                     <div>
                       <Field
                         formId="edit-tracking-info"

package/src/modules/oms/pages/admin/orderEdit/Items.jsx

@@ -14,7 +14,7 @@ export default function Items({ order: { items, shipmentStatus } }) {
   return (
     <Card
       title={
-        <div className="flex space-x-1">
+        <div className="flex space-x-4">
           <Circle variant={shipmentStatus.badge || 'new'} />
           <span className="block self-center">
             {shipmentStatus.name || 'Unknown'}
@@ -59,11 +59,11 @@ export default function Items({ order: { items, shipmentStatus } }) {
                     {
                       component: { default: 'td' },
                       props: {
-                        children: <span>{i.subTotal.text}</span>,
-                        key: 'subTotal'
+                        children: <span>{i.lineTotal.text}</span>,
+                        key: 'lineTotal'
                       },
                       sortOrder: 40,
-                      id: 'subTotal'
+                      id: 'lineTotal'
                     }
                   ]}
                 />
@@ -73,7 +73,7 @@ export default function Items({ order: { items, shipmentStatus } }) {
         </table>
       </Card.Session>
       <Card.Session>
-        <div className="flex justify-end gap-1">
+        <div className="flex justify-end gap-4">
           <Area id="order_actions" noOuter />
         </div>
       </Card.Session>
@@ -104,7 +104,7 @@ Items.propTypes = {
           value: PropTypes.number,
           text: PropTypes.string
         }),
-        subTotal: PropTypes.shape({
+        lineTotal: PropTypes.shape({
           value: PropTypes.number,
           text: PropTypes.string
         })
@@ -167,7 +167,7 @@ export const query = `
           value
           text
         }
-        subTotal {
+        lineTotal {
           value
           text
         }

package/src/modules/oms/pages/admin/orderEdit/Layout.jsx

@@ -4,11 +4,11 @@ import './Layout.scss';
 
 export default function OrderEdit() {
   return (
-    <div className="grid grid-cols-3 gap-x-2 grid-flow-row ">
-      <div className="col-span-2 grid grid-cols-1 gap-2 auto-rows-max">
+    <div className="grid grid-cols-3 gap-x-8 grid-flow-row ">
+      <div className="col-span-2 grid grid-cols-1 gap-8 auto-rows-max">
         <Area id="leftSide" noOuter />
       </div>
-      <div className="col-span-1 grid grid-cols-1 gap-2 auto-rows-max">
+      <div className="col-span-1 grid grid-cols-1 gap-8 auto-rows-max">
         <Area id="rightSide" noOuter />
       </div>
     </div>

package/src/modules/oms/pages/admin/orderEdit/Payment.jsx

@@ -18,7 +18,7 @@ export default function OrderSummary({
     shippingMethodName,
     paymentMethodName,
     totalQty,
-    taxAmount,
+    totalTaxAmount,
     discountAmount,
     grandTotal,
     subTotal,
@@ -31,7 +31,7 @@ export default function OrderSummary({
   return (
     <Card
       title={
-        <div className="flex space-x-1">
+        <div className="flex space-x-4">
           <Circle variant={paymentStatus.badge} />
           <span className="block self-center">
             {paymentMethodName || 'Unknown'}
@@ -47,7 +47,7 @@ export default function OrderSummary({
           grandTotal={grandTotal}
           coupon={coupon}
           discountAmount={discountAmount}
-          taxAmount={taxAmount}
+          totalTaxAmount={totalTaxAmount}
           className="summary-wrapper"
           coreComponents={[
             {
@@ -70,7 +70,7 @@ export default function OrderSummary({
             },
             {
               component: { default: Tax },
-              props: { taxClass: '', amount: taxAmount.text },
+              props: { taxClass: '', amount: totalTaxAmount.text },
               sortOrder: 20
             },
 
@@ -97,7 +97,7 @@ OrderSummary.propTypes = {
     coupon: PropTypes.string,
     shippingMethod: PropTypes.string,
     paymentMethodName: PropTypes.string,
-    taxAmount: PropTypes.shape({
+    totalTaxAmount: PropTypes.shape({
       text: PropTypes.string.isRequired
     }).isRequired,
     discountAmount: PropTypes.shape({
@@ -148,7 +148,7 @@ export const query = `
       shippingMethodName
       paymentMethod
       paymentMethodName
-      taxAmount {
+      totalTaxAmount {
         text(currency: getContextValue("orderCurrency"))
       }
       discountAmount {

package/src/modules/oms/pages/admin/orderEdit/ShipButton.jsx

@@ -46,7 +46,7 @@ export default function ShipButton({
                     });
                   }}
                 >
-                  <div className="grid grid-cols-2 gap-1">
+                  <div className="grid grid-cols-2 gap-4">
                     <div>
                       <Field
                         formId="ship-items"

package/src/modules/oms/pages/admin/orderGrid/Grid.jsx

@@ -70,7 +70,7 @@ function Actions({ orders = [], selectedIds = [] }) {
       {selectedIds.length > 0 && (
         <td style={{ borderTop: 0 }} colSpan="100">
           <div className="inline-flex border border-divider rounded justify-items-start">
-            <a href="#" className="font-semibold pt-075 pb-075 pl-15 pr-15">
+            <a href="#" className="font-semibold pt-3 pb-3 pl-6 pr-6">
               {selectedIds.length} selected
             </a>
             {actions.map((action) => (
@@ -80,7 +80,7 @@ function Actions({ orders = [], selectedIds = [] }) {
                   e.preventDefault();
                   action.onAction();
                 }}
-                className="font-semibold pt-075 pb-075 pl-15 pr-15 block border-l border-divider self-center"
+                className="font-semibold pt-3 pb-3 pl-6 pr-6 block border-l border-divider self-center"
               >
                 <span>{action.name}</span>
               </a>
@@ -122,7 +122,7 @@ export default function OrderGrid({
       <Card.Session
         title={
           <Form submitBtn={false}>
-            <div className="flex gap-2 justify-center items-center">
+            <div className="flex gap-8 justify-center items-center">
               <Area
                 id="orderGridFilter"
                 noOuter

package/src/modules/oms/services/OrderCollection.js

@@ -14,16 +14,16 @@ class OrderCollection {
     // Apply the filters
     const orderCollectionFilters = await getValue('orderCollectionFilters', []);
     orderCollectionFilters.forEach((filter) => {
-      const check = filters.find((f) => f.key === filter.key);
-      if (check) {
-        if (filter.operation.includes(check.operation)) {
-          filter.callback(
-            this.baseQuery,
-            check.operation,
-            check.value,
-            currentFilters
-          );
-        }
+      const check = filters.find(
+        (f) => f.key === filter.key && filter.operation.includes(f.operation)
+      );
+      if (filter.key === '*' || check) {
+        filter.callback(
+          this.baseQuery,
+          check?.operation,
+          check?.value,
+          currentFilters
+        );
       }
     });
 

package/src/modules/paypal/api/paypalCreateOrder/[bodyParser]createOrder.js

@@ -8,6 +8,8 @@ const {
   OK,
   INTERNAL_SERVER_ERROR
 } = require('@evershop/evershop/src/lib/util/httpStatus');
+const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
+const { getValueSync } = require('@evershop/evershop/src/lib/util/registry');
 const { getContextValue } = require('../../../graphql/services/contextHelper');
 const { getSetting } = require('../../../setting/services/setting');
 const { toPrice } = require('../../../checkout/services/toPrice');
@@ -37,6 +39,43 @@ module.exports = async (request, response, stack, next) => {
       .from('order_item')
       .where('order_item_order_id', '=', order.order_id)
       .execute(pool);
+    const catalogPriceInclTax = getConfig(
+      'pricing.tax.price_including_tax',
+      false
+    );
+    const amount = {
+      currency_code: order.currency,
+      value: toPrice(order.grand_total),
+      breakdown: {
+        item_total: {
+          currency_code: order.currency,
+          value: catalogPriceInclTax
+            ? toPrice(order.sub_total_incl_tax)
+            : toPrice(order.sub_total)
+        },
+        shipping: {
+          currency_code: order.currency,
+          value: catalogPriceInclTax
+            ? toPrice(order.shipping_fee_incl_tax)
+            : toPrice(order.shipping_fee_excl_tax)
+        },
+        discount: {
+          currency_code: order.currency,
+          value: toPrice(order.discount_amount)
+        }
+      }
+    };
+    if (!catalogPriceInclTax) {
+      amount.breakdown.tax_total = {
+        currency_code: order.currency,
+        value: toPrice(order.total_tax_amount)
+      };
+    }
+
+    const finalAmount = getValueSync('paypalFinalAmount', amount, {
+      order,
+      items
+    });
 
     const orderData = {
       intent: await getSetting('paypalPaymentIntent', 'CAPTURE'),
@@ -48,31 +87,12 @@ module.exports = async (request, response, stack, next) => {
             quantity: item.qty,
             unit_amount: {
               currency_code: order.currency,
-              value: toPrice(item.final_price)
+              value: catalogPriceInclTax
+                ? toPrice(item.final_price_incl_tax)
+                : toPrice(item.final_price)
             }
           })),
-          amount: {
-            currency_code: order.currency,
-            value: toPrice(order.grand_total),
-            breakdown: {
-              item_total: {
-                currency_code: order.currency,
-                value: toPrice(order.sub_total)
-              },
-              shipping: {
-                currency_code: order.currency,
-                value: toPrice(order.shipping_fee_incl_tax)
-              },
-              tax_total: {
-                currency_code: order.currency,
-                value: toPrice(order.tax_amount)
-              },
-              discount: {
-                currency_code: order.currency,
-                value: toPrice(order.discount_amount)
-              }
-            }
-          }
+          amount: finalAmount
         }
       ],
       application_context: {
@@ -144,10 +164,21 @@ module.exports = async (request, response, stack, next) => {
         address
       };
     }
+
+    const finalPaypalOrderData = getValueSync(
+      'finalPaypalOrderData',
+      orderData,
+      {
+        order,
+        items,
+        shippingAddress,
+        billingAddress
+      }
+    );
     // Call PayPal API to create order using axios
     const { data } = await axios.post(
       `${await getApiBaseUrl()}/v2/checkout/orders`,
-      orderData,
+      finalPaypalOrderData,
       {
         headers: {
           'Content-Type': 'application/json',

package/src/modules/paypal/pages/admin/paymentSetting/PaypalSetting.jsx

@@ -16,7 +16,7 @@ export default function PaypalPayment({
   return (
     <Card title="Paypal Payment">
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Enable?</h4>
           </div>
@@ -26,7 +26,7 @@ export default function PaypalPayment({
         </div>
       </Card.Session>
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Dislay Name</h4>
           </div>
@@ -41,7 +41,7 @@ export default function PaypalPayment({
         </div>
       </Card.Session>
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Client ID</h4>
           </div>
@@ -49,14 +49,14 @@ export default function PaypalPayment({
             <Field
               type="text"
               name="paypalClientId"
-              placeholder="Publishable Key"
+              placeholder="Client ID"
               value={paypalClientId}
             />
           </div>
         </div>
       </Card.Session>
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Client Secret</h4>
           </div>
@@ -71,7 +71,7 @@ export default function PaypalPayment({
         </div>
       </Card.Session>
       <Card.Session>
-        <div className="grid grid-cols-3 gap-2">
+        <div className="grid grid-cols-3 gap-8">
           <div className="col-span-1 items-center flex">
             <h4>Environment</h4>
           </div>

package/src/modules/paypal/pages/frontStore/checkout/Paypal.jsx

@@ -4,7 +4,6 @@ import { useCheckout } from '@components/common/context/checkout';
 import PaypalLogo from '@components/frontStore/paypal/PaypalLogo';
 import { _ } from '@evershop/evershop/src/lib/locale/translate';
 
-
 export function Paypal({
   getAccessTokenAPI,
   createOrderAPI,
@@ -68,8 +67,8 @@ export function Paypal({
 
   return (
     <div>
-      {error && <div className="text-critical mb-1">{error}</div>}
-      <div className="p-2 text-center border rounded mt-1 border-divider">
+      {error && <div className="text-critical mb-4">{error}</div>}
+      <div className="p-8 text-center border rounded mt-4 border-divider">
         {_('You will be redirected to PayPal')}
       </div>
     </div>
@@ -93,7 +92,7 @@ export default function PaypalMethod({ getAccessTokenAPI, createOrderAPI }) {
 
   return (
     <div>
-      <div className="flex justify-start items-center gap-1">
+      <div className="flex justify-start items-center gap-4">
         {(!selectedPaymentMethod ||
           selectedPaymentMethod.code !== 'paypal') && (
           <a