Merge pull request #256 from karrioapi/patch-2023.3.4

[patch] 2023.3.4
karrioapi · Mar 29, 2023 · e0a6106 · e0a6106 · vercel · Mar 29, 2023
2 parents c00f2e9 + 0b9ede5
commit e0a6106
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/context/label-data.ts b/src/context/label-data.ts
@@ -249,8 +249,8 @@ export function useLabelDataMutation(id: string) {
       try {
         const invalidCustoms = (
           "customs" in changes && [
-            ...(changes.customs?.commodities, []),
-            ...(state.shipment.customs?.commodities, [])
+            ...(changes.customs?.commodities || []),
+            ...(state.shipment.customs?.commodities || [])
           ].length === 0
         );
         if (invalidCustoms) {

diff --git a/src/modules/Shipments/create_label.tsx b/src/modules/Shipments/create_label.tsx
@@ -542,6 +542,16 @@ export default function CreateLabelPage(pageProps: any) {
 
                 </div>
 
+
+                {/* paperless trade */}
+                <CheckBoxField name="paperless_trade"
+                  fieldClass="column mb-0 is-12 px-0 py-2"
+                  defaultChecked={shipment.options?.paperless_trade}
+                  onChange={e => onChange({ options: { ...shipment.options, paperless_trade: e.target.checked } })}
+                >
+                  <span>Paperless trade</span>
+                </CheckBoxField>
+
               </div>
 
               <hr className='my-1' style={{ height: '1px' }} />
@@ -660,7 +670,8 @@ export default function CreateLabelPage(pageProps: any) {
                         ...DEFAULT_CUSTOMS_CONTENT.duty,
                         currency: shipment.options?.currency,
                         paid_by: shipment.payment?.paid_by,
-                        account_number: shipment.payment?.account_number
+                        account_number: shipment.payment?.account_number,
+                        declared_value: shipment.options?.declared_value,
                       },
                       duty_billing_address: shipment.billing_address,
                       commodities: getShipmentCommodities(shipment),