Selaa lähdekoodia

fix: master test-transaction

Muhammad Iqbal Afandi 3 vuotta sitten
vanhempi
commit
1b0a2e6c38

+ 2
- 2
app/Http/Controllers/TestTransactionController.php Näytä tiedosto

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

+ 18
- 6
public/js/resources_js_pages_test-transaction_Create_vue.js Näytä tiedosto

@@ -650,22 +650,32 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
650 650
     data: Object,
651 651
     dataCount: Number,
652 652
     typeVehicles: Object,
653
-    entryTransactions: Object,
653
+    entryTransactionData: Object,
654 654
     entryTransactionCount: Number
655 655
   },
656 656
   setup: function setup(__props, _ref) {
657 657
     var expose = _ref.expose;
658 658
     expose();
659 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 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 676
     var copy = function copy(data) {
667 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 679
         localEntryTransactionDeleted.push(data.transactionNumber);
670 680
         return val.entryTransactionId !== data.transactionNumber;
671 681
       });
@@ -688,10 +698,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
688 698
       props: props,
689 699
       localEntryTransactions: localEntryTransactions,
690 700
       localEntryTransactionDeleted: localEntryTransactionDeleted,
701
+      setLocalEntryTransaction: setLocalEntryTransaction,
691 702
       copy: copy,
692 703
       form: form,
693 704
       submit: submit,
694 705
       reactive: vue__WEBPACK_IMPORTED_MODULE_0__.reactive,
706
+      watch: vue__WEBPACK_IMPORTED_MODULE_0__.watch,
695 707
       onMounted: vue__WEBPACK_IMPORTED_MODULE_0__.onMounted,
696 708
       useForm: _inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_1__.useForm,
697 709
       AppInputText: _components_AppInputText_vue__WEBPACK_IMPORTED_MODULE_2__["default"],
@@ -1639,7 +1651,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
1639 1651
       }, 8
1640 1652
       /* PROPS */
1641 1653
       , ["value"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppPagination"], {
1642
-        links: $props.entryTransactions.links
1654
+        links: $props.entryTransactionData.links
1643 1655
       }, null, 8
1644 1656
       /* PROPS */
1645 1657
       , ["links"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Divider, {

+ 18
- 6
public/js/resources_js_pages_test-transaction_Out_vue.js Näytä tiedosto

@@ -230,22 +230,32 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
230 230
     data: Object,
231 231
     dataCount: Number,
232 232
     typeVehicles: Object,
233
-    entryTransactions: Object,
233
+    entryTransactionData: Object,
234 234
     entryTransactionCount: Number
235 235
   },
236 236
   setup: function setup(__props, _ref) {
237 237
     var expose = _ref.expose;
238 238
     expose();
239 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 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 256
     var copy = function copy(data) {
247 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 259
         localEntryTransactionDeleted.push(data.transactionNumber);
250 260
         return val.entryTransactionId !== data.transactionNumber;
251 261
       });
@@ -268,10 +278,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
268 278
       props: props,
269 279
       localEntryTransactions: localEntryTransactions,
270 280
       localEntryTransactionDeleted: localEntryTransactionDeleted,
281
+      setLocalEntryTransaction: setLocalEntryTransaction,
271 282
       copy: copy,
272 283
       form: form,
273 284
       submit: submit,
274 285
       reactive: vue__WEBPACK_IMPORTED_MODULE_0__.reactive,
286
+      watch: vue__WEBPACK_IMPORTED_MODULE_0__.watch,
275 287
       onMounted: vue__WEBPACK_IMPORTED_MODULE_0__.onMounted,
276 288
       useForm: _inertiajs_inertia_vue3__WEBPACK_IMPORTED_MODULE_1__.useForm,
277 289
       AppInputText: _components_AppInputText_vue__WEBPACK_IMPORTED_MODULE_2__["default"],
@@ -585,7 +597,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
585 597
       }, 8
586 598
       /* PROPS */
587 599
       , ["value"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)($setup["AppPagination"], {
588
-        links: $props.entryTransactions.links
600
+        links: $props.entryTransactionData.links
589 601
       }, null, 8
590 602
       /* PROPS */
591 603
       , ["links"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_Divider, {

+ 20
- 7
resources/js/pages/test-transaction/Out.vue Näytä tiedosto

@@ -1,5 +1,5 @@
1 1
 <script setup>
2
-import { reactive, onMounted } from 'vue'
2
+import { reactive, watch, onMounted } from 'vue'
3 3
 import { useForm } from '@inertiajs/inertia-vue3'
4 4
 import AppInputText from '@/components/AppInputText.vue'
5 5
 import AppDropdown from '@/components/AppDropdown.vue'
@@ -11,21 +11,34 @@ const props = defineProps({
11 11
   data: Object,
12 12
   dataCount: Number,
13 13
   typeVehicles: Object,
14
-  entryTransactions: Object,
14
+  entryTransactionData: Object,
15 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 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 38
 const copy = (data) => {
26 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 42
     localEntryTransactionDeleted.push(data.transactionNumber)
30 43
 
31 44
     return val.entryTransactionId !== data.transactionNumber
@@ -70,7 +83,7 @@ const submit = () => {
70 83
         </Column>
71 84
       </DataTable>
72 85
 
73
-      <AppPagination :links="entryTransactions.links" />
86
+      <AppPagination :links="entryTransactionData.links" />
74 87
 
75 88
       <Divider type="dashed" />
76 89