From dc1b0327ce65367d7a35c5ccba0d5c24b06ca06a Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 16 Dec 2022 13:37:18 +0800 Subject: [PATCH 01/78] log transactional data --- app/Classes/General/Traits/LogData.php | 36 ++++++++++++++++++++++++++ app/Models/Booking.php | 2 ++ app/Models/Group.php | 2 ++ app/Models/Transaction.php | 2 ++ app/Models/Wallet.php | 2 ++ 5 files changed, 44 insertions(+) create mode 100644 app/Classes/General/Traits/LogData.php diff --git a/app/Classes/General/Traits/LogData.php b/app/Classes/General/Traits/LogData.php new file mode 100644 index 00000000..efee3915 --- /dev/null +++ b/app/Classes/General/Traits/LogData.php @@ -0,0 +1,36 @@ +table).'_logs'; + $relationshipColumn = Str::singular($model->table).'_id'; + + $originalData = $model->getRawOriginal(); + $originalData[$relationshipColumn] = $originalData['id']; + unset($originalData['id']); + + if (!Schema::hasTable($tableName)) { + DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table); + DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`'); + } + + DB::table($tableName)->insert($originalData); + + }); + } +} diff --git a/app/Models/Booking.php b/app/Models/Booking.php index 2dfd945a..ca80d0c3 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -4,6 +4,7 @@ namespace App\Models; use App\Classes\General\Interfaces\Documentable; use App\Classes\General\Interfaces\Transactionable; +use App\Classes\General\Traits\LogData; use App\Classes\ValueObjects\Constants\RoleTypes; use App\Scopes\CustomerBookingsScope; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -28,6 +29,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable { use HasRelationships; use SoftDeletes; + use LogData; protected $table = 'bookings'; diff --git a/app/Models/Group.php b/app/Models/Group.php index 1fc6ca48..00a7247b 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Classes\General\Traits\LogData; use Illuminate\Database\Eloquent\Model; use App\Classes\General\Interfaces\Documentable; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -13,6 +14,7 @@ class Group extends Model implements Documentable { use HasRelationships; use \Staudenmeir\EloquentHasManyDeep\HasTableAlias; + use LogData; public function transactions() { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 429449a6..a1fb0849 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -4,6 +4,7 @@ namespace App\Models; use App\Classes\General\Interfaces\Documentable; use App\Classes\General\Interfaces\Transactionable; +use App\Classes\General\Traits\LogData; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; use Carbon\Carbon; @@ -22,6 +23,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable { use HasTableAlias; use SoftDeletes; + use LogData; protected $table = 'transactions'; diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php index 8c3114fd..00677513 100644 --- a/app/Models/Wallet.php +++ b/app/Models/Wallet.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Classes\General\Interfaces\Transactionable; +use App\Classes\General\Traits\LogData; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\SoftDeletes; @@ -12,6 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; class Wallet extends AbstractModel implements Transactionable { use SoftDeletes; + use LogData; protected $table = 'wallets'; /** From 43ab93b05007c8c20636034c33dbff1e96712b65 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 16 Dec 2022 16:56:48 +0800 Subject: [PATCH 02/78] debug groups --- app/Http/Resources/GroupResource.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php index faae5b43..abd017ec 100644 --- a/app/Http/Resources/GroupResource.php +++ b/app/Http/Resources/GroupResource.php @@ -22,6 +22,9 @@ class GroupResource extends JsonResource public function toArray($request) { + if(!$this->issuerCompany){ + dd($this->id); + } return [ 'id' => $this->id, 'original_amount' => (float) $this->original_amount, From e60e5d2e3cda4e70c762168602b83ec4cda96898 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 16 Dec 2022 17:05:02 +0800 Subject: [PATCH 03/78] debug groups --- app/Models/Group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Group.php b/app/Models/Group.php index 00a7247b..0ea4362c 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -14,7 +14,7 @@ class Group extends Model implements Documentable { use HasRelationships; use \Staudenmeir\EloquentHasManyDeep\HasTableAlias; - use LogData; +// use LogData; public function transactions() { From 2abc10ba29828d52b1c72cedefded907bc4f21b0 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 16 Dec 2022 17:06:56 +0800 Subject: [PATCH 04/78] debug groups --- app/Models/Booking.php | 2 +- app/Models/Transaction.php | 2 +- app/Models/Wallet.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Models/Booking.php b/app/Models/Booking.php index ca80d0c3..34fb779b 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -29,7 +29,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable { use HasRelationships; use SoftDeletes; - use LogData; +// use LogData; protected $table = 'bookings'; diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index a1fb0849..efbf9b85 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -23,7 +23,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable { use HasTableAlias; use SoftDeletes; - use LogData; +// use LogData; protected $table = 'transactions'; diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php index 00677513..919220e6 100644 --- a/app/Models/Wallet.php +++ b/app/Models/Wallet.php @@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; class Wallet extends AbstractModel implements Transactionable { use SoftDeletes; - use LogData; +// use LogData; protected $table = 'wallets'; /** From bf599890fa99f8abf2afe8491448741929d9b61e Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Sun, 18 Dec 2022 15:14:11 +0800 Subject: [PATCH 05/78] fix log data for transactional tables --- app/Classes/General/Traits/LogData.php | 11 +++++++++++ app/Models/Booking.php | 2 +- app/Models/Group.php | 2 +- app/Models/Transaction.php | 2 +- app/Models/Wallet.php | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Classes/General/Traits/LogData.php b/app/Classes/General/Traits/LogData.php index efee3915..de4b68fd 100644 --- a/app/Classes/General/Traits/LogData.php +++ b/app/Classes/General/Traits/LogData.php @@ -21,11 +21,22 @@ trait LogData $relationshipColumn = Str::singular($model->table).'_id'; $originalData = $model->getRawOriginal(); + $originalData[$relationshipColumn] = $originalData['id']; unset($originalData['id']); if (!Schema::hasTable($tableName)) { DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table); + + $indexs = DB::select('SHOW INDEX FROM '.$tableName.';'); + + $removedIndexes = []; + foreach ($indexs as $index){ + if($index->Column_name === 'id' || in_array($index->Key_name, $removedIndexes)) continue; + DB::statement('ALTER TABLE '.$tableName.' drop index '.$index->Key_name); + $removedIndexes[] = $index->Key_name; + } + DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`'); } diff --git a/app/Models/Booking.php b/app/Models/Booking.php index 34fb779b..ca80d0c3 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -29,7 +29,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable { use HasRelationships; use SoftDeletes; -// use LogData; + use LogData; protected $table = 'bookings'; diff --git a/app/Models/Group.php b/app/Models/Group.php index 0ea4362c..00a7247b 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -14,7 +14,7 @@ class Group extends Model implements Documentable { use HasRelationships; use \Staudenmeir\EloquentHasManyDeep\HasTableAlias; -// use LogData; + use LogData; public function transactions() { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index efbf9b85..a1fb0849 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -23,7 +23,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable { use HasTableAlias; use SoftDeletes; -// use LogData; + use LogData; protected $table = 'transactions'; diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php index 919220e6..00677513 100644 --- a/app/Models/Wallet.php +++ b/app/Models/Wallet.php @@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany; class Wallet extends AbstractModel implements Transactionable { use SoftDeletes; -// use LogData; + use LogData; protected $table = 'wallets'; /** From dfdfb50ead92eb24abdda295275a78e039f58ef5 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Mon, 19 Dec 2022 11:16:59 +0800 Subject: [PATCH 06/78] fix log data for transactional tables --- app/Models/Group.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Group.php b/app/Models/Group.php index 00a7247b..0ea4362c 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -14,7 +14,7 @@ class Group extends Model implements Documentable { use HasRelationships; use \Staudenmeir\EloquentHasManyDeep\HasTableAlias; - use LogData; +// use LogData; public function transactions() { From d16436088f5fccfae756546d5851121437b607db Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Mon, 19 Dec 2022 11:26:20 +0800 Subject: [PATCH 07/78] fix log data for transactional tables --- .../ControllersLogic/CreateSupplierTransactionLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php index b495cc35..c21c234e 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php @@ -106,6 +106,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic $service_charge += $row->service_charge; } + dd($this->generatesTransactionBillNumber->execute('SPO-')); $group->issuer = $issuer; $group->receiver = $receiver; $group->reference = $this->generatesTransactionBillNumber->execute('SPO-'); From 80c59efd2f7e3c7501b20ca1592c9a8e25732b2a Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Mon, 19 Dec 2022 11:28:21 +0800 Subject: [PATCH 08/78] fix log data for transactional tables --- .../ControllersLogic/CreateSupplierTransactionLogic.php | 1 - app/Models/Group.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php index c21c234e..b495cc35 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php @@ -106,7 +106,6 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic $service_charge += $row->service_charge; } - dd($this->generatesTransactionBillNumber->execute('SPO-')); $group->issuer = $issuer; $group->receiver = $receiver; $group->reference = $this->generatesTransactionBillNumber->execute('SPO-'); diff --git a/app/Models/Group.php b/app/Models/Group.php index 0ea4362c..00a7247b 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -14,7 +14,7 @@ class Group extends Model implements Documentable { use HasRelationships; use \Staudenmeir\EloquentHasManyDeep\HasTableAlias; -// use LogData; + use LogData; public function transactions() { From 13dcedf74a089fba36fcae3f010ec083107f46e0 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Mon, 19 Dec 2022 11:30:19 +0800 Subject: [PATCH 09/78] fix log data for transactional tables --- app/Models/Group.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Models/Group.php b/app/Models/Group.php index 00a7247b..01dd257e 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -14,7 +14,6 @@ class Group extends Model implements Documentable { use HasRelationships; use \Staudenmeir\EloquentHasManyDeep\HasTableAlias; - use LogData; public function transactions() { From 4a553c65cc21a9e79c094560c8bf3ab36a2d7b39 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 6 Jan 2023 14:35:59 +0800 Subject: [PATCH 10/78] if in selected segment, then invoice date is based on generated on --- resources/views/pages/pdfs/invoice.blade.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php index 99785ef8..c52e87e4 100644 --- a/resources/views/pages/pdfs/invoice.blade.php +++ b/resources/views/pages/pdfs/invoice.blade.php @@ -33,7 +33,18 @@
Ref# {{ $po_order_transaction->booking->marking }}
-
Date: {{ $po_order_transaction->booking->created_at }}
+ + segments->pluck('id'); + foreach ($customer_segment_id as $value) { + if (in_array($value, [23])){ + $invoice_based_on_generated_date = true; + } + } + ?> +
Date: {{ $invoice_based_on_generated_date ? \Carbon\Carbon::now() : $po_order_transaction->booking->created_at }}
+
 
From 4c81f394f857b154f1d1eab24206e9e2d3c77e7f Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 6 Jan 2023 14:36:49 +0800 Subject: [PATCH 11/78] update settings, admin can edit labels update customer summar page label layout --- .../elements/CustomerProfileComponent.vue | 4 +- resources/views/pages/settings.blade.php | 118 +++++++++--------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue index 6225a43e..fd36e8a2 100644 --- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue +++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue @@ -47,8 +47,8 @@ style=" fill:#000000;">
-
-
+
+
{{segment.name}} diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index 876a3833..decbfa48 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -31,6 +31,29 @@
+
+
+
+
+
+
+
+
+ +
+
+
Labels
+
+
+
+
+
+
+
+