|
@@ -19,7 +19,10 @@
|
19
|
19
|
<div class="form-row">
|
20
|
20
|
<div class="form-group col-md-6">
|
21
|
21
|
<div class="input-group">
|
22
|
|
- <label v-if="!selectedRegion" class="uniSelectLabel" for="weekInfoRegionSelect"
|
|
22
|
+ <label
|
|
23
|
+ v-if="!selectedRegion"
|
|
24
|
+ class="uniSelectLabel"
|
|
25
|
+ for="weekInfoRegionSelect"
|
23
|
26
|
>REGION</label
|
24
|
27
|
>
|
25
|
28
|
</div>
|
|
@@ -29,7 +32,11 @@
|
29
|
32
|
v-model="selectedRegion"
|
30
|
33
|
style="font-size: 15px"
|
31
|
34
|
>
|
32
|
|
- <option v-for="(region, r) in regions" :key="r" :value="region.regionCode">
|
|
35
|
+ <option
|
|
36
|
+ v-for="(region, r) in regions"
|
|
37
|
+ :key="r"
|
|
38
|
+ :value="region.regionCode"
|
|
39
|
+ >
|
33
|
40
|
{{ region.regionName }}
|
34
|
41
|
</option>
|
35
|
42
|
</select>
|
|
@@ -41,15 +48,19 @@
|
41
|
48
|
</div>
|
42
|
49
|
<div class="form-group col-md-6">
|
43
|
50
|
<div class="input-group">
|
44
|
|
- <float-label label="RESORT NAME" style="width:100%" fixed>
|
45
|
|
- <select class="form-control uniSelect" v-model="selectedResort">
|
|
51
|
+ <float-label label="RESORT NAME" style="width: 100%" fixed>
|
|
52
|
+ <select
|
|
53
|
+ class="form-control uniSelect"
|
|
54
|
+ v-model="selectedResort"
|
|
55
|
+ >
|
46
|
56
|
<option value="Other">Other</option>
|
47
|
57
|
<option
|
48
|
58
|
v-for="(resort, r) in filteredResort"
|
49
|
59
|
:key="r"
|
50
|
60
|
:value="resort.resortCode"
|
51
|
|
- >{{ resort.resortName }}</option
|
52
|
61
|
>
|
|
62
|
+ {{ resort.resortName }}
|
|
63
|
+ </option>
|
53
|
64
|
</select>
|
54
|
65
|
</float-label>
|
55
|
66
|
|
|
@@ -86,7 +97,10 @@
|
86
|
97
|
</div>
|
87
|
98
|
<div class="form-group col-md-6">
|
88
|
99
|
<div v-if="weekParam.otherResort">
|
89
|
|
- <label v-if="!weekParam.region" class="uniSelectLabel" for="region"
|
|
100
|
+ <label
|
|
101
|
+ v-if="!weekParam.region"
|
|
102
|
+ class="uniSelectLabel"
|
|
103
|
+ for="region"
|
90
|
104
|
>REGION</label
|
91
|
105
|
>
|
92
|
106
|
</div>
|
|
@@ -107,7 +121,7 @@
|
107
|
121
|
<div class="form-group col-md-6">
|
108
|
122
|
<float-label>
|
109
|
123
|
<input
|
110
|
|
- type="number"
|
|
124
|
+ type="text"
|
111
|
125
|
class="form-control"
|
112
|
126
|
name="unitNumber"
|
113
|
127
|
id="unitNumber"
|
|
@@ -142,9 +156,13 @@
|
142
|
156
|
id="season"
|
143
|
157
|
v-model="selectedSeason"
|
144
|
158
|
>
|
145
|
|
- <option :value="season.name" v-for="(season, r) in seasons" :key="r">{{
|
146
|
|
- season.name
|
147
|
|
- }}</option>
|
|
159
|
+ <option
|
|
160
|
+ :value="season.name"
|
|
161
|
+ v-for="(season, r) in seasons"
|
|
162
|
+ :key="r"
|
|
163
|
+ >
|
|
164
|
+ {{ season.name }}
|
|
165
|
+ </option>
|
148
|
166
|
</select>
|
149
|
167
|
</float-label>
|
150
|
168
|
|
|
@@ -158,7 +176,9 @@
|
158
|
176
|
id="region"
|
159
|
177
|
v-model="selectedBedrooms"
|
160
|
178
|
>
|
161
|
|
- <option v-for="(item, i) in resortBedrooms" :key="i">{{ item }}</option>
|
|
179
|
+ <option v-for="(item, i) in resortBedrooms" :key="i">
|
|
180
|
+ {{ item }}
|
|
181
|
+ </option>
|
162
|
182
|
</select>
|
163
|
183
|
</float-label>
|
164
|
184
|
|
|
@@ -172,7 +192,9 @@
|
172
|
192
|
id="region"
|
173
|
193
|
v-model="selectedMaxSleep"
|
174
|
194
|
>
|
175
|
|
- <option v-for="(item, i) in maxSleep" :key="i">{{ item }}</option>
|
|
195
|
+ <option v-for="(item, i) in maxSleep" :key="i">
|
|
196
|
+ {{ item }}
|
|
197
|
+ </option>
|
176
|
198
|
</select>
|
177
|
199
|
</float-label>
|
178
|
200
|
|
|
@@ -266,7 +288,9 @@
|
266
|
288
|
<div align="left" class="custom-control custom-switch mb-2">
|
267
|
289
|
<div class="row">
|
268
|
290
|
<div align="center" class="col">
|
269
|
|
- <label class="mr-5">Has your week been spacebanked for the current year?</label>
|
|
291
|
+ <label class="mr-5"
|
|
292
|
+ >Has your week been spacebanked for the current year?</label
|
|
293
|
+ >
|
270
|
294
|
<input
|
271
|
295
|
type="checkbox"
|
272
|
296
|
class="custom-control-input"
|
|
@@ -279,7 +303,9 @@
|
279
|
303
|
</label>
|
280
|
304
|
<div
|
281
|
305
|
class="spacebanked1"
|
282
|
|
- :class="{ 'spacebanked1--clicked': weekParam.currentYearBanked }"
|
|
306
|
+ :class="{
|
|
307
|
+ 'spacebanked1--clicked': weekParam.currentYearBanked,
|
|
308
|
+ }"
|
283
|
309
|
>
|
284
|
310
|
<div class="col-md-6">
|
285
|
311
|
<label
|
|
@@ -293,9 +319,13 @@
|
293
|
319
|
v-if="weekParam.currentYearBanked"
|
294
|
320
|
v-model="weekParam.bankedWith"
|
295
|
321
|
>
|
296
|
|
- <option v-for="(item, i) in bankedEntities" :key="i" :value="item">{{
|
297
|
|
- item
|
298
|
|
- }}</option>
|
|
322
|
+ <option
|
|
323
|
+ v-for="(item, i) in bankedEntities"
|
|
324
|
+ :key="i"
|
|
325
|
+ :value="item"
|
|
326
|
+ >
|
|
327
|
+ {{ item }}
|
|
328
|
+ </option>
|
299
|
329
|
</select>
|
300
|
330
|
</div>
|
301
|
331
|
</div>
|
|
@@ -303,14 +333,17 @@
|
303
|
333
|
</div>
|
304
|
334
|
</div>
|
305
|
335
|
|
306
|
|
- <div class="section-header" style="margin-top:50px">
|
|
336
|
+ <div class="section-header" style="margin-top: 50px">
|
307
|
337
|
<h2>Detailed Individual Information</h2>
|
308
|
338
|
</div>
|
309
|
339
|
<div class="form">
|
310
|
340
|
<div v-if="ROLE === 'Super Admin'" class="row mb-4">
|
311
|
341
|
<div class="col">
|
312
|
342
|
<float-label label="OWNER TYPE" fixed>
|
313
|
|
- <select v-model="weekParam.customOwner" class="form-control uniSelect mt-3">
|
|
343
|
+ <select
|
|
344
|
+ v-model="weekParam.customOwner"
|
|
345
|
+ class="form-control uniSelect mt-3"
|
|
346
|
+ >
|
314
|
347
|
<option v-bind:value="true">Custom Owner</option>
|
315
|
348
|
<option v-bind:value="false">Registered User</option>
|
316
|
349
|
</select>
|
|
@@ -326,9 +359,13 @@
|
326
|
359
|
class="form-control uniSelect mt-3"
|
327
|
360
|
@change="updateCurrentUser()"
|
328
|
361
|
>
|
329
|
|
- <option v-for="indiv in individuals" :key="indiv.id" :value="indiv.id">{{
|
330
|
|
- indiv.fullName
|
331
|
|
- }}</option>
|
|
362
|
+ <option
|
|
363
|
+ v-for="indiv in individuals"
|
|
364
|
+ :key="indiv.id"
|
|
365
|
+ :value="indiv.id"
|
|
366
|
+ >
|
|
367
|
+ {{ indiv.fullName }}
|
|
368
|
+ </option>
|
332
|
369
|
</select>
|
333
|
370
|
</float-label>
|
334
|
371
|
</div>
|
|
@@ -458,7 +495,7 @@
|
458
|
495
|
</div>
|
459
|
496
|
</div>
|
460
|
497
|
</div>
|
461
|
|
- <div class="section-header" style="margin-top:50px">
|
|
498
|
+ <div class="section-header" style="margin-top: 50px">
|
462
|
499
|
<h2>Week Agent</h2>
|
463
|
500
|
</div>
|
464
|
501
|
<div class="row">
|
|
@@ -470,9 +507,13 @@
|
470
|
507
|
name="agency"
|
471
|
508
|
v-model="weekParam.agencyId"
|
472
|
509
|
>
|
473
|
|
- <option v-for="(item, i) in agencies" :key="i" :value="item.id">{{
|
474
|
|
- item.agencyName
|
475
|
|
- }}</option>
|
|
510
|
+ <option
|
|
511
|
+ v-for="(item, i) in agencies"
|
|
512
|
+ :key="i"
|
|
513
|
+ :value="item.id"
|
|
514
|
+ >
|
|
515
|
+ {{ item.agencyName }}
|
|
516
|
+ </option>
|
476
|
517
|
</select>
|
477
|
518
|
</div>
|
478
|
519
|
<div class="col-md-6">
|
|
@@ -484,7 +525,11 @@
|
484
|
525
|
v-model="weekParam.agentId"
|
485
|
526
|
:disabled="!weekParam.agencyId"
|
486
|
527
|
>
|
487
|
|
- <option v-for="(item, i) in displayNotDeletedAgents" :key="i" :value="item.id">
|
|
528
|
+ <option
|
|
529
|
+ v-for="(item, i) in displayNotDeletedAgents"
|
|
530
|
+ :key="i"
|
|
531
|
+ :value="item.id"
|
|
532
|
+ >
|
488
|
533
|
<div>{{ item.name + " " + item.surname }}</div>
|
489
|
534
|
</option>
|
490
|
535
|
</select>
|
|
@@ -504,9 +549,13 @@
|
504
|
549
|
id="status"
|
505
|
550
|
v-model="weekParam.status.id"
|
506
|
551
|
>
|
507
|
|
- <option :key="status.id" :value="status.id" v-for="status in statusList">{{
|
508
|
|
- status.description
|
509
|
|
- }}</option>
|
|
552
|
+ <option
|
|
553
|
+ :key="status.id"
|
|
554
|
+ :value="status.id"
|
|
555
|
+ v-for="status in statusList"
|
|
556
|
+ >
|
|
557
|
+ {{ status.description }}
|
|
558
|
+ </option>
|
510
|
559
|
</select>
|
511
|
560
|
</float-label>
|
512
|
561
|
</div>
|
|
@@ -539,10 +588,14 @@
|
539
|
588
|
</div>
|
540
|
589
|
<div class="row">
|
541
|
590
|
<div class="text-center col-6">
|
542
|
|
- <button class="btn-solid-blue" v-on:click="saveEdit()">SAVE</button>
|
|
591
|
+ <button class="btn-solid-blue" v-on:click="saveEdit()">
|
|
592
|
+ SAVE
|
|
593
|
+ </button>
|
543
|
594
|
</div>
|
544
|
595
|
<div class="text-center col-6">
|
545
|
|
- <button class="btn-solid-blue" v-on:click="backToListView()">BACK</button>
|
|
596
|
+ <button class="btn-solid-blue" v-on:click="backToListView()">
|
|
597
|
+ BACK
|
|
598
|
+ </button>
|
546
|
599
|
</div>
|
547
|
600
|
</div>
|
548
|
601
|
</div>
|
|
@@ -575,8 +628,8 @@ export default {
|
575
|
628
|
props: {
|
576
|
629
|
weekParam: {},
|
577
|
630
|
weekId: {
|
578
|
|
- default: 0
|
579
|
|
- }
|
|
631
|
+ default: 0,
|
|
632
|
+ },
|
580
|
633
|
},
|
581
|
634
|
data() {
|
582
|
635
|
return {
|
|
@@ -596,12 +649,12 @@ export default {
|
596
|
649
|
depDateParam: {},
|
597
|
650
|
pubDateParam: {},
|
598
|
651
|
boolAwaitingPayment: false,
|
599
|
|
- selectedUser: ""
|
|
652
|
+ selectedUser: "",
|
600
|
653
|
};
|
601
|
654
|
},
|
602
|
655
|
components: {
|
603
|
656
|
addressAutoComplete,
|
604
|
|
- Alert
|
|
657
|
+ Alert,
|
605
|
658
|
},
|
606
|
659
|
async mounted() {
|
607
|
660
|
if (this.sellItem.id) {
|
|
@@ -625,11 +678,17 @@ export default {
|
625
|
678
|
this.selectedWeekType = this.weekParam.weekType;
|
626
|
679
|
this.selectedStatus = this.weekParam.status;
|
627
|
680
|
this.selectedPublish = this.weekParam.publish;
|
628
|
|
- var date = new Date(this.weekParam.arrivalDate).toISOString().substring(0, 10);
|
|
681
|
+ var date = new Date(this.weekParam.arrivalDate)
|
|
682
|
+ .toISOString()
|
|
683
|
+ .substring(0, 10);
|
629
|
684
|
this.dateParam = date;
|
630
|
|
- var depDate = new Date(this.weekParam.departureDate).toISOString().substring(0, 10);
|
|
685
|
+ var depDate = new Date(this.weekParam.departureDate)
|
|
686
|
+ .toISOString()
|
|
687
|
+ .substring(0, 10);
|
631
|
688
|
this.depDateParam = depDate;
|
632
|
|
- var datePub = new Date(this.weekParam.pulbishedDate).toISOString().substring(0, 10);
|
|
689
|
+ var datePub = new Date(this.weekParam.pulbishedDate)
|
|
690
|
+ .toISOString()
|
|
691
|
+ .substring(0, 10);
|
633
|
692
|
this.pubDateParam = datePub;
|
634
|
693
|
if (this.weekParam.status.description === "Awaiting Payment") {
|
635
|
694
|
if (this.ROLE !== "Super Admin") {
|
|
@@ -672,7 +731,7 @@ export default {
|
672
|
731
|
"sellItem",
|
673
|
732
|
"agencies",
|
674
|
733
|
"agents",
|
675
|
|
- "getTemplate"
|
|
734
|
+ "getTemplate",
|
676
|
735
|
]),
|
677
|
736
|
...mapGetters("nonRegIndividual", ["getIndiv"]),
|
678
|
737
|
...mapState("individual", ["indiv"]),
|
|
@@ -681,7 +740,7 @@ export default {
|
681
|
740
|
...mapState("status", ["statusList"]),
|
682
|
741
|
...mapGetters({
|
683
|
742
|
user: "authentication/getUser",
|
684
|
|
- person: "authentication/getPerson"
|
|
743
|
+ person: "authentication/getPerson",
|
685
|
744
|
}),
|
686
|
745
|
...mapState("bank", ["banks"]),
|
687
|
746
|
...mapState("register", ["individuals", "removeIndividual"]),
|
|
@@ -697,7 +756,7 @@ export default {
|
697
|
756
|
let list = [];
|
698
|
757
|
if (this.week && this.week.region && this.selectedRegion) {
|
699
|
758
|
const item = this.detailedRegion.find(
|
700
|
|
- region => region.region.regionCode === this.selectedRegion
|
|
759
|
+ (region) => region.region.regionCode === this.selectedRegion
|
701
|
760
|
);
|
702
|
761
|
if (item) {
|
703
|
762
|
list = item.children;
|
|
@@ -705,14 +764,14 @@ export default {
|
705
|
764
|
} else {
|
706
|
765
|
list = this.resorts;
|
707
|
766
|
}
|
708
|
|
- return _.sortBy(list, x => x.resortName);
|
|
767
|
+ return _.sortBy(list, (x) => x.resortName);
|
709
|
768
|
},
|
710
|
769
|
isLoggedIn() {
|
711
|
770
|
return this.user && this.person;
|
712
|
771
|
},
|
713
|
772
|
displayNotDeletedAgents() {
|
714
|
773
|
var notDeletedArr = [];
|
715
|
|
- this.agents.forEach(agent => {
|
|
774
|
+ this.agents.forEach((agent) => {
|
716
|
775
|
if (!agent.isDeleted) {
|
717
|
776
|
if (agent.agencyId === this.weekParam.agencyId) {
|
718
|
777
|
notDeletedArr.push(agent);
|
|
@@ -720,12 +779,17 @@ export default {
|
720
|
779
|
}
|
721
|
780
|
});
|
722
|
781
|
return notDeletedArr;
|
723
|
|
- }
|
|
782
|
+ },
|
724
|
783
|
},
|
725
|
784
|
methods: {
|
726
|
785
|
...mapActions("individual", ["getIndividual"]),
|
727
|
786
|
...mapActions("nonRegIndividual", ["retrieveNonRegIndiv"]),
|
728
|
|
- ...mapActions("timeshare", ["initTimeshare", "onResortChange", "saveWeek", "getBlankWeek"]),
|
|
787
|
+ ...mapActions("timeshare", [
|
|
788
|
+ "initTimeshare",
|
|
789
|
+ "onResortChange",
|
|
790
|
+ "saveWeek",
|
|
791
|
+ "getBlankWeek",
|
|
792
|
+ ]),
|
729
|
793
|
...mapActions("payment", ["addPayment"]),
|
730
|
794
|
...mapActions("bank", ["getBanks"]),
|
731
|
795
|
...mapActions("myWeeks", ["getItems", "getWeek", "editSave"]),
|
|
@@ -736,7 +800,7 @@ export default {
|
736
|
800
|
this.getBlankWeek();
|
737
|
801
|
},
|
738
|
802
|
updateCurrentUser() {
|
739
|
|
- this.individuals.forEach(indiv => {
|
|
803
|
+ this.individuals.forEach((indiv) => {
|
740
|
804
|
if (this.weekParam.ownerId === indiv.id) {
|
741
|
805
|
this.week.owner.name = indiv.name;
|
742
|
806
|
this.week.owner.surname = indiv.surname;
|
|
@@ -750,13 +814,13 @@ export default {
|
750
|
814
|
});
|
751
|
815
|
},
|
752
|
816
|
saveEdit() {
|
753
|
|
- this.regions.forEach(region => {
|
|
817
|
+ this.regions.forEach((region) => {
|
754
|
818
|
if (region.regionCode === this.selectedRegion) {
|
755
|
819
|
//console.log(region);
|
756
|
820
|
this.weekParam.regionId = region.id;
|
757
|
821
|
}
|
758
|
822
|
});
|
759
|
|
- this.resorts.forEach(resort => {
|
|
823
|
+ this.resorts.forEach((resort) => {
|
760
|
824
|
if (resort.resortCode === this.selectedResort) {
|
761
|
825
|
this.weekParam.resortCode = resort.resortCode;
|
762
|
826
|
this.weekParam.resortName = resort.resortName;
|
|
@@ -765,12 +829,12 @@ export default {
|
765
|
829
|
console.log(this.selectedSeason);
|
766
|
830
|
this.weekParam.season = this.selectedSeason;
|
767
|
831
|
|
768
|
|
- this.resortBedrooms.forEach(bedroom => {
|
|
832
|
+ this.resortBedrooms.forEach((bedroom) => {
|
769
|
833
|
if (bedroom === this.selectedBedrooms) {
|
770
|
834
|
this.weekParam.bedroom = bedroom;
|
771
|
835
|
}
|
772
|
836
|
});
|
773
|
|
- this.maxSleep.forEach(sleepMax => {
|
|
837
|
+ this.maxSleep.forEach((sleepMax) => {
|
774
|
838
|
if (sleepMax === this.selectedMaxSleep) {
|
775
|
839
|
this.weekParam.maxSleep = sleepMax;
|
776
|
840
|
}
|
|
@@ -781,11 +845,17 @@ export default {
|
781
|
845
|
if (this.week.owner.telephone === "") {
|
782
|
846
|
delete this.week.owner.telephone;
|
783
|
847
|
}
|
784
|
|
- this.weekParam.arrivalDate = new Date(this.dateParam).toISOString().substring(0, 10);
|
785
|
|
- this.weekParam.departureDate = new Date(this.depDateParam).toISOString().substring(0, 10);
|
|
848
|
+ this.weekParam.arrivalDate = new Date(this.dateParam)
|
|
849
|
+ .toISOString()
|
|
850
|
+ .substring(0, 10);
|
|
851
|
+ this.weekParam.departureDate = new Date(this.depDateParam)
|
|
852
|
+ .toISOString()
|
|
853
|
+ .substring(0, 10);
|
786
|
854
|
//console.log(this.pubDateParam);
|
787
|
855
|
if (this.pubDateParam) {
|
788
|
|
- this.weekParam.pulbishedDate = new Date(this.pubDateParam).toISOString().substring(0, 19);
|
|
856
|
+ this.weekParam.pulbishedDate = new Date(this.pubDateParam)
|
|
857
|
+ .toISOString()
|
|
858
|
+ .substring(0, 19);
|
789
|
859
|
}
|
790
|
860
|
this.weekParam.owner = this.week.owner;
|
791
|
861
|
this.weekParam.askingPrice = this.week.askingPrice;
|
|
@@ -808,7 +878,7 @@ export default {
|
808
|
878
|
resortChange() {
|
809
|
879
|
this.onResortChange({
|
810
|
880
|
resortName: this.week.resort.resortName,
|
811
|
|
- resortCode: this.week.resort.resortCode
|
|
881
|
+ resortCode: this.week.resort.resortCode,
|
812
|
882
|
});
|
813
|
883
|
|
814
|
884
|
if (this.week && this.week.resort === "Other") {
|
|
@@ -834,20 +904,20 @@ export default {
|
834
|
904
|
creatydById: Log.getUser().id, //Log.getUser().id,
|
835
|
905
|
amount: amount,
|
836
|
906
|
paymentStatus: "",
|
837
|
|
- paymentToken: ""
|
|
907
|
+ paymentToken: "",
|
838
|
908
|
};
|
839
|
909
|
|
840
|
|
- this.addPayment(paymentObj).then(res => {
|
|
910
|
+ this.addPayment(paymentObj).then((res) => {
|
841
|
911
|
this.$router.push({
|
842
|
912
|
name: "PaymentGateway",
|
843
|
913
|
params: {
|
844
|
914
|
paymentReqId: res.PAY_REQUEST_ID,
|
845
|
|
- checksum: res.CHECKSUM
|
846
|
|
- }
|
|
915
|
+ checksum: res.CHECKSUM,
|
|
916
|
+ },
|
847
|
917
|
});
|
848
|
918
|
});
|
849
|
|
- }
|
850
|
|
- }
|
|
919
|
+ },
|
|
920
|
+ },
|
851
|
921
|
};
|
852
|
922
|
</script>
|
853
|
923
|
|