geer-builder 1.2.656 → 1.2.657

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 (4) hide show
  1. package/GManageProduct.vue +16 -8
  2. package/components/ManageProduct/EditProduct.vue +2 -2
  3. package/components/ManageProduct/Tabs/Information.vue +27 -13
  4. package/package.json +1 -1
package/GManageProduct.vue CHANGED
@@ -27,7 +27,7 @@
27
27
  <reject-reason-dialog :product_information = "selectedProduct" @closePopup="is_open_reject_reason_dialog = false"></reject-reason-dialog>
28
28
  </q-dialog>
29
29
  <q-dialog full-width full-height v-model="is_open_edit_product_dialog" transition-show="slide-up" transition-hide="slide-down">
30
- <edit-product :selectedRow="selectedProduct" @closePopup="is_open_reject_reason_dialog = false"></edit-product>
30
+ <edit-product :selectedRow="selectedProduct" @closePopup="is_open_edit_product_dialog = false"></edit-product>
31
31
  </q-dialog>
32
32
  <q-dialog color="white" >
33
33
  </q-dialog>
@@ -99,7 +99,7 @@ export default
99
99
  {
100
100
  name : 'status',
101
101
  label : 'STATUS',
102
- field : row => row.status,
102
+ field : row => row.hasOwnProperty('update_status') && row.update_status == 'Pending Approval' ? 'Pending Update Request' : row.status,
103
103
  align : 'left',
104
104
  required: true,
105
105
  sortable: true,
@@ -145,16 +145,24 @@ export default
145
145
  },
146
146
  async showRejectReason(event, row)
147
147
  {
148
- if(row.status=="Rejected")
148
+ if(row.hasOwnProperty('update_status') && row.update_status == 'Pending Approval')
149
149
  {
150
- this.selectedProduct = row;
151
- this.is_open_reject_reason_dialog=true;
150
+
152
151
  }
153
- else if(row.status=="Active")
152
+ else
154
153
  {
155
- this.selectedProduct = row;
156
- this.is_open_edit_product_dialog = true;
154
+ if(row.status=="Rejected")
155
+ {
156
+ this.selectedProduct = row;
157
+ this.is_open_reject_reason_dialog=true;
158
+ }
159
+ else if(row.status=="Active")
160
+ {
161
+ this.selectedProduct = row;
162
+ this.is_open_edit_product_dialog = true;
163
+ }
157
164
  }
165
+
158
166
  },
159
167
  async filterProducts()
160
168
  {
package/components/ManageProduct/EditProduct.vue CHANGED
@@ -21,7 +21,7 @@
21
21
 
22
22
  <q-tab-panels v-model="tab" animated>
23
23
  <q-tab-panel class="tab-panel" name="information">
24
- <information :product_information="selectedRow" />
24
+ <information :product_information="selectedRow" />
25
25
  </q-tab-panel>
26
26
  <q-tab-panel class="tab-panel" name="testimony">
27
27
  <testimony :product_information="selectedRow"/>
@@ -48,7 +48,7 @@
48
48
  }),
49
49
  mounted()
50
50
  {
51
- },
51
+ }
52
52
  }
53
53
  </script>
54
54
 
package/components/ManageProduct/Tabs/Information.vue CHANGED
@@ -7,19 +7,19 @@
7
7
  <div class="row">
8
8
  <!-- FIELD - PRODUCT DESCRIPTION -->
9
9
  <div class="col-6">
10
- <div class="q-mt-sm q-ma-sm"><q-input outlined disable v-model="product_details.product_name" label="Product Name" stack-label></q-input></div>
10
+ <div class="q-mt-sm q-ma-sm"><q-input outlined v-model="product_details.product_name" label="Product Name" stack-label></q-input></div>
11
11
  </div>
12
12
  <!-- FIELD - PRODUCT SKU -->
13
13
  <div class="col-6">
14
- <div class="q-mt-sm q-ma-sm"><q-input disable outlined v-model="product_details.sku" label="Product SKU" stack-label></q-input></div>
14
+ <div class="q-mt-sm q-ma-sm"><q-input outlined v-model="product_details.sku" label="Product SKU" stack-label></q-input></div>
15
15
  </div>
16
16
  <!-- FIELD - PRICE -->
17
17
  <div class="col-3">
18
- <div class="q-mt-sm q-ma-sm"><q-input disable outlined type="number" v-model="product_details.selling_price" label="Selling Price" stack-label></q-input></div>
18
+ <div class="q-mt-sm q-ma-sm"><q-input outlined type="number" v-model="product_details.selling_price" label="Selling Price" stack-label></q-input></div>
19
19
  </div>
20
20
  <!-- FIELD - COMMISSION MARGIN -->
21
21
  <div class="col-3">
22
- <div class="q-mt-sm q-ma-sm"><q-input disable outlined type="number" v-model="product_details.commission_margin" label="Commission Margin (%)" stack-label></q-input></div>
22
+ <div class="q-mt-sm q-ma-sm"><q-input outlined type="number" v-model="product_details.commission_margin" label="Commission Margin (%)" stack-label></q-input></div>
23
23
  </div>
24
24
  <!-- FIELD - BARCODE -->
25
25
  <div class="col-3">
@@ -47,22 +47,22 @@
47
47
  <!-- FIELD - GC PRICE -->
48
48
 
49
49
  <div class="col-3">
50
- <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined disable v-model="product_details.delivery_settings.length" label="*Length" stack-label></q-input></div>
50
+ <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined v-model="product_details.delivery_settings.length" label="*Length" stack-label></q-input></div>
51
51
  </div>
52
52
  <!-- FIELD - ITEM PV -->
53
53
 
54
54
  <div class="col-3">
55
- <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined disable v-model="product_details.delivery_settings.width" label="*Width" stack-label></q-input></div>
55
+ <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined v-model="product_details.delivery_settings.width" label="*Width" stack-label></q-input></div>
56
56
  </div>
57
57
  <!-- FIELD - BINARY POINTS -->
58
58
 
59
59
  <div class="col-3">
60
- <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined disable v-model="product_details.delivery_settings.height" label="*Height" stack-label></q-input></div>
60
+ <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined v-model="product_details.delivery_settings.height" label="*Height" stack-label></q-input></div>
61
61
  </div>
62
62
  <!-- FIELD - TYPE -->
63
63
 
64
64
  <div class="col-3">
65
- <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined disable v-model="product_details.delivery_settings.weight" label="*Weight" stack-label></q-input></div>
65
+ <div class="q-mt-sm q-ma-sm"><q-input type="number" outlined v-model="product_details.delivery_settings.weight" label="*Weight" stack-label></q-input></div>
66
66
  </div>
67
67
  </div>
68
68
  <div class="col-12 mini-title">SEO</div>
@@ -246,6 +246,7 @@
246
246
  if(this.product_information)
247
247
  {
248
248
  link = 'memberUpdateProduct';
249
+ this.product_details.updated_by = this.user_info ? this.user_info.email: '';
249
250
  }
250
251
  else
251
252
  {
@@ -259,7 +260,7 @@
259
260
  this.product_details.primary_picture=this.product_pictures[0];
260
261
  this.product_details.product_pictures=this.product_pictures;
261
262
 
262
- await this.$_fbCall(link, this.product_details);
263
+ let ret = await this.$_fbCall(link, this.product_details);
263
264
  this.$q.loading.hide();
264
265
 
265
266
  if(!this.product_information)
@@ -268,11 +269,24 @@
268
269
  }
269
270
  else
270
271
  {
271
- this.$q.dialog(
272
+ if(ret.data == true)
272
273
  {
273
- title: 'Success!',
274
- message: 'Product Successfully Updated'
275
- });
274
+ this.$q.dialog(
275
+ {
276
+ title: 'Success!',
277
+ message: 'Product update successfully requested!'
278
+ });
279
+ this.$emit('closePopup');
280
+ }
281
+ else
282
+ {
283
+ this.$q.dialog(
284
+ {
285
+ title: 'Success!',
286
+ message: 'Product Successfully Updated'
287
+ });
288
+ this.$emit('closePopup');
289
+ }
276
290
  }
277
291
  }
278
292
  catch (error)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.656",
3
+ "version": "1.2.657",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {