Skip to content

Commit

Permalink
fix error uploading excel in pallet delivery
Browse files Browse the repository at this point in the history
  • Loading branch information
inikoo committed Jan 21, 2025
1 parent cf00e11 commit bc2272c
Show file tree
Hide file tree
Showing 8 changed files with 113 additions and 7 deletions.
19 changes: 18 additions & 1 deletion app/Imports/Fulfilment/PalletImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
use App\Imports\WithImport;
use App\Models\Fulfilment\PalletDelivery;
use App\Models\Helpers\Upload;
use App\Rules\IUnique;
use Exception;
use Illuminate\Support\Arr;
use Illuminate\Validation\Rule;
use Maatwebsite\Excel\Concerns\SkipsOnFailure;
use Maatwebsite\Excel\Concerns\ToCollection;
use Maatwebsite\Excel\Concerns\WithEvents;
Expand Down Expand Up @@ -85,7 +87,22 @@ public function storeModel($row, $uploadRecord): void
public function rules(): array
{
return [
'customer_reference' => ['nullable', 'unique:pallets,customer_reference'],
'customer_reference' => [
'sometimes',
'nullable',
'max:64',
'string',
Rule::notIn(['export', 'create', 'upload']),
new IUnique(
table: 'pallets',
column: 'customer_reference',
extraConditions: [
['column' => 'fulfilment_customer_id', 'value' => $this->scope->fulfilment_customer_id],
]
),


],
'notes' => ['nullable'],
'type' => ['nullable'],
'stored_item' => ['nullable'],
Expand Down
4 changes: 3 additions & 1 deletion app/Models/Fulfilment/FulfilmentCustomer.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
* @property int $number_pallets_with_stored_items_state_not_received
* @property int $number_pallets_state_storing
* @property int $number_pallets_with_stored_items_state_storing
* @property int $number_pallets_state_request_return
* @property int $number_pallets_state_request_return_in_process
* @property int $number_pallets_with_stored_items_state_request_return
* @property int $number_pallets_state_picking
* @property int $number_pallets_with_stored_items_state_picking
Expand Down Expand Up @@ -123,6 +123,8 @@
* @property \Illuminate\Support\Carbon|null $deleted_at
* @property string|null $delete_comment
* @property string|null $source_id
* @property int $number_pallets_state_request_return_submitted
* @property int $number_pallets_state_request_return_confirmed
* @property-read \App\Models\Fulfilment\RecurringBill|null $currentRecurringBill
* @property-read Customer $customer
* @property-read \App\Models\Fulfilment\Fulfilment $fulfilment
Expand Down
4 changes: 3 additions & 1 deletion app/Models/Fulfilment/FulfilmentStats.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
* @property int $number_pallets_with_stored_items_state_not_received
* @property int $number_pallets_state_storing
* @property int $number_pallets_with_stored_items_state_storing
* @property int $number_pallets_state_request_return
* @property int $number_pallets_state_request_return_in_process
* @property int $number_pallets_with_stored_items_state_request_return
* @property int $number_pallets_state_picking
* @property int $number_pallets_with_stored_items_state_picking
Expand Down Expand Up @@ -114,6 +114,8 @@
* @property string $current_recurring_bills_amount
* @property string $current_recurring_bills_amount_org_currency
* @property string $current_recurring_bills_amount_grp_currency
* @property int $number_pallets_state_request_return_submitted
* @property int $number_pallets_state_request_return_confirmed
* @property-read \App\Models\Fulfilment\Fulfilment $fulfilment
* @method static \Illuminate\Database\Eloquent\Builder<static>|FulfilmentStats newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|FulfilmentStats newQuery()
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Helpers/Snapshot.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @property string|null $published_at
* @property string|null $published_until
* @property string $checksum
* @property array $layout
* @property array<array-key, mixed> $layout
* @property string|null $compiled_layout e.g. html in case of email builders
* @property string|null $comment
* @property bool $first_commit
Expand Down
4 changes: 3 additions & 1 deletion app/Models/Inventory/WarehouseStats.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
* @property int $number_pallets_with_stored_items_state_not_received
* @property int $number_pallets_state_storing
* @property int $number_pallets_with_stored_items_state_storing
* @property int $number_pallets_state_request_return
* @property int $number_pallets_state_request_return_in_process
* @property int $number_pallets_with_stored_items_state_request_return
* @property int $number_pallets_state_picking
* @property int $number_pallets_with_stored_items_state_picking
Expand Down Expand Up @@ -150,6 +150,8 @@
* @property \Illuminate\Support\Carbon|null $updated_at
* @property string $total_volume cbm
* @property string $total_weight kg
* @property int $number_pallets_state_request_return_submitted
* @property int $number_pallets_state_request_return_confirmed
* @property-read \App\Models\Inventory\Warehouse $warehouse
* @method static Builder<static>|WarehouseStats newModelQuery()
* @method static Builder<static>|WarehouseStats newQuery()
Expand Down
4 changes: 3 additions & 1 deletion app/Models/SysAdmin/GroupFulfilmentStats.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
* @property int $number_pallets_with_stored_items_state_not_received
* @property int $number_pallets_state_storing
* @property int $number_pallets_with_stored_items_state_storing
* @property int $number_pallets_state_request_return
* @property int $number_pallets_state_request_return_in_process
* @property int $number_pallets_with_stored_items_state_request_return
* @property int $number_pallets_state_picking
* @property int $number_pallets_with_stored_items_state_picking
Expand Down Expand Up @@ -111,6 +111,8 @@
* @property int $number_recurring_bills_status_former
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property int $number_pallets_state_request_return_submitted
* @property int $number_pallets_state_request_return_confirmed
* @property-read \App\Models\SysAdmin\Group $group
* @method static \Illuminate\Database\Eloquent\Builder<static>|GroupFulfilmentStats newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|GroupFulfilmentStats newQuery()
Expand Down
4 changes: 3 additions & 1 deletion app/Models/SysAdmin/OrganisationFulfilmentStats.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* @property int $number_pallets_with_stored_items_state_not_received
* @property int $number_pallets_state_storing
* @property int $number_pallets_with_stored_items_state_storing
* @property int $number_pallets_state_request_return
* @property int $number_pallets_state_request_return_in_process
* @property int $number_pallets_with_stored_items_state_request_return
* @property int $number_pallets_state_picking
* @property int $number_pallets_with_stored_items_state_picking
Expand Down Expand Up @@ -113,6 +113,8 @@
* @property int $number_recurring_bills_status_former
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property int $number_pallets_state_request_return_submitted
* @property int $number_pallets_state_request_return_confirmed
* @property-read \App\Models\SysAdmin\Organisation $organisation
* @method static Builder<static>|OrganisationFulfilmentStats newModelQuery()
* @method static Builder<static>|OrganisationFulfilmentStats newQuery()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?php

/*
* Author: Raul Perusquia <raul@inikoo.com>
* Created: Tue, 21 Jan 2025 18:22:45 Malaysia Time, Kuala Lumpur, Malaysia
* Copyright (c) 2025, Raul A Perusquia Flores
*/

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class () extends Migration {
public function up(): void
{
Schema::table('fulfilment_customers', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return', 'number_pallets_state_request_return_in_process');
$table->unsignedInteger('number_pallets_state_request_return_submitted')->default(0);
$table->unsignedInteger('number_pallets_state_request_return_confirmed')->default(0);
});

Schema::table('fulfilment_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return', 'number_pallets_state_request_return_in_process');
$table->unsignedInteger('number_pallets_state_request_return_submitted')->default(0);
$table->unsignedInteger('number_pallets_state_request_return_confirmed')->default(0);
});

Schema::table('organisation_fulfilment_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return', 'number_pallets_state_request_return_in_process');
$table->unsignedInteger('number_pallets_state_request_return_submitted')->default(0);
$table->unsignedInteger('number_pallets_state_request_return_confirmed')->default(0);
});

Schema::table('group_fulfilment_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return', 'number_pallets_state_request_return_in_process');
$table->unsignedInteger('number_pallets_state_request_return_submitted')->default(0);
$table->unsignedInteger('number_pallets_state_request_return_confirmed')->default(0);
});

Schema::table('warehouse_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return', 'number_pallets_state_request_return_in_process');
$table->unsignedInteger('number_pallets_state_request_return_submitted')->default(0);
$table->unsignedInteger('number_pallets_state_request_return_confirmed')->default(0);
});
}

public function down(): void
{
Schema::table('fulfilment_customers', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return_in_process', 'number_pallets_state_request_return');
$table->dropColumn('number_pallets_state_request_return_submitted');
$table->dropColumn('number_pallets_state_request_return_confirmed');
});

Schema::table('fulfilment_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return_in_process', 'number_pallets_state_request_return');
$table->dropColumn('number_pallets_state_request_return_submitted');
$table->dropColumn('number_pallets_state_request_return_confirmed');
});

Schema::table('organisation_fulfilment_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return_in_process', 'number_pallets_state_request_return');
$table->dropColumn('number_pallets_state_request_return_submitted');
$table->dropColumn('number_pallets_state_request_return_confirmed');
});

Schema::table('group_fulfilment_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return_in_process', 'number_pallets_state_request_return');
$table->dropColumn('number_pallets_state_request_return_submitted');
$table->dropColumn('number_pallets_state_request_return_confirmed');
});

Schema::table('warehouse_stats', function (Blueprint $table) {
$table->renameColumn('number_pallets_state_request_return_in_process', 'number_pallets_state_request_return');
$table->dropColumn('number_pallets_state_request_return_submitted');
$table->dropColumn('number_pallets_state_request_return_confirmed');
});
}
};

0 comments on commit bc2272c

Please sign in to comment.