geer-builder 1.2.546 → 1.2.549

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.
package/GProductList.vue CHANGED
@@ -15,8 +15,8 @@
15
15
  <template v-if="cashback">
16
16
  <div class="cashback-badge" v-if="field.item_pv>0"><div class="cashback-label">Cashback: </div> <div class="cashback-value">{{$_formatNumber((field.item_pv/12), { decimal: 2})}} </div></div>
17
17
  </template>
18
- <template v-if="show_reseller_commission">
19
- <div class="commission-badge" v-if="field.computed_commission>0">
18
+ <template v-if="show_reseller_commission && field.referral_commission > 0 ">
19
+ <div class="commission-badge">
20
20
  <div class="commission-label">rc: </div>
21
21
  <div class="commission-value">{{$_formatNumber((field.referral_commission), { decimal: 2})}} </div>
22
22
  </div>
@@ -0,0 +1,138 @@
1
+ <template>
2
+ <div class="video-management">
3
+ <div v-if="user_info">
4
+ <div class="row vids-container" style="text-align: center;">
5
+ <div class="col-6" v-for="data in table_data" :key="data.id">
6
+ <div style="padding:10px;" v-if="content_type == 'Video' && data.video_type == 'Youtube'">
7
+ <div>{{data.title}}</div>
8
+ <!-- <youtube style="height:300px;width:100%" :video-id="getId(data.url)" ref="youtube" @playing="playing"></youtube> -->
9
+ <iframe width="100%" height="300"
10
+ :src="`https://www.youtube.com/embed/`+getId(data.url)"
11
+ title="YouTube video player"
12
+ frameborder="0"
13
+ allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
14
+ allowfullscreen>
15
+ </iframe>
16
+ </div>
17
+ <div style="padding:10px;" v-if="content_type == 'Video' && data.video_type == 'Vimeo'">
18
+ <div>{{data.title}}</div>
19
+ <!-- <vimeo-player ref="player" :video-id="getVimeoID(data.url)" :options="vimeo_options"></vimeo-player> -->
20
+ <iframe class="vim-iframe" width="100%" height="400px;" :src="`//player.vimeo.com/video/`+getVimeoID(data.url)" frameborder="0" allowfullscreen :onload="setStyle()"></iframe>
21
+ </div>
22
+ <div style="padding:10px;" v-if="content_type == 'Google Drive'">
23
+ <div><b>{{data.title}}</b></div>
24
+ <a :href="data.url">Google Drive Link</a>
25
+ </div>
26
+ </div>
27
+ </div>
28
+ </div>
29
+
30
+ </div>
31
+
32
+
33
+ </template>
34
+
35
+ <script>
36
+ import GlobalMixins from '../../mixins/global_mixins';
37
+ import DB_CONTENT_MANAGEMENT from '../../models/DB_CONTENT_MANAGEMENT';
38
+
39
+ import Vue from 'vue'
40
+ import VueYoutube from 'vue-youtube';
41
+ import { getIdFromUrl } from 'vue-youtube';
42
+ import { Youtube } from 'vue-youtube';
43
+
44
+ Vue.use(VueYoutube)
45
+
46
+ export default
47
+ {
48
+ mixins: [GlobalMixins],
49
+ components: { },
50
+ props:{
51
+ content_type: String
52
+ },
53
+ data:() =>
54
+ ({
55
+ db_content_management: new DB_CONTENT_MANAGEMENT(),
56
+ loading_table: true,
57
+ table_data: [],
58
+ vimeo_options:{height:'100%',width:"400px"}
59
+ }),
60
+ mounted()
61
+ {
62
+ this.getList();
63
+ },
64
+ computed:
65
+ {
66
+ },
67
+ methods:
68
+ {
69
+ async getList()
70
+ {
71
+ if(this.content_type == "Video")
72
+ {
73
+ await this.$bind('table_data', this.db_content_management.collection().where("type","==","Video").where("show","==",true).where("archive","==",false).orderBy('created_date', 'desc'));
74
+ }
75
+ else if(this.content_type == "Google Drive")
76
+ {
77
+ await this.$bind('table_data', this.db_content_management.collection().where("type","==","Google Drive").where("show","==",true).where("archive","==",false).orderBy('created_date', 'desc'));
78
+ }
79
+ this.loading_table = false;
80
+ },
81
+ getId(url)
82
+ {
83
+ var video_id = url.split('v=')[1];
84
+ var ampersandPosition = video_id.indexOf('&');
85
+ if(ampersandPosition != -1)
86
+ {
87
+ video_id = video_id.substring(0, ampersandPosition);
88
+ }
89
+
90
+ return video_id;
91
+ // return this.$youtube.getIdFromUrl(url)
92
+ },
93
+ playing()
94
+ {
95
+
96
+ },
97
+ getVimeoID(url)
98
+ {
99
+ var regExp = /^.*(vimeo\.com\/)((channels\/[A-z]+\/)|(groups\/[A-z]+\/videos\/))?([0-9]+)/;
100
+
101
+ var match = url.match(regExp);
102
+
103
+ if (match)
104
+ {
105
+ return match[5];
106
+ }
107
+ else
108
+ {
109
+ return "error";
110
+ }
111
+
112
+ },
113
+ setStyle()
114
+ {
115
+
116
+ }
117
+ },
118
+ }
119
+ </script>
120
+
121
+ <style lang="scss">
122
+ .vids-container
123
+ {
124
+ // position: relative;
125
+ // overflow: hidden;
126
+ // width: 100%;
127
+ // padding-top: 56.25%;
128
+
129
+ .vimeo_container
130
+ {
131
+ iframe
132
+ {
133
+ width: 100%;
134
+ height: 400px;
135
+ }
136
+ }
137
+ }
138
+ </style>
@@ -230,7 +230,16 @@ export default
230
230
  },
231
231
  async getTableData()
232
232
  {
233
+ // await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).orderBy('convert_message', 'desc').orderBy('created_date', 'desc'));
233
234
  await this.$bind("table_data", new DB_SLOT_LOG().collection().where("recipient_id", "==", this.user_info.active_slot).orderBy('created_date', 'desc'));
235
+ for( var i = 0; i < this.table_data.length; i++)
236
+ {
237
+ if (this.table_data[i].temp_wallet_message)
238
+ {
239
+ this.table_data.splice(i, 1);
240
+ i--;
241
+ }
242
+ }
234
243
  this.table_loading = false;
235
244
  },
236
245
  },
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <q-card class="sales-invoice-printable">
2
+ <q-card class="sales-invoice-printable" :style="company_qdy ? `font-family:arial; letter-spacing: 1px; font-size:11px; padding:50px 20px;` : ``">
3
3
  <div class="row">
4
4
  <div class="col-12">
5
5
  <div class="row">
@@ -17,7 +17,7 @@
17
17
  </div>
18
18
  <div class="col-5 label" style="margin-top:15px;">Order No. Receipt No. : {{ number }}</div>
19
19
  </div>
20
- <div class="row text-left info">
20
+ <div class="row text-left info" :style="company_qdy? `line-height:20px`:``">
21
21
  <div class="col-7 label sold" style="margin-top:2"><div>Sold To :{{ customer.name }}</div></div>
22
22
  <div class="col-5 label date">DATE : {{ $_formatDate(transaction_date, 'YYYY-MM-DD mm:ss.s') }}</div>
23
23
  </div>
@@ -122,6 +122,7 @@ export default {
122
122
  main_currency:'',
123
123
  show_batch:false,
124
124
  show_customer_details:false,
125
+ company_qdy:false,
125
126
  }),
126
127
  async mounted()
127
128
  {
@@ -129,6 +130,10 @@ export default {
129
130
  // this.contact = this.stockist_info.stockist_details.phone_number;
130
131
 
131
132
  this.settings = await this.$_getData('public_settings');
133
+ if(this.settings.hasOwnProperty("qdy") && this.settings.qdy)
134
+ {
135
+ this.company_qdy = true;
136
+ }
132
137
  if(this.settings.hasOwnProperty("cashier_show_batch") && this.settings.cashier_show_batch == true)
133
138
  {
134
139
  this.show_batch = true;
@@ -0,0 +1,9 @@
1
+ import MODEL from './MODEL';
2
+
3
+ export default class DB_CONTENT_MANAGEMENT extends MODEL
4
+ {
5
+ constructor()
6
+ {
7
+ super(`content_management`);
8
+ }
9
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.546",
3
+ "version": "1.2.549",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {