fix wrong decimal round off

Data patch for storage invoice

See merge request CIEFWorldwideSdnBhd/shipping-portal!235

app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php

@@ -36,6 +36,8 @@ use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 class CreateCustomerLogic extends AbstractControllerLogic
 {
@@ -167,6 +169,19 @@ class CreateCustomerLogic extends AbstractControllerLogic
             CreatePerfexCRMCustomer::dispatch($createLeadPerfexCRMObject);
         }
 
+        if(app()->environment(['production'])){
+            // call wac webhook
+            $url = config('wagWebhookUrl.account_registration_url');
+            $payload = [
+                'name'     => $request->input('name'),
+                'email'    => $request->input('email'),
+                'phone'    => $request->input('phone'),
+                'portal'   => 'izyim'
+            ];
+            $response = Http::post($url, $payload);
+            Log::channel('wac_webhook')->info('Register Account: ' . json_encode($response));
+        }
+
 //        $this->generateEmailVerificationAttemptProcessor->execute($user);
 
         return $this->response($this->authenticationProcessor->execute($request));

app/Classes/Modules/Exports/Services/ExportsAgingList.php

@@ -24,8 +24,8 @@ class ExportsAgingList implements WithHeadings, WithHeadingRow, WithMapping, Sho
     {
         $this->filters = [
             "has_invoice_status_in"                 => [2],
-            "packing_list_ordered_by_invoice_date"  => true,
-            "with_aging_column"                     => true
+            // "packing_list_ordered_by_invoice_date"  => true,
+            // "with_aging_column"                     => true
         ];
     }
 

app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php

@@ -156,7 +156,7 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
                 $detail->quantity,
                 $detail->price,
                 floatval($detail->tax_percentage) > 0 ? 'SV-6' : '',
-                floatval($detail->tax_percentage) > 0 ? $detail->amount : '0',
+                floatval($detail->tax_percentage) > 0 ? number_format($detail->amount, 2) : '0.00',
                 $detail->tax_percentage,
             ];
 

app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php

@@ -34,6 +34,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
+use Illuminate\Support\Facades\Http;
 
 class CreateInvoiceTransactionProcessor
 {
@@ -74,6 +75,18 @@ class CreateInvoiceTransactionProcessor
      */
     public function execute(PackingList $packingList)
     {
+        $ori_packing_list = $packingList;
+        // call wac webhook
+        $hasInvoiceCreated = Transaction::withTrashed()
+            ->where('type', TransactionType::SHIPPING_INVOICE)
+            ->where('owner_type', PackingList::class)
+            ->where('owner_id', $ori_packing_list->id)
+            ->exists();
+        
+        if ($hasInvoiceCreated) {
+            Log::channel('wac_webhook')->info('Regenerating Invoice for PackingList: ' . $ori_packing_list->id . '. No call wac api.');
+        }
+        
         $packing_list = PackingList::where('reference', $packingList->reference)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
 
         $billable_packing_list = $packing_list->packingLists()->first();
@@ -238,6 +251,32 @@ class CreateInvoiceTransactionProcessor
 
             $this->createsTransactionDetail->execute($invoice_transaction, $object_detail);
         }
+        
+        if (app()->environment('production') && !$hasInvoiceCreated) {
+            $order = $ori_packing_list->owner;
+            $companyModule = $order->companyModule;
+            $company = $companyModule->company;
+            $companyContact = $company->contacts()->first();
+            $employee = $companyModule->employees()->first();
+
+            $invoiceCount = Transaction::where('type', TransactionType::SHIPPING_INVOICE)
+                ->where('receiver', $companyModule->id)
+                ->where('status', ApprovalStatus::APPROVED)
+                ->count();
+
+            $payload = [
+                'name' => $employee->name,
+                'email' => $employee->email,
+                'phone' => $companyContact->phone,
+                'order_reference' => $order->reference,
+                'portal' => 'izyim',
+                'invoice_count' => $invoiceCount,
+            ];
+
+            Log::channel('wac_webhook')->info('Attempt to send wac_webhook - Invoice Created: ' . json_encode($payload));
+            $response = Http::post(config('wagWebhookUrl.invoice_created_url'), $payload);
+            Log::channel('wac_webhook')->info('Invoice Created: ' . json_encode($response));
+        }
 
         return;
     }

app/Classes/Modules/Wac/ControllersLogic/RegisterExchangeEmailLogic.php

@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Classes\Modules\Wac\ControllersLogic;
+
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\HelpMenu\Standards\Rules\CanFetchHelpMenuQuestion;
+use App\Classes\Modules\HelpMenu\Processors\FetchFirstQuestionQAProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Http\Resources\HelpMenuQuestionResource;
+use App\Models\User;
+use ErrorException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class RegisterExchangeEmailLogic extends AbstractControllerLogic
+{
+
+    /** 
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Register Exchange Email',
+            'message' => 'You have successfully registered an exchange email address'
+        ];
+    }
+
+    /** @var AssignEmployeeProcessor */
+    private $assignEmployeeProcessor;
+
+    /** @var CreatesUser */
+    private $createsUser;
+
+    /**
+     * RegisterEmailLogic constructor.
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     */
+    public function __construct(AssignEmployeeProcessor $assignEmployeeProcessor, CreatesUser $createsUser)
+    {
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->createsUser = $createsUser;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws ErrorException
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        // Validate the request inputs
+        $validator = Validator::make(
+            $request->all(),
+            [
+                'izyim_email'    => 'email|required',
+                'exchange_email' => 'email|required',
+            ]
+        );
+
+        if ($validator->fails()) {
+            throw new RequestValidationException($validator->messages()->first());
+        }
+
+        // Retrieve the validated emails from the request
+        $izyimEmail = $request->input('izyim_email');
+        $exchangeEmail = $request->input('exchange_email');
+
+        // Check if both emails are the same
+        if ($izyimEmail === $exchangeEmail) {
+            return response()->json([
+                'message' => 'Both emails are the same.',
+                'status' => 'ok',
+            ], 200);
+        }
+
+        // Check if the exchange email already exists in the system
+        $existingUser = User::where('email', $exchangeEmail)->first();
+        if ($existingUser) {
+            return response()->json([
+                'message' => 'The Exchange email already exists in the system.',
+                'status' => 'error',
+            ], 400);
+        }
+
+        // Retrieve the izyim user
+        $izyimUser = User::where('email', $izyimEmail)->first();
+        if (!$izyimUser) {
+            return response()->json([
+                'message' => 'The Izyim email not found in system.',
+                'status' => 'error',
+            ], 404);
+        }
+
+        $newUser = new User();
+        $newUser->name      = $izyimUser->name;
+        $newUser->email     = $exchangeEmail;
+        $newUser->password  = $izyimUser->password;
+        $newUser->type      = RoleTypes::USER;
+        $newUser->status    = ApprovalStatus::APPROVED;
+        $newUser->save();
+
+        Log::channel('wac_webhook')->info('Wac created user: ' . $exchangeEmail);
+
+        $companyModule = $izyimUser->companyModule->first();
+        $Object = new EmploymentObject($companyModule, $newUser);
+
+        $this->assignEmployeeProcessor->execute($Object);
+
+        return response()->json([
+            'message' => 'Exchange email registered successfully.',
+            'status' => 'success',
+        ], 201);
+    }
+}

app/Console/Commands/FixMissingPackingList.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+class FixMissingPackingList extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'fix-missing-packinglist';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Fix Missing Packinglist';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $start_date = '2024-05-05';
+        $end_date = '2024-05-05';
+
+        $start = $start_date ? Carbon::parse($start_date) : null;
+        $end = $end_date ? Carbon::parse($end_date) : null;
+
+        if (!$start || !$end) {
+            return;
+        }
+
+        (App()->make(FetchPackingListsFromYdPortalProcessor::class))->execute($start, $end);
+    }
+}

app/Console/Commands/SendPermitsReminderEmails.php

@@ -76,7 +76,7 @@ class SendPermitsReminderEmails extends Command
     protected function getEmailList(): array
     {
         return [
-            'edmond.wuiming2021@gmail.com',
+            // 'edmond.wuiming2021@gmail.com',
             'anithagurl96@gmail.com'
         ];
     }

app/Http/Controllers/Imports/ImportPermitsReminderController.php

@@ -40,25 +40,41 @@ class ImportPermitsReminderController
             $row['reminder_date'] = $this->changeExcelDate($row['reminder_date']);
 
             $validator = Validator::make($row, [
-                'model' => 'required|unique:permits_reminders,model',
-                'expiry_date' => 'required|date|after_or_equal:today',
-                'reminder_date' => 'required|date|after_or_equal:today',
+                'model' => 'required',
+                // 'expiry_date' => 'required|date|after_or_equal:today',
+                'expiry_date' => 'required|date',
+                // 'reminder_date' => 'required|date|after_or_equal:today',
+                'reminder_date' => 'required|date',
             ]);
 
             if ($validator->fails()) {
                 $row['status'] = 'failed';
                 $row['message'] = $validator->errors()->all();
-
                 $returnArray[] = $row;
             } else {
-                $row['created_at'] = Carbon::now();
-                $row['updated_at'] = Carbon::now();
-                $successRows[] = $row;
+                $existingRecord = PermitsReminder::where('model', $row['model'])->first();
+
+                if ($existingRecord) {
+                    $existingRecord->update([
+                        'expiry_date' => $row['expiry_date'],
+                        'reminder_date' => $row['reminder_date'],
+                    ]);
+
+                    $row['status'] = 'Updated';
+                    $row['message'] = 'Record has been updated';
+                    $returnArray[] = $row;
+                } else {
+                    // Add to successful rows for batch insertion
+                    $row['created_at'] = Carbon::now();
+                    $row['updated_at'] = Carbon::now();
+                    $successRows[] = $row;
+                }
             }
         }
 
+        // Insert only if there are new successful rows
         if (!empty($successRows)) {
-            PermitsReminder::insert($successRows); // Insert only if there are successful rows
+            PermitsReminder::insert($successRows);
         }
 
         $successCount = count($successRows);

app/Http/Controllers/Wac/RegisterExchangeEmailController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Wac;
+
+use App\Classes\Modules\Wac\ControllersLogic\RegisterExchangeEmailLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RegisterExchangeEmailController
+{
+    /**
+     * @param Request $request
+     * @param FetchQuestionQALogic $logic
+     * @return JsonResponse
+     */
+    public function register(Request $request, RegisterExchangeEmailLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

config/logging.php

@@ -130,6 +130,11 @@ return [
             'path' => storage_path('logs/laravel_perfex_crm.log'),
             'level' => 'info',
         ],
+        'wac_webhook' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/wac_webhook.log'),
+            'level' => 'info',
+        ],
     ],
 
 ];

config/wagWebhookUrl.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'account_registration_url'  => 'https://wacontact.readyspace.com/rest/trigger/9fe03daf-2ace-4095-b064-601ef6d9bfe7',
+    'invoice_created_url'       => 'https://wacontact.readyspace.com/rest/trigger/c0d38aa7-91ac-458b-8014-cf3287a636e4',
+];

routes/api.php

@@ -34,8 +34,6 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
         Route::post('/import/update-debtor/f614e339d7058904a831aad742e24d55', 'Imports\ImportUpdateDebtorController@import')->name('debtor.import');
 
-        Route::post('/import/upload-permits-reminder', 'Imports\ImportPermitsReminderController@import')->name('permits_reminder.upload');
-
         require __DIR__ . '/company.php';
 
         require __DIR__ . '/document.php';

routes/apipub.php

@@ -12,5 +12,9 @@ Route::group(['middleware' => 'apipub', 'prefix' => 'v1', 'as' => 'apipub.'], fu
         Route::group(['prefix' => 'feedback', 'as' => 'feedback.', 'namespace' => 'HelpMenu'], function () {
             Route::post('/generate', 'GenerateFeedbackUrlController@generate')->name('feedback.url.generate');
         });
+
+        Route::group(['prefix' => 'wac', 'as' => 'wac.', 'namespace' => 'Wac'], function () {
+            Route::post('/register-email', 'RegisterExchangeEmailController@register')->name('register_email');
+        });
     });
 });

routes/permits_reminder.php

@@ -9,3 +9,5 @@ Route::group(['prefix' => 'permits-reminder', 'as' => 'permits_reminder.', 'name
     Route::post('/{id}/update', 'UpdatePermitsReminderController@update')->name('update');
 });
 
+Route::post('/import/upload-permits-reminder', 'Imports\ImportPermitsReminderController@import')->name('permits_reminder.upload');
+