Merge branch 'main' of github.com:inikoo/aiku

inikoo · Feb 5, 2025 · 5196606 · 5196606
2 parents d18d719 + 6df099f
commit 5196606
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 23 deletions.
diff --git a/app/Actions/Billables/Service/UI/EditService.php b/app/Actions/Billables/Service/UI/EditService.php
@@ -64,10 +64,10 @@ public function htmlResponse(Service $service, ActionRequest $request): Response
 
         if ($service->edit_type == ServiceEditTypeEnum::QUANTITY) {
             $fixedPrice = true;
-            $disableNet = true;
+            $disableNet = false;
         } elseif ($service->edit_type == ServiceEditTypeEnum::NET) {
             $fixedPrice = false;
-            $disableNet = false;
+            $disableNet = true;
         }
 
         if ($service->status == false || $service->state == ServiceStateEnum::DISCONTINUED) {

diff --git a/app/Actions/Fulfilment/FulfilmentTransaction/UpdateFulfilmentTransaction.php b/app/Actions/Fulfilment/FulfilmentTransaction/UpdateFulfilmentTransaction.php
@@ -8,6 +8,7 @@
 
 namespace App\Actions\Fulfilment\FulfilmentTransaction;
 
+use App\Actions\Fulfilment\RecurringBillTransaction\UpdateRecurringBillTransaction;
 use App\Actions\OrgAction;
 use App\Actions\Traits\WithActionUpdate;
 use App\Models\Fulfilment\FulfilmentTransaction;
@@ -18,7 +19,8 @@ class UpdateFulfilmentTransaction extends OrgAction
 {
     use WithActionUpdate;
 
-    public function handle(FulfilmentTransaction $fulfilmentTransaction, array $modelData): FulfilmentTransaction
+
+    public function handle(FulfilmentTransaction $fulfilmentTransaction, array $modelData, bool $isRecurringBillTransactionUpdated = false): FulfilmentTransaction
     {
         if (Arr::exists($modelData, 'net_amount')) {
             $netAmount = Arr::get($modelData, 'net_amount');
@@ -28,7 +30,13 @@ public function handle(FulfilmentTransaction $fulfilmentTransaction, array $mode
             $fulfilmentTransaction->refresh();
             $netAmount = $fulfilmentTransaction->asset->price * $fulfilmentTransaction->quantity;
         }
-        $fulfilmentTransaction =  $this->update($fulfilmentTransaction, $modelData, ['data']);
+
+        $fulfilmentTransaction = $this->update($fulfilmentTransaction, $modelData, ['data']);
+
+        if ($fulfilmentTransaction->recurringBillTransaction && !$isRecurringBillTransactionUpdated) {
+            UpdateRecurringBillTransaction::make()->action($fulfilmentTransaction->recurringBillTransaction, $modelData, true);
+        }
+
         $this->update(
             $fulfilmentTransaction,
             [
@@ -38,13 +46,13 @@ public function handle(FulfilmentTransaction $fulfilmentTransaction, array $mode
                 'org_net_amount' => $netAmount * $fulfilmentTransaction->org_exchange
             ]
         );
-
+    
         $fulfilmentTransaction->refresh();
-
+    
         if (!Arr::exists($modelData, 'net_amount')) {
             SetClausesInFulfilmentTransaction::run($fulfilmentTransaction);
         }
-
+    
         return $fulfilmentTransaction;
     }
     public function rules(): array
@@ -69,13 +77,12 @@ public function asController(FulfilmentTransaction $fulfilmentTransaction, Actio
         $this->handle($fulfilmentTransaction, $this->validatedData);
     }
 
-    public function action(FulfilmentTransaction $palletDeliveryTransaction, array $modelData): FulfilmentTransaction
+    public function action(FulfilmentTransaction $palletDeliveryTransaction, array $modelData, bool $isRecurringBillTransactionUpdated = false): FulfilmentTransaction
     {
 
         $this->asAction       = true;
         $this->initialisationFromFulfilment($palletDeliveryTransaction->fulfilment, $modelData);
 
-        return $this->handle($palletDeliveryTransaction, $this->validatedData);
+        return $this->handle($palletDeliveryTransaction, $this->validatedData, $isRecurringBillTransactionUpdated);
     }
-
 }
diff --git a/app/Actions/Fulfilment/RecurringBillTransaction/UpdateRecurringBillTransaction.php b/app/Actions/Fulfilment/RecurringBillTransaction/UpdateRecurringBillTransaction.php
@@ -8,6 +8,7 @@
 
 namespace App\Actions\Fulfilment\RecurringBillTransaction;
 
+use App\Actions\Fulfilment\FulfilmentTransaction\UpdateFulfilmentTransaction;
 use App\Actions\Fulfilment\RecurringBill\CalculateRecurringBillTotals;
 use App\Actions\OrgAction;
 use App\Actions\Traits\WithActionUpdate;
@@ -19,25 +20,29 @@ class UpdateRecurringBillTransaction extends OrgAction
 {
     use WithActionUpdate;
 
-    public function handle(RecurringBillTransaction $recurringBillTransaction, array $modelData): RecurringBillTransaction
+    public function handle(RecurringBillTransaction $recurringBillTransaction, array $modelData, bool $isFulfilmentTransactionUpdated = false): RecurringBillTransaction
     {
         if (Arr::exists($modelData, 'net_amount')) {
             $netAmount = Arr::get($modelData, 'net_amount');
             $quantity = $netAmount / $recurringBillTransaction->unit_cost;
             data_set($modelData, 'quantity', $quantity);
         }
-
+    
         $recurringBillTransaction = $this->update($recurringBillTransaction, $modelData, ['data']);
-
+
+        if ($recurringBillTransaction->fulfilmentTransaction && !$isFulfilmentTransactionUpdated) {
+            UpdateFulfilmentTransaction::make()->action($recurringBillTransaction->fulfilmentTransaction, $modelData, true);
+        }
+
         if (!Arr::exists($modelData, 'net_amount')) {
             $recurringBillTransaction = CalculateRecurringBillTransactionDiscountPercentage::make()->action($recurringBillTransaction, $this->hydratorsDelay);
             $recurringBillTransaction = CalculateRecurringBillTransactionTemporalQuantity::make()->action($recurringBillTransaction);
             $recurringBillTransaction = CalculateRecurringBillTransactionAmounts::make()->action($recurringBillTransaction);
             $recurringBillTransaction = CalculateRecurringBillTransactionCurrencyExchangeRates::make()->action($recurringBillTransaction);
         }
-
+    
         CalculateRecurringBillTotals::run($recurringBillTransaction->recurringBill);
-
+    
         return $recurringBillTransaction;
     }
 
@@ -58,12 +63,12 @@ public function asController(RecurringBillTransaction $recurringBillTransaction,
         $this->handle($recurringBillTransaction, $this->validatedData);
     }
 
-    public function action(RecurringBillTransaction $recurringBillTransaction, array $modelData): RecurringBillTransaction
+    public function action(RecurringBillTransaction $recurringBillTransaction, array $modelData, bool $isFulfilmentTransactionUpdated = false): RecurringBillTransaction
     {
         $this->asAction = true;
         $this->initialisationFromFulfilment($recurringBillTransaction->fulfilment, $modelData);
 
-        return $this->handle($recurringBillTransaction, $this->validatedData);
+        return $this->handle($recurringBillTransaction, $this->validatedData, $isFulfilmentTransactionUpdated);
     }
 
 }
diff --git a/app/Actions/Fulfilment/RentalAgreement/UI/EditRentalAgreement.php b/app/Actions/Fulfilment/RentalAgreement/UI/EditRentalAgreement.php
@@ -132,7 +132,7 @@ public function handle(RentalAgreement $rentalAgreement, ActionRequest $request)
                                                 'parameters' => [
                                                     'organisation' => $this->organisation->slug,
                                                     'fulfilment'   => $this->fulfilment->slug,
-                                                    'section'      => '3'
+                                                    'section'      => '4'
 
                                                 ]
                                             ]

diff --git a/app/InertiaTable/InertiaTable.php b/app/InertiaTable/InertiaTable.php
@@ -104,7 +104,7 @@ public function pageName(string $pageName): self
 
     public function betweenDates(array $betweenDates): self
     {
-        $this->betweenDates = array_merge(['created_at', 'updated_at'], $betweenDates);
+        $this->betweenDates = $betweenDates;
 
         return $this;
     }

diff --git a/app/Models/Fulfilment/FulfilmentTransaction.php b/app/Models/Fulfilment/FulfilmentTransaction.php
@@ -15,6 +15,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
@@ -99,4 +100,9 @@ public function fulfilmentCustomer(): BelongsTo
     {
         return $this->belongsTo(FulfilmentCustomer::class);
     }
+
+    public function recurringBillTransaction(): HasOne
+    {
+        return $this->hasOne(RecurringBillTransaction::class);
+    }
 }
diff --git a/resources/js/Components/Forms/Fields/ImageCropSquare.vue b/resources/js/Components/Forms/Fields/ImageCropSquare.vue
@@ -98,7 +98,7 @@ watch(isOpenModalCrop, (value) => {
 </script>
 
 <template>
-    <div class="w-fit">      
+    <div class="w-fit min-w-32">      
         <Modal :isOpen="isOpenModalCrop" @close="isOpenModalCrop = false" width="max-w-xl w-full" :zIndex="999">
             <div class="w-full h-[300px] relative bg-gray-700">
                 <Cropper
@@ -127,7 +127,7 @@ watch(isOpenModalCrop, (value) => {
         </Modal>
 
         <!-- Avatar Button: Large view -->
-        <div class="bg-gray-100 relative overflow-hidden h-40 w-auto aspect-ratio rounded lg:inline-block ring-1 ring-gray-500 shadow"
+        <div class="bg-gray-100 relative overflow-hidden h-40 min-w-32 w-auto aspect-ratio rounded lg:inline-block ring-1 ring-gray-500 shadow"
             :class="form.errors[fieldName] ? 'errorShake' : ''"
         >
             <Image class="h-full rounded" :src="imgAfterCrop" alt="" />

diff --git a/resources/js/Components/Tables/Grp/Org/Fulfilment/TableFulfilmentTransactions.vue b/resources/js/Components/Tables/Grp/Org/Fulfilment/TableFulfilmentTransactions.vue
@@ -133,7 +133,8 @@ const userCanEdit = (item) => {
 					<NumberWithButtonSave v-model="item.quantity"   @onSave="(e)=>onUpdateQuantity(item.id, e)"/>
 				</div>
 				<div v-else>
-					<Transition name="spin-to-right"><span :key="item.quantity">{{ locale.number(item.quantity) }} {{ item.asset_unit }}</span></Transition>
+					<!-- <Transition name="spin-to-right"><span :key="item.quantity">{{ locale.number(item.quantity) }} {{ item.asset_unit }}</span></Transition> -->
+
 				</div>
 			</div>
 		</template>

diff --git a/resources/js/Pages/Grp/Org/Fulfilment/RecurringBillTransactions.vue b/resources/js/Pages/Grp/Org/Fulfilment/RecurringBillTransactions.vue
@@ -119,7 +119,7 @@ const locale = inject('locale', aikuLocaleStructure)
 					<NumberWithButtonSave v-model="item.quantity"   @onSave="(e)=>onUpdateQuantity(item.id,item.fulfilment_transaction_id, e)"/>
 				</div>
 				<div v-else>
-					<Transition name="spin-to-right"><span :key="item.quantity">{{ locale.number(item.quantity) }} {{ item.asset_unit }}</span></Transition>
+					<!-- <Transition name="spin-to-right"><span :key="item.quantity">{{ locale.number(item.quantity) }} {{ item.asset_unit }}</span></Transition> -->
 				</div>
 			</div>
 		</template>