@subiz/widget-v4 4.0.72 → 4.0.73

package/src/order/order.js

@@ -21,6 +21,7 @@ export default class Order extends common.Com {
 		loading: true,
 		order: {},
 		err: {},
+		shipping_address: 'new',
 
 		selectedProvince: null,
 		selectedDistrict: null,
@@ -868,21 +869,16 @@ export default class Order extends common.Com {
 			</div>
 		)
 
-
-
-
 		if (order.user_confirmation || order.status != 'open') {
 			$status = null
 			if (this.props.cid)
-			$close = (
-				<div class='order_btn order__btn__light mt-3' onClick={this.close}>
-					{this.props.t('close')}
-				</div>
-			)
+				$close = (
+					<div class='order_btn order__btn__light mt-3' onClick={this.close}>
+						{this.props.t('close')}
+					</div>
+				)
 		}
 
-
-
 		return (
 			<div class='order' style='height: 100% !important'>
 				<div class='order--content'>
@@ -1132,15 +1128,15 @@ export default class Order extends common.Com {
 
 	onCancel = () => {
 		if (this.props.onResponse) this.props.onResponse('rejected')
-		this.close()
-	}
-
-	close = () => {
 		if (this.props.cid && !this.state.order.user_confirmation) {
 			let order = sb.cloneDeep(this.state.order)
 			order.user_confirmation = 'rejected'
 			this.props.store.updateOrder(order)
 		}
+		this.close()
+	}
+
+	close = () => {
 		if (this.props.onClose) this.props.onClose()
 	}
 }