feat(dashboard): Pickup option changes (#11306)
**What** - update the create and edit shipping option flows to support pickup (shipping) option - modify "mark as delivered" for pickup case --- CLOSES CMRC-906 CMRC-907
This commit is contained in:
Frane Polić
GitHub
@@ -4806,6 +4806,9 @@
|
||||
"markAsShipped": {
|
||||
"type": "string"
|
||||
},
|
||||
"markAsPickedUp": {
|
||||
"type": "string"
|
||||
},
|
||||
"markAsDelivered": {
|
||||
"type": "string"
|
||||
},
|
||||
@@ -4915,13 +4918,17 @@
|
||||
},
|
||||
"fulfillmentDelivered": {
|
||||
"type": "string"
|
||||
},
|
||||
"fulfillmentPickedUp": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": [
|
||||
"created",
|
||||
"canceled",
|
||||
"fulfillmentShipped",
|
||||
"fulfillmentDelivered"
|
||||
"fulfillmentDelivered",
|
||||
"fulfillmentPickedUp"
|
||||
],
|
||||
"additionalProperties": false
|
||||
},
|
||||
@@ -4952,6 +4959,7 @@
|
||||
"available",
|
||||
"inStock",
|
||||
"markAsShipped",
|
||||
"markAsPickedUp",
|
||||
"markAsDelivered",
|
||||
"itemsToFulfillDesc",
|
||||
"locationDescription",
|
||||
@@ -5754,6 +5762,23 @@
|
||||
],
|
||||
"additionalProperties": false
|
||||
},
|
||||
"pickupOptions": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"edit": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"header": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": ["header"],
|
||||
"additionalProperties": false
|
||||
}
|
||||
},
|
||||
"required": ["edit"],
|
||||
"additionalProperties": false
|
||||
},
|
||||
"shippingOptions": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -5779,6 +5804,25 @@
|
||||
"required": ["header", "hint", "label", "successToast"],
|
||||
"additionalProperties": false
|
||||
},
|
||||
"pickup": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"header": {
|
||||
"type": "string"
|
||||
},
|
||||
"hint": {
|
||||
"type": "string"
|
||||
},
|
||||
"label": {
|
||||
"type": "string"
|
||||
},
|
||||
"successToast": {
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": ["header", "hint", "label", "successToast"],
|
||||
"additionalProperties": false
|
||||
},
|
||||
"returns": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -5815,7 +5859,7 @@
|
||||
"type": "string"
|
||||
}
|
||||
},
|
||||
"required": ["shipping", "returns", "tabs", "action"],
|
||||
"required": ["shipping", "pickup", "returns", "tabs", "action"],
|
||||
"additionalProperties": false
|
||||
},
|
||||
"delete": {
|
||||
@@ -5996,6 +6040,12 @@
|
||||
"shipping_other": {
|
||||
"type": "string"
|
||||
},
|
||||
"pickup_one": {
|
||||
"type": "string"
|
||||
},
|
||||
"pickup_other": {
|
||||
"type": "string"
|
||||
},
|
||||
"returns_one": {
|
||||
"type": "string"
|
||||
},
|
||||
@@ -6006,6 +6056,8 @@
|
||||
"required": [
|
||||
"shipping_one",
|
||||
"shipping_other",
|
||||
"pickup_one",
|
||||
"pickup_other",
|
||||
"returns_one",
|
||||
"returns_other"
|
||||
],
|
||||
@@ -6201,6 +6253,7 @@
|
||||
"fulfillmentSets",
|
||||
"sidebar",
|
||||
"salesChannels",
|
||||
"pickupOptions",
|
||||
"shippingOptions",
|
||||
"serviceZones"
|
||||
],
|
||||
|
||||
@@ -1281,6 +1281,7 @@
|
||||
"available": "Available",
|
||||
"inStock": "In stock",
|
||||
"markAsShipped": "Mark as shipped",
|
||||
"markAsPickedUp": "Mark as picked up",
|
||||
"markAsDelivered": "Mark as delivered",
|
||||
"itemsToFulfillDesc": "Choose items and quantities to fulfill",
|
||||
"locationDescription": "Choose which location you want to fulfill items from.",
|
||||
@@ -1310,7 +1311,8 @@
|
||||
"created": "Fulfillment created successfully",
|
||||
"canceled": "Fulfillment successfully canceled",
|
||||
"fulfillmentShipped": "Cannot cancel an already shipped fulfillment",
|
||||
"fulfillmentDelivered": "Fulfillment marked as delivered successfully"
|
||||
"fulfillmentDelivered": "Fulfillment marked as delivered successfully",
|
||||
"fulfillmentPickedUp": "Fulfillment marked as picked up successfully"
|
||||
},
|
||||
"trackingLabel": "Tracking",
|
||||
"shippingFromLabel": "Shipping from",
|
||||
@@ -1520,6 +1522,11 @@
|
||||
"action": "Connect sales channels",
|
||||
"successToast": "Sales channels were successfully updated."
|
||||
},
|
||||
"pickupOptions": {
|
||||
"edit": {
|
||||
"header": "Edit Pickup Option"
|
||||
}
|
||||
},
|
||||
"shippingOptions": {
|
||||
"create": {
|
||||
"shipping": {
|
||||
@@ -1528,6 +1535,12 @@
|
||||
"label": "Shipping options",
|
||||
"successToast": "Shipping option {{name}} was successfully created."
|
||||
},
|
||||
"pickup": {
|
||||
"header": "Create Pickup Option for {{zone}}",
|
||||
"hint": "Create a new pickup option to define how products are picked up from this location.",
|
||||
"label": "Pickup options",
|
||||
"successToast": "Pickup option {{name}} was successfully created."
|
||||
},
|
||||
"returns": {
|
||||
"header": "Create a Return Option for {{zone}}",
|
||||
"hint": "Create a new return option to define how products are returned to this location.",
|
||||
@@ -1591,6 +1604,8 @@
|
||||
"count": {
|
||||
"shipping_one": "{{count}} shipping option",
|
||||
"shipping_other": "{{count}} shipping options",
|
||||
"pickup_one": "{{count}} pickup option",
|
||||
"pickup_other": "{{count}} pickup options",
|
||||
"returns_one": "{{count}} return option",
|
||||
"returns_other": "{{count}} return options"
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user