@evershop/evershop 1.1.0 → 1.2.0

package/src/modules/checkout/services/cart/registerCartItemBaseFields.js

@@ -1,398 +1,324 @@
-const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
-const { select } = require('@evershop/postgres-query-builder');
 const { buildUrl } = require('@evershop/evershop/src/lib/router/buildUrl');
 const { v4: uuidv4 } = require('uuid');
+const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 const { toPrice } = require('../toPrice');
 const {
   calculateTaxAmount
 } = require('../../../tax/services/calculateTaxAmount');
-const { getSetting } = require('../../../setting/services/setting');
-const { getTaxPercent } = require('../../../tax/services/getTaxPercent');
-const { getTaxRates } = require('../../../tax/services/getTaxRates');
 
-module.exports.registerCartItemBaseFields =
-  function registerCartItemBaseFields() {
-    return [
-      {
-        key: 'cart_item_id',
-        resolvers: [
-          async function resolver() {
-            return this.getData('cart_item_id');
+module.exports.registerCartItemBaseFields = function registerCartItemBaseFields(
+  fields
+) {
+  const newFields = fields.concat([
+    {
+      key: 'cart_item_id',
+      resolvers: [
+        async function resolver() {
+          return this.getData('cart_item_id');
+        }
+      ]
+    },
+    {
+      key: 'uuid',
+      resolvers: [
+        async function resolver() {
+          return this.getData('uuid') ?? uuidv4();
+        }
+      ]
+    },
+    {
+      key: 'cart_id',
+      resolvers: [
+        async function resolver() {
+          const cart = this.getCart();
+          return cart.getData('cart_id');
+        }
+      ],
+      dependencies: ['cart_item_id']
+    },
+    {
+      key: 'product_id',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          if (product.status === false) {
+            this.setError('product_id', 'This product is not available');
           }
-        ]
-      },
-      {
-        key: 'uuid',
-        resolvers: [
-          async function resolver() {
-            return this.getData('uuid') ?? uuidv4();
+          return product.product_id;
+        }
+      ]
+    },
+    {
+      key: 'product_uuid',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return product.uuid;
+        }
+      ]
+    },
+    {
+      key: 'product_sku',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return product.sku;
+        }
+      ]
+    },
+    {
+      key: 'group_id',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return parseInt(product.group_id, 10) ?? null;
+        }
+      ],
+      dependencies: ['product_id']
+    },
+    {
+      key: 'category_id',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return product.category_id ? parseInt(product.category_id, 10) : null;
+        }
+      ],
+      dependencies: ['product_id']
+    },
+    {
+      key: 'product_name',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return product.name ?? null;
+        }
+      ],
+      dependencies: ['product_id']
+    },
+    {
+      key: 'thumbnail',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          if (product.thumb_image) {
+            return product.thumb_image;
+          } else {
+            return null;
           }
-        ]
-      },
-      {
-        key: 'cart_id',
-        resolvers: [
-          async function resolver() {
-            const cart = this.getCart();
-            return cart.getData('cart_id');
-          }
-        ],
-        dependencies: ['cart_item_id']
-      },
-      {
-        key: 'product_id',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            if (product.status === false) {
-              this.setError('product_id', 'This product is not available');
-            }
-            return product.product_id;
-          }
-        ]
-      },
-      {
-        key: 'product_uuid',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return product.uuid;
-          }
-        ]
-      },
-      {
-        key: 'product_sku',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return product.sku;
-          }
-        ]
-      },
-      {
-        key: 'group_id',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return parseInt(product.group_id, 10) ?? null;
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'category_id',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return product.category_id
-              ? parseInt(product.category_id, 10)
-              : null;
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'product_name',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return product.name ?? null;
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'thumbnail',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            if (product.thumb_image) {
-              return product.thumb_image;
-            } else {
-              return null;
-            }
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'product_weight',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return parseFloat(product.weight) ?? null;
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'product_price',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return toPrice(product.price);
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'product_price_incl_tax',
-        resolvers: [
-          async function resolver() {
-            const taxAmount = calculateTaxAmount(
-              this.getData('tax_percent'),
-              this.getData('product_price'),
-              1
-            );
-            return toPrice(this.getData('product_price')) + taxAmount;
-          }
-        ],
-        dependencies: ['product_price', 'tax_percent']
-      },
-      {
-        key: 'qty',
-        resolvers: [
-          async function resolver() {
-            const triggeredField = this.getTriggeredField();
-            const requestedValue = this.getRequestedValue();
-            const qty =
-              triggeredField === 'qty' ? requestedValue : this.getData('qty');
-            const product = await this.getProduct();
-            if (product.manage_stock === true && product.qty < 1) {
-              this.setError('qty', 'This item is out of stock');
-            } else if (product.manage_stock === true && product.qty < qty) {
-              this.setError('qty', 'We do not have enough stock');
-            }
+        }
+      ],
+      dependencies: ['product_id']
+    },
+    {
+      key: 'product_weight',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return parseFloat(product.weight) ?? null;
+        }
+      ],
+      dependencies: ['product_id']
+    },
+    {
+      key: 'tax_class_id',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return product.tax_class ?? null;
+        }
+      ],
+      dependencies: ['product_id']
+    },
 
-            return parseInt(qty, 10) ?? null;
-          }
-        ]
-      },
-      {
-        key: 'final_price',
-        resolvers: [
-          async function resolver() {
-            return toPrice(this.getData('product_price')); // TODO This price should include the custom option price
-          }
-        ],
-        dependencies: ['product_price']
-      },
-      {
-        key: 'final_price_incl_tax',
-        resolvers: [
-          async function resolver() {
+    {
+      key: 'product_price',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          const catalogPriceInclTax = getConfig(
+            'pricing.tax.price_including_tax',
+            false
+          );
+          if (catalogPriceInclTax) {
             const taxAmount = calculateTaxAmount(
               this.getData('tax_percent'),
-              this.getData('final_price'),
-              1
+              product.price,
+              1,
+              true
             );
-            return toPrice(this.getData('final_price')) + taxAmount;
-          }
-        ],
-        dependencies: ['final_price', 'tax_percent']
-      },
-      {
-        key: 'sub_total',
-        resolvers: [
-          async function resolver() {
-            return toPrice(this.getData('final_price') * this.getData('qty'));
+            return toPrice(product.price - taxAmount);
+          } else {
+            return toPrice(product.price);
           }
-        ],
-        dependencies: ['final_price', 'qty']
-      },
-      {
-        key: 'total',
-        resolvers: [
-          async function resolver() {
-            return toPrice(
-              this.getData('final_price') * this.getData('qty') +
-                this.getData('tax_amount')
+        }
+      ],
+      dependencies: ['product_id', 'tax_percent']
+    },
+    {
+      key: 'tax_amount_before_discount',
+      resolvers: [
+        async function resolver() {
+          const catalogPriceInclTax = getConfig(
+            'pricing.tax.price_including_tax',
+            false
+          );
+          if (catalogPriceInclTax) {
+            return calculateTaxAmount(
+              this.getData('tax_percent'),
+              this.getData('product_price_incl_tax'),
+              this.getData('qty'),
+              true
             );
-          }
-        ],
-        dependencies: ['final_price', 'qty', 'tax_amount']
-      },
-      {
-        key: 'tax_class_id',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return product.tax_class ?? null;
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'tax_percent',
-        resolvers: [
-          async function resolver() {
-            if (!this.getData('tax_class_id')) {
-              return 0;
-            } else {
-              const taxClass = await select()
-                .from('tax_class')
-                .where('tax_class_id', '=', this.getData('tax_class_id'))
-                .load(pool);
-              if (!taxClass) {
-                return 0;
-              } else {
-                const baseCalculationAddress = await getSetting(
-                  'baseCalculationAddress',
-                  'shippingAddress'
-                );
-                if (baseCalculationAddress === 'storeAddress') {
-                  const percentage = getTaxPercent(
-                    await getTaxRates(
-                      this.getData('tax_class_id'),
-                      await getSetting('storeCountry', null),
-                      await getSetting('storeProvince', null),
-                      await getSetting('storePostalCode', null)
-                    )
-                  );
-                  return percentage;
-                } else {
-                  const cart = this.getCart();
-                  const addressId =
-                    baseCalculationAddress === 'billingAddress'
-                      ? cart.getData('billing_address_id')
-                      : cart.getData('shipping_address_id');
-
-                  if (!addressId) {
-                    return 0;
-                  } else {
-                    const address = await select()
-                      .from('cart_address')
-                      .where('cart_address_id', '=', addressId)
-                      .load(pool);
-                    if (!address) {
-                      return 0;
-                    } else {
-                      const percentage = getTaxPercent(
-                        await getTaxRates(
-                          this.getData('tax_class_id'),
-                          address.country,
-                          address.province,
-                          address.postcode
-                        )
-                      );
-                      return percentage;
-                    }
-                  }
-                }
-              }
-            }
-          }
-        ],
-        dependencies: ['cart_id', 'tax_class_id']
-      },
-      {
-        key: 'tax_amount',
-        resolvers: [
-          async function resolver() {
-            const discountAmount = this.getData('discount_amount');
-            const finalPrice = this.getData('final_price');
-
-            // The discount amount is total (all quantity), we need to Get the final price after discount per unit
-            const finalPricePerUnit =
-              finalPrice - discountAmount / this.getData('qty');
+          } else {
             return calculateTaxAmount(
               this.getData('tax_percent'),
-              finalPricePerUnit,
+              this.getData('product_price'),
               this.getData('qty')
             );
           }
-        ],
-        dependencies: ['tax_percent', 'final_price', 'qty', 'discount_amount']
-      },
-      {
-        key: 'variant_group_id',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            return product.variant_group_id ?? null;
-          }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'variant_options',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            if (product.variant_group_id) {
-              const group = await select('attribute_one')
-                .select('attribute_two')
-                .select('attribute_three')
-                .select('attribute_four')
-                .select('attribute_five')
-                .from('variant_group')
-                .where('variant_group_id', '=', product.variant_group_id)
-                .load(pool);
-              if (!group) {
-                return null;
-              } else {
-                const query = select('a.attribute_code')
-                  .select('a.attribute_name')
-                  .select('a.attribute_id')
-                  .select('o.option_id')
-                  .select('o.option_text')
-                  .from('attribute', 'a');
-                query
-                  .innerJoin('product_attribute_value_index', 'o')
-                  .on('a.attribute_id', '=', 'o.attribute_id');
-                query.where('o.product_id', '=', product.product_id).and(
-                  'a.attribute_id',
-                  'IN',
-                  Object.values(group).filter((v) => v != null)
-                );
+        }
+      ],
+      dependencies: [
+        'tax_percent',
+        'product_price',
+        'product_price_incl_tax',
+        'qty'
+      ]
+    },
+    {
+      key: 'tax_amount',
+      resolvers: [
+        async function resolver() {
+          const priceIncludingTax = getConfig(
+            'pricing.tax.price_including_tax',
+            false
+          );
+          const discountAmount = this.getData('discount_amount');
+          const discountAmountPerUnit = discountAmount / this.getData('qty');
+          const finalPricePerUnit = priceIncludingTax
+            ? this.getData('final_price_incl_tax') - discountAmountPerUnit
+            : this.getData('final_price') - discountAmountPerUnit;
+          return calculateTaxAmount(
+            this.getData('tax_percent'),
+            finalPricePerUnit,
+            this.getData('qty'),
+            priceIncludingTax
+          );
+        }
+      ],
+      dependencies: [
+        'discount_amount',
+        'tax_percent',
+        'final_price',
+        'final_price_incl_tax',
+        'qty'
+      ]
+    },
+    {
+      key: 'product_price_incl_tax',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          const catalogPriceInclTax = getConfig(
+            'pricing.tax.price_including_tax',
+            false
+          );
 
-                return JSON.stringify(await query.execute(pool));
-              }
-            } else {
-              return null;
-            }
+          if (catalogPriceInclTax) {
+            return toPrice(product.price);
+          } else {
+            const taxAmount = calculateTaxAmount(
+              this.getData('tax_percent'),
+              this.getData('product_price'),
+              1
+            );
+            return toPrice(this.getData('product_price') + taxAmount);
           }
-        ],
-        dependencies: ['variant_group_id']
-      },
-      {
-        key: 'productUrl',
-        resolvers: [
-          async function resolver() {
-            const product = await this.getProduct();
-            if (!this.getData('product_id')) {
-              return null;
-            }
-            const urlRewrite = await select()
-              .from('url_rewrite')
-              .where('entity_uuid', '=', product.uuid)
-              .and('entity_type', '=', 'product')
-              .load(pool);
-            if (!urlRewrite) {
-              return buildUrl('productView', {
-                uuid: product.uuid
-              });
-            } else {
-              return urlRewrite.request_path;
-            }
+        }
+      ],
+      dependencies: ['product_price', 'tax_percent']
+    },
+    {
+      key: 'qty',
+      resolvers: [
+        async function resolver() {
+          const triggeredField = this.getTriggeredField();
+          const requestedValue = this.getRequestedValue();
+          const qty =
+            triggeredField === 'qty' ? requestedValue : this.getData('qty');
+          const product = await this.getProduct();
+          if (product.manage_stock === true && product.qty < 1) {
+            this.setError('qty', 'This item is out of stock');
+          } else if (product.manage_stock === true && product.qty < qty) {
+            this.setError('qty', 'We do not have enough stock');
           }
-        ],
-        dependencies: ['product_id']
-      },
-      {
-        key: 'removeUrl',
-        resolvers: [
-          async function resolver() {
-            if (this.getData('cart_item_id')) {
-              return buildUrl('removeMineCartItem', {
-                item_id: this.getData('uuid')
-              });
-            } else {
-              return undefined;
-            }
+
+          return parseInt(qty, 10) ?? null;
+        }
+      ]
+    },
+    {
+      key: 'final_price',
+      resolvers: [
+        async function resolver() {
+          return this.getData('product_price'); // TODO This price should include the custom option price
+        }
+      ],
+      dependencies: ['product_price']
+    },
+    {
+      key: 'final_price_incl_tax',
+      resolvers: [
+        async function resolver() {
+          return this.getData('product_price_incl_tax');
+        }
+      ],
+      dependencies: ['product_price_incl_tax']
+    },
+    {
+      key: 'line_total',
+      resolvers: [
+        async function resolver() {
+          return this.getData('final_price') * this.getData('qty');
+        }
+      ],
+      dependencies: ['final_price', 'qty']
+    },
+    {
+      key: 'line_total_incl_tax',
+      resolvers: [
+        async function resolver() {
+          return this.getData('final_price_incl_tax') * this.getData('qty');
+        }
+      ],
+      dependencies: ['final_price_incl_tax', 'qty']
+    },
+    {
+      key: 'variant_group_id',
+      resolvers: [
+        async function resolver() {
+          const product = await this.getProduct();
+          return product.variant_group_id ?? null;
+        }
+      ],
+      dependencies: ['product_id']
+    },
+    {
+      key: 'removeUrl',
+      resolvers: [
+        async function resolver() {
+          if (this.getData('cart_item_id')) {
+            return buildUrl('removeMineCartItem', {
+              item_id: this.getData('uuid')
+            });
+          } else {
+            return undefined;
           }
-        ],
-        dependencies: ['cart_item_id', 'uuid']
-      }
-    ];
-  };
+        }
+      ],
+      dependencies: ['cart_item_id', 'uuid']
+    }
+  ]);
+  return newFields;
+};