geer-builder 1.2.495 → 1.2.496

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/components/ApplyMerchant/ApplyMerchantDialog.vue +1 -0
  2. package/components/MyPurchases/tabs/ToReceiveTab.vue +2 -2
  3. package/package.json +1 -1
package/components/ApplyMerchant/ApplyMerchantDialog.vue CHANGED
@@ -179,6 +179,7 @@ export default {
179
179
  {
180
180
  this.$q.loading.show();
181
181
  this.merchant_details.pickup_address = this.pickup_address_details;
182
+ this.merchant_details.email = this.user_info.email? this.user_info.email : '';
182
183
  if( this.public_settings && this.public_settings.apply_merchant_custom_fields && this.public_settings.apply_merchant_custom_fields.length <= 0 || this.public_settings && !this.public_settings.apply_merchant_custom_fields)
183
184
  {
184
185
  delete this.merchant_details.additional_details;
package/components/MyPurchases/tabs/ToReceiveTab.vue CHANGED
@@ -90,7 +90,7 @@
90
90
  </div>
91
91
  <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
92
92
  <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
93
- <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='shipping' && list.payment_method.payment_method_id != 'cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
93
+ <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
94
94
  </div>
95
95
  </div>
96
96
  </div>
@@ -160,7 +160,7 @@
160
160
  </div>
161
161
  <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:10px">
162
162
  <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
163
- <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='shipping' && list.payment_method.payment_method_id != 'cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
163
+ <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='online_payment' || list.status =='delivered' && list.payment_method.payment_method_id =='cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
164
164
  </div>
165
165
  </div>
166
166
  </div>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.495",
3
+ "version": "1.2.496",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {