diff --git a/app/Http/Controllers/Fo/EggController.php b/app/Http/Controllers/Fo/EggController.php index fd2674a..852e6b0 100644 --- a/app/Http/Controllers/Fo/EggController.php +++ b/app/Http/Controllers/Fo/EggController.php @@ -65,7 +65,7 @@ class EggController extends Controller } $datePonte = $mobas->laying_date; - $date_emballage = $mobas->date_emballage; + $date_emballage = $mobas->packing_date; // * Compare DCR et Today $date_dcr = $mobas->dcr; $date_today = Carbon::now(); diff --git a/app/Jobs/Arcadia/XmlFluxEggJob.php b/app/Jobs/Arcadia/XmlFluxEggJob.php index ee2c1b6..0601db9 100644 --- a/app/Jobs/Arcadia/XmlFluxEggJob.php +++ b/app/Jobs/Arcadia/XmlFluxEggJob.php @@ -29,6 +29,7 @@ class XmlFluxEggJob extends XmlJobs 'code_boite' => 'box_code', 'code_ede' => 'ede_code', 'date_de_ponte' => 'laying_date', + 'date_emballage' => 'packing_date', 'code_produit' => 'product_code', 'lib_produit' => 'product_label', 'lot_externe' => 'external_lot', diff --git a/app/Models/TraceaEgg.php b/app/Models/TraceaEgg.php index eec3e64..737abea 100644 --- a/app/Models/TraceaEgg.php +++ b/app/Models/TraceaEgg.php @@ -37,6 +37,7 @@ class TraceaEgg extends Model 'box_code', 'ede_code', 'laying_date', + 'packing_date', 'product_code', 'product_label', 'external_lot', @@ -50,6 +51,7 @@ class TraceaEgg extends Model * @var array */ protected $casts = [ + 'packing_date' => 'date', 'laying_date' => 'date', 'dcr' => 'date' ]; diff --git a/database/migrations/2022_03_08_121533_create_tracea_eggs_table.php b/database/migrations/2022_03_08_121533_create_tracea_eggs_table.php index d2235e3..e2d6316 100644 --- a/database/migrations/2022_03_08_121533_create_tracea_eggs_table.php +++ b/database/migrations/2022_03_08_121533_create_tracea_eggs_table.php @@ -37,6 +37,8 @@ class CreateTraceaEggsTable extends Migration ->comment('Pas de description xs:integer [0-9]{6}|[0-9]{12}'); $table->date('laying_date') ->comment('Le date de ponte xs:date'); + $table->date('packing_date') + ->comment('Le date d\'emballage xs:date'); $table->date('dcr') ->comment('Date dcr ? xs:date'); }); @@ -60,9 +62,9 @@ class CreateTraceaEggsTable extends Migration $table->renameColumn('code_boite', 'box_code'); $table->renameColumn('ean13', 'ean_13'); $table->renameColumn('date_ponte', 'laying_date'); + $table->renameColumn('date_emballage', 'packing_date'); }); Schema::table('tracea_eggs', function (Blueprint $table) { - $table->dropColumn(['date_emballage']); $table->string('ede_code', 10) ->comment('Le code EDE xs:string length 8') ->change();