|
|
@@ -84,8 +84,8 @@ export default {
|
|
|
paymentMethod() {
|
|
|
return this.order.PAY_TYPE === 'pay_stack' ? 'Paystack' : this.order.PAY_TYPE || '—'
|
|
|
},
|
|
|
- address() {
|
|
|
- return String(this.order.EXPRESS_TYPE) === '1' ? 'Self Pick-up' : 'Delivery'
|
|
|
+ isPickup() {
|
|
|
+ return String(this.order.EXPRESS_TYPE) === '1'
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -171,11 +171,33 @@ export default {
|
|
|
</dl>
|
|
|
<p v-if="!currency">Currency information is unavailable.</p>
|
|
|
</ui-section-card>
|
|
|
- <ui-section-card :title="address">
|
|
|
- <strong>{{ order.CONSIGNEE || '—' }}</strong>
|
|
|
- <p class="ng-guest-order-address">
|
|
|
- {{ order.MOBILE || '—' }}<br>{{ order.FULL_ADDRESS }}<br>{{ order.COUNTRY || '—' }}
|
|
|
- </p>
|
|
|
+ <ui-section-card class="ng-guest-order-fulfillment">
|
|
|
+ <div class="ng-guest-order-fulfillment-heading">
|
|
|
+ <h2 class="ng-guest-order-fulfillment-title">{{ isPickup ? 'Pickup' : 'Delivery' }}</h2>
|
|
|
+ <el-tag
|
|
|
+ :type="isPickup ? 'success' : ''"
|
|
|
+ size="small"
|
|
|
+ class="ng-guest-order-fulfillment-tag"
|
|
|
+ >{{ isPickup ? 'Self-pickup' : 'Door delivery' }}</el-tag>
|
|
|
+ </div>
|
|
|
+ <div class="ng-guest-order-fulfillment-fields">
|
|
|
+ <div class="ng-guest-order-fulfillment-row ng-guest-order-recipient">
|
|
|
+ <i class="el-icon-user" aria-hidden="true" />
|
|
|
+ <div class="ng-guest-order-fulfillment-content">
|
|
|
+ <span class="ng-guest-order-fulfillment-label">Recipient</span>
|
|
|
+ <strong>{{ order.CONSIGNEE || '—' }}</strong>
|
|
|
+ <p class="ng-guest-order-fulfillment-detail">{{ order.MOBILE || 'No phone on file' }}</p>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div v-if="!isPickup" class="ng-guest-order-fulfillment-row ng-guest-order-address">
|
|
|
+ <i class="el-icon-location-outline" aria-hidden="true" />
|
|
|
+ <div class="ng-guest-order-fulfillment-content">
|
|
|
+ <span class="ng-guest-order-fulfillment-label">Delivery address</span>
|
|
|
+ <strong>{{ order.FULL_ADDRESS || '—' }}</strong>
|
|
|
+ <p class="ng-guest-order-fulfillment-detail">{{ order.COUNTRY || '—' }}</p>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</ui-section-card>
|
|
|
<ui-section-card title="Payment">
|
|
|
<div class="ng-guest-order-payment">
|
|
|
@@ -309,9 +331,74 @@ export default {
|
|
|
.ng-guest-order-total dt {
|
|
|
color: inherit;
|
|
|
}
|
|
|
-.ng-guest-order-address {
|
|
|
+.ng-guest-order-fulfillment-heading {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ gap: 12px;
|
|
|
+ margin-bottom: 16px;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-title {
|
|
|
+ margin: 0;
|
|
|
+ color: #202259;
|
|
|
+ font-size: 16px;
|
|
|
+ line-height: 1.5;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-tag {
|
|
|
+ flex-shrink: 0;
|
|
|
+ border: 0;
|
|
|
+ border-radius: 999px;
|
|
|
+ color: #00749a;
|
|
|
+ background: #e8f4f8;
|
|
|
+ font-weight: 600;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-tag.el-tag--success {
|
|
|
+ color: #08794f;
|
|
|
+ background: #e9f6ef;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-fields {
|
|
|
+ display: grid;
|
|
|
+ gap: 8px;
|
|
|
+ margin-bottom: 20px;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-row {
|
|
|
+ display: flex;
|
|
|
+ align-items: flex-start;
|
|
|
+ gap: 12px;
|
|
|
+ padding: 14px;
|
|
|
+ border-radius: 8px;
|
|
|
+ background: #f7f8fa;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-row > i {
|
|
|
+ flex-shrink: 0;
|
|
|
+ margin-top: 2px;
|
|
|
+ color: #606266;
|
|
|
+ line-height: 1.5;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-content {
|
|
|
+ min-width: 0;
|
|
|
+ overflow-wrap: anywhere;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-label {
|
|
|
+ display: block;
|
|
|
+ color: #606266;
|
|
|
+ font-size: 12px;
|
|
|
+ line-height: 1.5;
|
|
|
+ letter-spacing: 0.04em;
|
|
|
+ text-transform: uppercase;
|
|
|
+}
|
|
|
+.ng-guest-order-fulfillment-content strong {
|
|
|
+ display: block;
|
|
|
+ margin-top: 4px;
|
|
|
+ color: #303133;
|
|
|
+ line-height: 1.5;
|
|
|
white-space: pre-line;
|
|
|
}
|
|
|
+.ng-guest-order-details .ng-guest-order-fulfillment-detail {
|
|
|
+ margin: 4px 0 0;
|
|
|
+ font-size: 13px;
|
|
|
+}
|
|
|
.ng-guest-order-member-fields {
|
|
|
margin: 0 0 20px;
|
|
|
}
|