Merge branch 'develop' into trunk
This commit is contained in:
commit
f2d7f35f91
7 changed files with 60 additions and 82070 deletions
|
|
@ -103,6 +103,12 @@ class CsvOrderWrite extends CsvJobs
|
|||
|
||||
$data = $this->array2csv($csvlines, ";");
|
||||
|
||||
$disk->put(date("Ymd_His") . microtime(true) . ".csv", $data);
|
||||
//$outputfilename = date("Ymd_His") . microtime(true) . ".csv";
|
||||
$outputfilename = "BTQ_" . $this->order->reference . "_" . $code_client . "_" . $customer->salarie->nom . "_" . $customer->salarie->prenom . "_" . str_pad($customer->salarie->code_societe, 3, "0", STR_PAD_LEFT) . ".csv";
|
||||
|
||||
$disk->put($outputfilename, $data);
|
||||
|
||||
//send this file by mail
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -77,7 +77,12 @@ return [
|
|||
|
||||
'orders' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('orders'),
|
||||
'root' => storage_path('orders/out'),
|
||||
],
|
||||
|
||||
'regate' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('orders/in'),
|
||||
],
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -45,6 +45,17 @@ return [
|
|||
'auth_mode' => null,
|
||||
],
|
||||
|
||||
'smtp2' => [
|
||||
'transport' => 'smtp',
|
||||
'host' => env('MAIL_HOST2', 'smtp.mailgun.org'),
|
||||
'port' => env('MAIL_PORT2', 587),
|
||||
'encryption' => env('MAIL_ENCRYPTION2', 'tls'),
|
||||
'username' => env('MAIL_USERNAME2'),
|
||||
'password' => env('MAIL_PASSWORD2'),
|
||||
'timeout' => null,
|
||||
'auth_mode' => null,
|
||||
],
|
||||
|
||||
'ses' => [
|
||||
'transport' => 'ses',
|
||||
],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
class AddCodeSocieteToSalariesTable extends Migration
|
||||
{
|
||||
/**
|
||||
* Run the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function up()
|
||||
{
|
||||
Schema::table('salaries', function (Blueprint $table) {
|
||||
//add order_unit
|
||||
$table->integer('code_societe')->nullable()->after('prenom'); //code societe de rattachement (pour regate)
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverse the migrations.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::table('salaries', function (Blueprint $table) {
|
||||
$table->dropColumn('code_societe');
|
||||
});
|
||||
}
|
||||
}
|
||||
17226
public/b-o/css/app.css
vendored
17226
public/b-o/css/app.css
vendored
File diff suppressed because one or more lines are too long
64840
public/b-o/js/app.js
vendored
64840
public/b-o/js/app.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -4,11 +4,6 @@
|
|||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
|
||||
*/
|
||||
|
||||
/*!
|
||||
* Font Awesome Free 5.15.3 by @fontawesome - https://fontawesome.com
|
||||
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
|
||||
*/
|
||||
|
||||
/*!
|
||||
* Sizzle CSS Selector Engine v2.3.6
|
||||
* https://sizzlejs.com/
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue