ordering-components-external 13.2.23 → 13.2.25

package/_modules/components/PaymentOptionStripeLink/index.js

@@ -34,7 +34,8 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
  */
 var PaymentOptionStripeLink = exports.PaymentOptionStripeLink = function PaymentOptionStripeLink(props) {
   var UIComponent = props.UIComponent,
-    paymentURL = props.paymentURL;
+    paymentURL = props.paymentURL,
+    cartTotal = props.cartTotal;
   var _useApi = (0, _ApiContext.useApi)(),
     _useApi2 = _slicedToArray(_useApi, 1),
     ordering = _useApi2[0];
@@ -78,6 +79,14 @@ var PaymentOptionStripeLink = exports.PaymentOptionStripeLink = function Payment
               provider: customProviders.includes(ordering === null || ordering === void 0 ? void 0 : ordering.project) ? 'custom' : 'twilio',
               country_phone_code: userInfo.country_phone_code,
               cellphone: userInfo.cellphone,
+              payment_url: paymentURL,
+              user: {
+                name: userInfo === null || userInfo === void 0 ? void 0 : userInfo.name,
+                lastname: userInfo === null || userInfo === void 0 ? void 0 : userInfo.lastname
+              },
+              cart: {
+                total: cartTotal !== null && cartTotal !== void 0 ? cartTotal : 0
+              },
               message: t('LINK_TO_PAY_MESSAGE', 'Hello there _name_ _lastname_, click on the following link to complete the payment: _link_').replace('_name_', userInfo === null || userInfo === void 0 ? void 0 : userInfo.name).replace('_lastname_', userInfo === null || userInfo === void 0 ? void 0 : userInfo.lastname).replace('_link_', paymentURL)
             };
             _context.next = 6;

package/_modules/components/ProductOptionSuboption/index.js

@@ -73,13 +73,16 @@ var ProductOptionSuboption = exports.ProductOptionSuboption = function ProductOp
     var selectStatus = isOrigin ? !state.selected : state.selected;
     var minMaxValidation = option.with_half_option ? usePizzaValidation : balance === option.max && !((option === null || option === void 0 ? void 0 : option.max) === 1 && (option === null || option === void 0 ? void 0 : option.min) === 1);
     var canBeSelectedByHalf = (pizzaState === null || pizzaState === void 0 || (_pizzaState2 = pizzaState["option:".concat(option === null || option === void 0 ? void 0 : option.id)]) === null || _pizzaState2 === void 0 ? void 0 : _pizzaState2.value) === option.max - 0.5 && option.with_half_option;
+    var shouldApplyHalfLogic = (option === null || option === void 0 ? void 0 : option.with_half_option) && (option === null || option === void 0 ? void 0 : option.allow_suboption_quantity) && (option === null || option === void 0 ? void 0 : option.limit_suboptions_by_max);
+    var remainingBalance = option.max - balance;
+    var canOnlySelectHalf = shouldApplyHalfLogic && remainingBalance < 1 && remainingBalance > 0;
     if (selectStatus && (option.limit_suboptions_by_max || isAlsea) && minMaxValidation && !canBeSelectedByHalf) {
       return;
     }
     changeState(_objectSpread(_objectSpread({}, state), {}, {
       quantity: state.selected ? 0 : 1,
       selected: !state.selected,
-      position: canBeSelectedByHalf ? 'left' : 'whole'
+      position: canBeSelectedByHalf || canOnlySelectHalf ? 'left' : 'whole'
     }));
   };
 
@@ -87,12 +90,27 @@ var ProductOptionSuboption = exports.ProductOptionSuboption = function ProductOp
    * Increment suboption quantity
    */
   var increment = function increment() {
+    var shouldApplyHalfLogic = (option === null || option === void 0 ? void 0 : option.with_half_option) && (option === null || option === void 0 ? void 0 : option.allow_suboption_quantity) && (option === null || option === void 0 ? void 0 : option.limit_suboptions_by_max);
+    var maxByPosition = shouldApplyHalfLogic && state.position !== 'whole' ? suboption.max * 2 : suboption.max;
+
+    // Validar si incrementar excedería el máximo de la opción cuando está en 'whole'
+    if (shouldApplyHalfLogic && state.position === 'whole') {
+      var _pizzaState3;
+      var otherOptionsValue = pizzaState === null || pizzaState === void 0 || (_pizzaState3 = pizzaState["option:".concat(option === null || option === void 0 ? void 0 : option.id)]) === null || _pizzaState3 === void 0 ? void 0 : _pizzaState3.value;
+      var wouldExceedMax = otherOptionsValue + 1 > option.max;
+      if (wouldExceedMax) {
+        return;
+      }
+    }
     if (!(option !== null && option !== void 0 && option.with_half_option) && option.limit_suboptions_by_max && (balance === option.max || state.quantity === suboption.max)) {
       return;
     }
     if (!(option !== null && option !== void 0 && option.with_half_option) && !option.limit_suboptions_by_max && state.quantity === suboption.max) {
       return;
     }
+    if (shouldApplyHalfLogic && state.quantity === maxByPosition) {
+      return;
+    }
     if (option !== null && option !== void 0 && option.with_half_option && usePizzaValidation) {
       return;
     }
@@ -123,16 +141,31 @@ var ProductOptionSuboption = exports.ProductOptionSuboption = function ProductOp
    */
   var changePosition = function changePosition(position) {
     var price = option.with_half_option && suboption.half_price && position !== 'whole' ? suboption.half_price : suboption.price;
+    var shouldApplyHalfLogic = (option === null || option === void 0 ? void 0 : option.with_half_option) && (option === null || option === void 0 ? void 0 : option.allow_suboption_quantity) && (option === null || option === void 0 ? void 0 : option.limit_suboptions_by_max);
+    if (shouldApplyHalfLogic && position === 'whole') {
+      var _pizzaState4;
+      var otherOptionsValue = pizzaState === null || pizzaState === void 0 || (_pizzaState4 = pizzaState["option:".concat(option === null || option === void 0 ? void 0 : option.id)]) === null || _pizzaState4 === void 0 ? void 0 : _pizzaState4.value;
+      var additionalValue = position === 'whole' ? state.quantity / 2 : 0;
+      var wouldExceedMax = otherOptionsValue + additionalValue > option.max;
+      if (wouldExceedMax) {
+        return;
+      }
+    }
+    var newQuantity = state.quantity;
+    if (shouldApplyHalfLogic && position === 'whole' && state.quantity > suboption.max) {
+      newQuantity = suboption.max;
+    }
     changeState(_objectSpread(_objectSpread({}, state), {}, {
       position: position,
       price: price,
-      total: price * state.quantity
+      quantity: newQuantity,
+      total: price * newQuantity
     }));
   };
 
   /**
-   * Change position of the suboption
-   * @param {string} position Position of the suboption
+   * Change quantity of the suboption
+   * @param {number} quantity Quantity of the suboption
    */
   var changeQuantity = function changeQuantity(quantity) {
     changeState(_objectSpread(_objectSpread({}, state), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-components-external",
-  "version": "13.2.23",
+  "version": "13.2.25",
   "description": "Ordering Internal Dashboard",
   "main": "./_modules/index.js",
   "scripts": {

package/src/components/PaymentOptionStripeLink/index.js

@@ -11,7 +11,8 @@ import { useSession } from '../../contexts/SessionContext'
 export const PaymentOptionStripeLink = (props) => {
   const {
     UIComponent,
-    paymentURL
+    paymentURL,
+    cartTotal
   } = props
 
   const [ordering] = useApi()
@@ -35,6 +36,14 @@ export const PaymentOptionStripeLink = (props) => {
         provider: customProviders.includes(ordering?.project) ? 'custom' : 'twilio',
         country_phone_code: userInfo.country_phone_code,
         cellphone: userInfo.cellphone,
+        payment_url: paymentURL,
+        user: {
+          name: userInfo?.name,
+          lastname: userInfo?.lastname
+        },
+        cart: {
+          total: cartTotal ?? 0
+        },
         message: t('LINK_TO_PAY_MESSAGE',
           'Hello there _name_ _lastname_, click on the following link to complete the payment: _link_')
           .replace('_name_', userInfo?.name)

package/src/components/ProductOptionSuboption/index.js

@@ -51,14 +51,20 @@ export const ProductOptionSuboption = (props) => {
     const selectStatus = isOrigin ? !state.selected : state.selected
     const minMaxValidation = option.with_half_option ? usePizzaValidation : (balance === option.max && !(option?.max === 1 && option?.min === 1))
     const canBeSelectedByHalf = (pizzaState?.[`option:${option?.id}`]?.value === (option.max - 0.5)) && option.with_half_option
+
+    const shouldApplyHalfLogic = option?.with_half_option && option?.allow_suboption_quantity && option?.limit_suboptions_by_max
+    const remainingBalance = option.max - balance
+    const canOnlySelectHalf = shouldApplyHalfLogic && remainingBalance < 1 && remainingBalance > 0
+
     if (selectStatus && (option.limit_suboptions_by_max || isAlsea) && minMaxValidation && !canBeSelectedByHalf) {
       return
     }
+
     changeState({
       ...state,
       quantity: state.selected ? 0 : 1,
       selected: !state.selected,
-      position: canBeSelectedByHalf ? 'left' : 'whole'
+      position: (canBeSelectedByHalf || canOnlySelectHalf) ? 'left' : 'whole'
     })
   }
 
@@ -66,15 +72,34 @@ export const ProductOptionSuboption = (props) => {
    * Increment suboption quantity
    */
   const increment = () => {
+    const shouldApplyHalfLogic = option?.with_half_option && option?.allow_suboption_quantity && option?.limit_suboptions_by_max
+    const maxByPosition = shouldApplyHalfLogic && state.position !== 'whole'
+      ? suboption.max * 2
+      : suboption.max
+
+    // Validar si incrementar excedería el máximo de la opción cuando está en 'whole'
+    if (shouldApplyHalfLogic && state.position === 'whole') {
+      const otherOptionsValue = pizzaState?.[`option:${option?.id}`]?.value
+      const wouldExceedMax = (otherOptionsValue + 1) > option.max
+
+      if (wouldExceedMax) {
+        return
+      }
+    }
+
     if (!option?.with_half_option && option.limit_suboptions_by_max && (balance === option.max || state.quantity === suboption.max)) {
       return
     }
     if (!option?.with_half_option && !option.limit_suboptions_by_max && state.quantity === suboption.max) {
       return
     }
+    if (shouldApplyHalfLogic && state.quantity === maxByPosition) {
+      return
+    }
     if (option?.with_half_option && usePizzaValidation) {
       return
     }
+
     changeState({
       ...state,
       selected: state.quantity === 0 ? true : state.selected,
@@ -104,17 +129,36 @@ export const ProductOptionSuboption = (props) => {
    */
   const changePosition = (position) => {
     const price = option.with_half_option && suboption.half_price && position !== 'whole' ? suboption.half_price : suboption.price
+
+    const shouldApplyHalfLogic = option?.with_half_option && option?.allow_suboption_quantity && option?.limit_suboptions_by_max
+
+    if (shouldApplyHalfLogic && position === 'whole') {
+      const otherOptionsValue = pizzaState?.[`option:${option?.id}`]?.value
+      const additionalValue = position === 'whole' ? state.quantity / 2 : 0
+      const wouldExceedMax = (otherOptionsValue + additionalValue) > option.max
+
+      if (wouldExceedMax) {
+        return
+      }
+    }
+
+    let newQuantity = state.quantity
+    if (shouldApplyHalfLogic && position === 'whole' && state.quantity > suboption.max) {
+      newQuantity = suboption.max
+    }
+
     changeState({
       ...state,
       position,
       price,
-      total: price * state.quantity
+      quantity: newQuantity,
+      total: price * newQuantity
     })
   }
 
   /**
-   * Change position of the suboption
-   * @param {string} position Position of the suboption
+   * Change quantity of the suboption
+   * @param {number} quantity Quantity of the suboption
    */
   const changeQuantity = (quantity) => {
     changeState({