Pārlūkot izejas kodu

fix: master test-transaction

Muhammad Iqbal Afandi 3 gadus atpakaļ
vecāks
revīzija
1b0a2e6c38

+ 2
- 2
app/Http/Controllers/TestTransactionController.php Parādīt failu

42
 
42
 
43
         $entryTransactionCount = EntryTransaction::get()->count();
43
         $entryTransactionCount = EntryTransaction::get()->count();
44
 
44
 
45
-        $outTransaction = OutTransaction::latest()
45
+        $outTransactions = OutTransaction::latest()
46
             ->paginate(5)
46
             ->paginate(5)
47
             ->withQueryString()
47
             ->withQueryString()
48
             ->through(fn($transactionOut) => [
48
             ->through(fn($transactionOut) => [
61
         return inertia('test-transaction/Create.vue', compact([
61
         return inertia('test-transaction/Create.vue', compact([
62
             'entryTransactions',
62
             'entryTransactions',
63
             'entryTransactionCount',
63
             'entryTransactionCount',
64
-            'outTransaction',
64
+            'outTransactions',
65
             'outTransactionCount',
65
             'outTransactionCount',
66
             'typeVehicles',
66
             'typeVehicles',
67
         ]));
67
         ]));

+ 18
- 6
public/js/resources_js_pages_test-transaction_Create_vue.js Parādīt failu

650
     data: Object,
650
     data: Object,
651
     dataCount: Number,
651
     dataCount: Number,
652
     typeVehicles: Object,
652
     typeVehicles: Object,
653
-    entryTransactions: Object,
653
+    entryTransactionData: Object,
654
     entryTransactionCount: Number
654
     entryTransactionCount: Number
655
   },
655
   },
656
   setup: function setup(__props, _ref) {
656
   setup: function setup(__props, _ref) {
657
     var expose = _ref.expose;
657
     var expose = _ref.expose;
658
     expose();
658
     expose();
659
     var props = __props;
659
     var props = __props;
660
-    var localEntryTransactions = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
661
-    var localEntryTransactionDeleted = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
660
+    (0,vue__WEBPACK_IMPORTED_MODULE_0__.watch)(function () {
661
+      return props.entryTransactionData;
662
+    }, function () {
663
+      setLocalEntryTransaction();
664
+    });
662
     (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
665
     (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
663
-      localEntryTransactions.push.apply(localEntryTransactions, _toConsumableArray(props.entryTransactions.data));
666
+      setLocalEntryTransaction();
664
     });
667
     });
668
+    var localEntryTransactions = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
669
+    var localEntryTransactionDeleted = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
670
+
671
+    var setLocalEntryTransaction = function setLocalEntryTransaction() {
672
+      localEntryTransactions.splice(0);
673
+      localEntryTransactions.push.apply(localEntryTransactions, _toConsumableArray(props.entryTransactionData.data));
674
+    };
665
 
675
 
666
     var copy = function copy(data) {
676
     var copy = function copy(data) {
667
       form.entry_transaction_id = data.transactionNumber;
677
       form.entry_transaction_id = data.transactionNumber;
668
-      var filterLocalEntryTransactions = props.entryTransactions.data.filter(function (val) {
678
+      var filterLocalEntryTransactions = props.entryTransactionData.data.filter(function (val) {
669
         localEntryTransactionDeleted.push(data.transactionNumber);
679
         localEntryTransactionDeleted.push(data.transactionNumber);
670
         return val.entryTransactionId !== data.transactionNumber;
680
         return val.entryTransactionId !== data.transactionNumber;
671
       });
681
       });
688
       props: props,
698
       props: props,
689
       localEntryTransactions: localEntryTransactions,
699
       localEntryTransactions: localEntryTransactions,
690
       localEntryTransactionDeleted: localEntryTransactionDeleted,
700
       localEntryTransactionDeleted: localEntryTransactionDeleted,
701
+      setLocalEntryTransaction: setLocalEntryTransaction,
691
       copy: copy,
702
       copy: copy,
692
       form: form,
703
       form: form,
693
       submit: submit,
704
       submit: submit,
694
       reactive: vue__WEBPACK_IMPORTED_MODULE_0__.reactive,
705
       reactive: vue__WEBPACK_IMPORTED_MODULE_0__.reactive,
706
+      watch: vue__WEBPACK_IMPORTED_MODULE_0__.watch,
695
       onMounted: vue__WEBPACK_IMPORTED_MODULE_0__.onMounted,
707
       onMounted: vue__WEBPACK_IMPORTED_MODULE_0__.onMounted,
696
       useForm: _inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_1__.useForm,
708
       useForm: _inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_1__.useForm,
697
       AppInputText: _components_AppInputText_vue__WEBPACK_IMPORTED_MODULE_2__["default"],
709
       AppInputText: _components_AppInputText_vue__WEBPACK_IMPORTED_MODULE_2__["default"],
1639
       }, 8
1651
       }, 8
1640
       /* PROPS */
1652
       /* PROPS */
1641
       , ["value"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppPagination"], {
1653
       , ["value"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppPagination"], {
1642
-        links: $props.entryTransactions.links
1654
+        links: $props.entryTransactionData.links
1643
       }, null, 8
1655
       }, null, 8
1644
       /* PROPS */
1656
       /* PROPS */
1645
       , ["links"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Divider, {
1657
       , ["links"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Divider, {

+ 18
- 6
public/js/resources_js_pages_test-transaction_Out_vue.js Parādīt failu

230
     data: Object,
230
     data: Object,
231
     dataCount: Number,
231
     dataCount: Number,
232
     typeVehicles: Object,
232
     typeVehicles: Object,
233
-    entryTransactions: Object,
233
+    entryTransactionData: Object,
234
     entryTransactionCount: Number
234
     entryTransactionCount: Number
235
   },
235
   },
236
   setup: function setup(__props, _ref) {
236
   setup: function setup(__props, _ref) {
237
     var expose = _ref.expose;
237
     var expose = _ref.expose;
238
     expose();
238
     expose();
239
     var props = __props;
239
     var props = __props;
240
-    var localEntryTransactions = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
241
-    var localEntryTransactionDeleted = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
240
+    (0,vue__WEBPACK_IMPORTED_MODULE_0__.watch)(function () {
241
+      return props.entryTransactionData;
242
+    }, function () {
243
+      setLocalEntryTransaction();
244
+    });
242
     (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
245
     (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
243
-      localEntryTransactions.push.apply(localEntryTransactions, _toConsumableArray(props.entryTransactions.data));
246
+      setLocalEntryTransaction();
244
     });
247
     });
248
+    var localEntryTransactions = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
249
+    var localEntryTransactionDeleted = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
250
+
251
+    var setLocalEntryTransaction = function setLocalEntryTransaction() {
252
+      localEntryTransactions.splice(0);
253
+      localEntryTransactions.push.apply(localEntryTransactions, _toConsumableArray(props.entryTransactionData.data));
254
+    };
245
 
255
 
246
     var copy = function copy(data) {
256
     var copy = function copy(data) {
247
       form.entry_transaction_id = data.transactionNumber;
257
       form.entry_transaction_id = data.transactionNumber;
248
-      var filterLocalEntryTransactions = props.entryTransactions.data.filter(function (val) {
258
+      var filterLocalEntryTransactions = props.entryTransactionData.data.filter(function (val) {
249
         localEntryTransactionDeleted.push(data.transactionNumber);
259
         localEntryTransactionDeleted.push(data.transactionNumber);
250
         return val.entryTransactionId !== data.transactionNumber;
260
         return val.entryTransactionId !== data.transactionNumber;
251
       });
261
       });
268
       props: props,
278
       props: props,
269
       localEntryTransactions: localEntryTransactions,
279
       localEntryTransactions: localEntryTransactions,
270
       localEntryTransactionDeleted: localEntryTransactionDeleted,
280
       localEntryTransactionDeleted: localEntryTransactionDeleted,
281
+      setLocalEntryTransaction: setLocalEntryTransaction,
271
       copy: copy,
282
       copy: copy,
272
       form: form,
283
       form: form,
273
       submit: submit,
284
       submit: submit,
274
       reactive: vue__WEBPACK_IMPORTED_MODULE_0__.reactive,
285
       reactive: vue__WEBPACK_IMPORTED_MODULE_0__.reactive,
286
+      watch: vue__WEBPACK_IMPORTED_MODULE_0__.watch,
275
       onMounted: vue__WEBPACK_IMPORTED_MODULE_0__.onMounted,
287
       onMounted: vue__WEBPACK_IMPORTED_MODULE_0__.onMounted,
276
       useForm: _inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_1__.useForm,
288
       useForm: _inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_1__.useForm,
277
       AppInputText: _components_AppInputText_vue__WEBPACK_IMPORTED_MODULE_2__["default"],
289
       AppInputText: _components_AppInputText_vue__WEBPACK_IMPORTED_MODULE_2__["default"],
585
       }, 8
597
       }, 8
586
       /* PROPS */
598
       /* PROPS */
587
       , ["value"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppPagination"], {
599
       , ["value"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppPagination"], {
588
-        links: $props.entryTransactions.links
600
+        links: $props.entryTransactionData.links
589
       }, null, 8
601
       }, null, 8
590
       /* PROPS */
602
       /* PROPS */
591
       , ["links"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Divider, {
603
       , ["links"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Divider, {

+ 20
- 7
resources/js/pages/test-transaction/Out.vue Parādīt failu

1
 <script setup>
1
 <script setup>
2
-import { reactive, onMounted } from 'vue'
2
+import { reactive, watch, onMounted } from 'vue'
3
 import { useForm } from '@inertiajs/inertia-vue3'
3
 import { useForm } from '@inertiajs/inertia-vue3'
4
 import AppInputText from '@/components/AppInputText.vue'
4
 import AppInputText from '@/components/AppInputText.vue'
5
 import AppDropdown from '@/components/AppDropdown.vue'
5
 import AppDropdown from '@/components/AppDropdown.vue'
11
   data: Object,
11
   data: Object,
12
   dataCount: Number,
12
   dataCount: Number,
13
   typeVehicles: Object,
13
   typeVehicles: Object,
14
-  entryTransactions: Object,
14
+  entryTransactionData: Object,
15
   entryTransactionCount: Number,
15
   entryTransactionCount: Number,
16
 })
16
 })
17
 
17
 
18
-const localEntryTransactions = reactive([])
19
-const localEntryTransactionDeleted = reactive([])
18
+watch(
19
+  () => props.entryTransactionData,
20
+  () => {
21
+    setLocalEntryTransaction()
22
+  }
23
+)
20
 
24
 
21
 onMounted(() => {
25
 onMounted(() => {
22
-  localEntryTransactions.push(...props.entryTransactions.data)
26
+  setLocalEntryTransaction()
23
 })
27
 })
24
 
28
 
29
+const localEntryTransactions = reactive([])
30
+
31
+const localEntryTransactionDeleted = reactive([])
32
+
33
+const setLocalEntryTransaction = () => {
34
+  localEntryTransactions.splice(0)
35
+  localEntryTransactions.push(...props.entryTransactionData.data)
36
+}
37
+
25
 const copy = (data) => {
38
 const copy = (data) => {
26
   form.entry_transaction_id = data.transactionNumber
39
   form.entry_transaction_id = data.transactionNumber
27
 
40
 
28
-  const filterLocalEntryTransactions = props.entryTransactions.data.filter((val) => {
41
+  const filterLocalEntryTransactions = props.entryTransactionData.data.filter((val) => {
29
     localEntryTransactionDeleted.push(data.transactionNumber)
42
     localEntryTransactionDeleted.push(data.transactionNumber)
30
 
43
 
31
     return val.entryTransactionId !== data.transactionNumber
44
     return val.entryTransactionId !== data.transactionNumber
70
         </Column>
83
         </Column>
71
       </DataTable>
84
       </DataTable>
72
 
85
 
73
-      <AppPagination :links="entryTransactions.links" />
86
+      <AppPagination :links="entryTransactionData.links" />
74
 
87
 
75
       <Divider type="dashed" />
88
       <Divider type="dashed" />
76
 
89