rerobe-js-orm 4.9.16 → 4.9.18

package/lib/form-states/Order/RefundFormState.d.ts

@@ -5,6 +5,7 @@ export default class RefundFormState extends FormState {
     fields: OrderRefundFormFields;
     props: CompleteRefund;
     orderHelpers: OrderHelpers;
+    totalRefundedManuallyEdited: boolean;
     constructor(props?: any);
     createRefund(): Refund;
     updateTotalRefunded(): void;

package/lib/form-states/Order/RefundFormState.js

@@ -8,6 +8,11 @@ class RefundFormState extends FormState_1.default {
     constructor(props) {
         super();
         this.orderHelpers = new OrderHelpers_1.default();
+        // Once an admin types an explicit refund amount, that value is authoritative.
+        // Line-item / shipping edits must NOT silently recompute (and thereby wipe) it,
+        // because the server-side order trigger issues a REAL Stripe refund for
+        // `refund.totalRefunded.amount` — a clobbered value over-refunds the customer.
+        this.totalRefundedManuallyEdited = false;
         this.props = Object.assign(Object.assign({}, new Refund_1.default(props).toObj()), { orderMoreInfo: (props === null || props === void 0 ? void 0 : props.order) ? this.orderHelpers.getOrderInfoWithRefundsAndFulfillments(props === null || props === void 0 ? void 0 : props.order) : {} });
         this.fields.totalRefunded = this.fieldFactory('textInput', 'totalRefunded');
         this.fields.subtotalRefunded = this.fieldFactory('textInput', 'subtotalRefunded');
@@ -31,12 +36,17 @@ class RefundFormState extends FormState_1.default {
         return refundFactory.createRefund(this);
     }
     updateTotalRefunded() {
-        this.fields.totalRefunded.inputValue = this.orderHelpers.toFixedPointPrice(Number(this.fields.subtotalRefunded.inputValue) +
-            Number(this.fields.refundShipping.inputValue) +
-            Number(this.fields.totalTax.inputValue));
-        this.fields.totalRefundedPresentment.inputValue = this.orderHelpers.toFixedPointPrice(Number(this.fields.subtotalRefundedPresentment.inputValue) +
-            Number(this.fields.refundShippingPresentment.inputValue) +
-            Number(this.fields.totalTaxPresentment.inputValue));
+        // Only auto-derive the refund total from line items when the admin has NOT
+        // typed an explicit amount. Otherwise their entered value (e.g. full amount
+        // minus a withheld return fee) is preserved.
+        if (!this.totalRefundedManuallyEdited) {
+            this.fields.totalRefunded.inputValue = this.orderHelpers.toFixedPointPrice(Number(this.fields.subtotalRefunded.inputValue) +
+                Number(this.fields.refundShipping.inputValue) +
+                Number(this.fields.totalTax.inputValue));
+            this.fields.totalRefundedPresentment.inputValue = this.orderHelpers.toFixedPointPrice(Number(this.fields.subtotalRefundedPresentment.inputValue) +
+                Number(this.fields.refundShippingPresentment.inputValue) +
+                Number(this.fields.totalTaxPresentment.inputValue));
+        }
         this.fields.refundCurrency.inputValue =
             Number(this.fields.totalRefunded.inputValue) - Number(this.fields.refundCreditDiscount.inputValue);
         this.fields.refundCurrencyPresentment.inputValue =
@@ -219,6 +229,12 @@ class RefundFormState extends FormState_1.default {
                 fieldKey === 'totalRefundedPresentment') {
                 onChangeHandler = (val) => {
                     this.fields[fieldKey].inputValue = String(val);
+                    // Typing an explicit refund total marks it authoritative so later
+                    // line-item / shipping edits can't recompute it away. Clearing the
+                    // field (empty) re-enables auto-calculation from line items.
+                    if (fieldKey === 'totalRefunded' || fieldKey === 'totalRefundedPresentment') {
+                        this.totalRefundedManuallyEdited = String(val !== null && val !== void 0 ? val : '').trim() !== '';
+                    }
                     this.updateRelatedField(fieldKey, Number(val || 0));
                     if (fieldKey === 'refundShipping' || fieldKey === 'refundShippingPresentment') {
                         this.updateTotalRefunded();

package/lib/helpers/OrderHelpers.js

@@ -828,10 +828,28 @@ class OrderHelpers {
         const timeBucket = this.generateTimeBucket(order.createdAtTimestamp || Date.now(), timeBucketMinutes);
         // Create a hash of line items - what is being ordered
         const lineItemsHash = this.generateLineItemsHash(order.lineItems || []);
+        // Payment anchor - the Stripe-issued PaymentIntent id, present once the order
+        // is paid. Including it gives two genuinely-distinct sales of an IDENTICAL
+        // cart different keys (different PaymentIntents), so a rapid, legitimate
+        // re-sale of the same stocked SKU is not mistaken for a duplicate — while
+        // retries of the SAME payment still collapse to one key. Omitted (filtered out
+        // below) when absent, so unpaid / offline orders keep the pure content + time
+        // fingerprint and behave exactly as before. Unlike id / shopifyId /
+        // orderNumber, the PaymentIntent id is Stripe-issued (not a client-forgeable
+        // arbitrary value), so it cannot be used to bypass idempotency.
+        const paymentIntentId = order.paymentIntentId || '';
         // Combine all fields into a consistent string
         // Note: We explicitly exclude client-generated IDs (id, shopifyId, orderNumber)
         // since clients control these and could bypass idempotency protection
-        const keyComponents = [customerEmail, totalAmount, currencyCode, merchantId, timeBucket, lineItemsHash];
+        const keyComponents = [
+            customerEmail,
+            totalAmount,
+            currencyCode,
+            merchantId,
+            timeBucket,
+            lineItemsHash,
+            paymentIntentId,
+        ];
         // Filter out empty values and join
         const keyString = keyComponents.filter((component) => component && String(component).trim().length > 0).join('|');
         // Generate SHA-256 hash for consistent length and uniqueness

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "4.9.16",
+  "version": "4.9.18",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",