Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fdf8fa3aeb | ||
|
|
a1c6362ff4 | ||
|
|
a25d799d13 | ||
|
|
0c445f89af |
@@ -32,6 +32,11 @@ class ClosedOrderSaveXls extends Command
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -28,6 +28,11 @@ class DeleteOldLabels extends Command
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ class GenerateGS1Cmd extends Command
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
@@ -53,7 +58,7 @@ class GenerateGS1Cmd extends Command
|
|||||||
|
|
||||||
// Get the Calling User
|
// Get the Calling User
|
||||||
$userId = $this->argument('user');
|
$userId = $this->argument('user');
|
||||||
$sHUSER = $userId ?? (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP');
|
$sHUSER = isset($userId) ? $userId : (m3_user() !== '' ? Str::upper(trim(m3_user())) : 'TWOSHIP');
|
||||||
$this->info('User: ' . $sHUSER);
|
$this->info('User: ' . $sHUSER);
|
||||||
|
|
||||||
// Get Manifest Array
|
// Get Manifest Array
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ class UtilitiesCmd extends Command
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -29,6 +29,11 @@ class WHSMetricsSaveXls extends Command
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the console command.
|
* Execute the console command.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ class Helper
|
|||||||
{
|
{
|
||||||
ini_set('max_execution_time', Config::get('arrays.PHPTimeOut'));
|
ini_set('max_execution_time', Config::get('arrays.PHPTimeOut'));
|
||||||
|
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('ICM699M')->insert($data);
|
$insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('ICM699M')->insert($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get Substring in string between 2 Substrings
|
// Get Substring in string between 2 Substrings
|
||||||
@@ -245,14 +245,15 @@ class Helper
|
|||||||
if ($endPos === false) {
|
if ($endPos === false) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
$substring = substr($string, $startPos + strlen($start), $endPos - ($startPos + strlen($start)));
|
||||||
|
|
||||||
return substr($string, $startPos + strlen($start), $endPos - ($startPos + strlen($start)));
|
return $substring;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function checkLength($jsonFields, $dbFields, $type)
|
public static function checkLength($JSONL, $DBL, $TYPE)
|
||||||
{
|
{
|
||||||
// Check type
|
// Check type
|
||||||
$jSONType = gettype($jsonFields);
|
$jSONType = gettype($JSONL);
|
||||||
|
|
||||||
switch ($jSONType) {
|
switch ($jSONType) {
|
||||||
case 'string':
|
case 'string':
|
||||||
@@ -269,24 +270,24 @@ class Helper
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$type = $type == 'integer' || $type == 'DEC' ? 'number' : $type;
|
$TYPE = $TYPE == 'integer' || $TYPE == 'DEC' ? 'number' : $TYPE;
|
||||||
|
|
||||||
// Check Json Field should be < DB Field
|
// Check Json Field should be < DB Field
|
||||||
$lengthOK[413] = (strlen($jsonFields) <= $dbFields) ? true : false;
|
$lengthOK[413] = (strlen($JSONL) <= $DBL) ? true : false;
|
||||||
// Empty Fields
|
// Empty Fields
|
||||||
$lengthOK[411] = true; // !empty($jsonFields) ? true : false ;
|
$lengthOK[411] = true; // !empty($JSONL) ? true : false ;
|
||||||
// Wrong Types
|
// Wrong Types
|
||||||
$lengthOK[417] = true; // $jSONTypeConv == $type ? true : false ;
|
$lengthOK[417] = true; // $jSONTypeConv == $TYPE ? true : false ;
|
||||||
// Log::info($lengthOK);
|
// Log::info($lengthOK);
|
||||||
|
|
||||||
return $lengthOK;
|
return $lengthOK;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function sanityzeString($strToSanitize)
|
public static function sanityzeString($StrTosanityze)
|
||||||
{
|
{
|
||||||
$badChars = Config::get('arrays.BadChars');
|
$badChars = Config::get('arrays.BadChars');
|
||||||
|
|
||||||
$goodString = trim($strToSanitize);
|
$goodString = trim($StrTosanityze);
|
||||||
$goodString = str_replace("'", '', $goodString);
|
$goodString = str_replace("'", '', $goodString);
|
||||||
$goodString = str_replace("\u{f0e0}", '', $goodString);
|
$goodString = str_replace("\u{f0e0}", '', $goodString);
|
||||||
$goodString = preg_replace('/\\\\u201[0-9A-F]+/i', '', $goodString);
|
$goodString = preg_replace('/\\\\u201[0-9A-F]+/i', '', $goodString);
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ class CloseShipment extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check Packages array before proceeding with CloseShipment
|
// Check Packages array before proceeding with CloseShipment
|
||||||
if (! empty($pACKAGES)) {
|
if (count($pACKAGES) > 0) {
|
||||||
// Get Packlist
|
// Get Packlist
|
||||||
$packingList = '';
|
$packingList = '';
|
||||||
$dOCTYPE = 'PackingList';
|
$dOCTYPE = 'PackingList';
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class M3Controller extends Controller
|
|||||||
$fullData = $commentData;
|
$fullData = $commentData;
|
||||||
$fullData['AXCOMMENT'] = $substring;
|
$fullData['AXCOMMENT'] = $substring;
|
||||||
$fullData['AXLINENO'] = $aXLINENO;
|
$fullData['AXLINENO'] = $aXLINENO;
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm666m2')->insert($fullData);
|
$insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('icm666m2')->insert($fullData);
|
||||||
|
|
||||||
$aXLINENO++;
|
$aXLINENO++;
|
||||||
|
|
||||||
@@ -412,7 +412,7 @@ class M3Controller extends Controller
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
// SQL Insert to ICM666M
|
// SQL Insert to ICM666M
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm666m')->insert($insertArray);
|
$insertSQL = DB::connection(config('m3.connection', 'pgsql'))->table('icm666m')->insert($insertArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Call PGM ICM700CSBM
|
// Call PGM ICM700CSBM
|
||||||
|
|||||||
@@ -480,7 +480,7 @@ class TransferAPI extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// A4SPR15A01 Exists : proceed
|
// A4SPR15A01 Exists : proceed
|
||||||
if ($a4SPR15A01 != '' && ! empty($allMacpkrs)) {
|
if ($a4SPR15A01 != '' && count($allMacpkrs) > 0) {
|
||||||
$jSON = json_encode([
|
$jSON = json_encode([
|
||||||
'DIVI' => $dIVI,
|
'DIVI' => $dIVI,
|
||||||
'WHS' => $wHS,
|
'WHS' => $wHS,
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ class BoxPackToPalletController extends Controller
|
|||||||
|
|
||||||
$palletHeader = $boxes->first();
|
$palletHeader = $boxes->first();
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.BoxPackToPalletScan', ['boxes' => $boxes, 'palletHeader' => $palletHeader, 'R659PALT' => $r659PALT]);
|
return view('m3::liberty-theme.pages.BoxPackToPalletScan', compact('boxes', 'palletHeader', 'R659PALT'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scan Boxes
|
// Scan Boxes
|
||||||
@@ -280,11 +280,13 @@ class BoxPackToPalletController extends Controller
|
|||||||
$uSERWH = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';
|
$uSERWH = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';
|
||||||
$r428PL = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';
|
$r428PL = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';
|
||||||
|
|
||||||
return [
|
$userWhsCoPlant = [
|
||||||
'R428US' => $r428US,
|
'R428US' => $r428US,
|
||||||
'USERCO' => $uSERCO,
|
'USERCO' => $uSERCO,
|
||||||
'USERWHS' => $uSERWH,
|
'USERWHS' => $uSERWH,
|
||||||
'USERPL' => $r428PL,
|
'USERPL' => $r428PL,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
return $userWhsCoPlant;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class M3DeliveryController extends Controller
|
|||||||
$shipvia = Schema::connection($connection)->hasTable('icm319m')
|
$shipvia = Schema::connection($connection)->hasTable('icm319m')
|
||||||
? DB::connection($connection)->table('icm319m')->select('AXCODE', 'AXDESC')->orderBy('AXCODE')->get() : collect();
|
? DB::connection($connection)->table('icm319m')->select('AXCODE', 'AXDESC')->orderBy('AXCODE')->get() : collect();
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.M3Delivery', ['ICM664M' => $iCM664M, 'IC670M' => $iC670M, 'power_user' => $power_user, 'shipvia' => $shipvia]);
|
return view('m3::liberty-theme.pages.M3Delivery', compact('ICM664M', 'IC670M', 'power_user', 'shipvia'));
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class M3ErrorsDispController extends Controller
|
|||||||
return $value->R428FAMILY = trim($value->R428FAMILY);
|
return $value->R428FAMILY = trim($value->R428FAMILY);
|
||||||
});
|
});
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.M3ErrorsDisplay', ['macpkr' => $macpkr, 'shsource' => $shsource, 'showerrors' => $showerrors, 'skipdates' => $skipdates, 'ICM428MCOL' => $iCM428MCOL]);
|
return view('m3::liberty-theme.pages.M3ErrorsDisplay', compact('macpkr', 'shsource', 'showerrors', 'skipdates', 'ICM428MCOL'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function datatables(Request $request)
|
public function datatables(Request $request)
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ class M3GetPDFFromCacheController extends Controller
|
|||||||
|
|
||||||
$aggmsg = "This delivery note is part of aggregation $aggno ";
|
$aggmsg = "This delivery note is part of aggregation $aggno ";
|
||||||
$iCM688M1 = DB::connection(config('m3.connection', 'pgsql'))->select("select A4MACPKR from ICM688M1 where A4SHPAGGCD='$aggno'");
|
$iCM688M1 = DB::connection(config('m3.connection', 'pgsql'))->select("select A4MACPKR from ICM688M1 where A4SHPAGGCD='$aggno'");
|
||||||
// foreach($iCM688M1 as $key => $ICM688M1R) {
|
|
||||||
// $aggmsg.=' <a href="M3GetPDFFromCache?MACPKR='.$ICM688M1R->A4MACPKR.'&COMPANY='.$cOMPANY.'&PLANT='.$pLANT.'&WHS='.$wHS.'">'.$ICM688M1R->A4MACPKR.'</a>';
|
// $aggmsg.=' <a href="M3GetPDFFromCache?MACPKR='.$ICM688M1R->A4MACPKR.'&COMPANY='.$cOMPANY.'&PLANT='.$pLANT.'&WHS='.$wHS.'">'.$ICM688M1R->A4MACPKR.'</a>';
|
||||||
// }
|
// }
|
||||||
// $aggmsg.=" )";
|
// $aggmsg.=" )";
|
||||||
@@ -187,7 +186,7 @@ class M3GetPDFFromCacheController extends Controller
|
|||||||
// dump($iC670M);
|
// dump($iC670M);
|
||||||
// dump($iCM695M1);
|
// dump($iCM695M1);
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.M3GetPDF', ['IC670M' => $iC670M, 'PDFArray' => $pDFArray, 'AYMACPKR' => $aYMACPKR, 'WHDDA' => $wHDDA, 'aggmsg' => $aggmsg, 'carrier' => $carrier, 'trackingno' => $trackingno, 'ICM688M1' => $iCM688M1, 'COMPANY' => $cOMPANY, 'PLANT' => $pLANT, 'WHS' => $wHS]);
|
return view('m3::liberty-theme.pages.M3GetPDF', compact('IC670M', 'PDFArray', 'AYMACPKR', 'WHDDA', 'aggmsg', 'carrier', 'trackingno', 'ICM688M1', 'COMPANY', 'PLANT', 'WHS'));
|
||||||
// compact('IC670M','ViewTitle')
|
// compact('IC670M','ViewTitle')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class MFOrdersController extends Controller
|
|||||||
|
|
||||||
return view(
|
return view(
|
||||||
'm3::liberty-theme.pages.MFOrders',
|
'm3::liberty-theme.pages.MFOrders',
|
||||||
['ICM695M1' => $iCM695M1, 'status_ICM688M1_array' => $status_ICM688M1_array, 'MF' => $mF, 'carrier' => $carrier],
|
compact('ICM695M1', 'status_ICM688M1_array', 'MF', 'carrier'),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
abort(404, 'Manifest Not Found');
|
abort(404, 'Manifest Not Found');
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ class OrderLinesOfClosedOrder extends Controller
|
|||||||
Log::error($th);
|
Log::error($th);
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.OrderLinesOfClosed', ['IC670M' => $iC670M, 'ICM688M2' => $iCM688M2, 'WHDDA' => $wHDDA, 'COMPANY' => $cOMPANY, 'PLANT' => $pLANT, 'WHS' => $wHS, 'REPORTDATEDisp' => $rEPORTDATEDisp, 'allReportsUrls' => $allReportsUrls]);
|
return view('m3::liberty-theme.pages.OrderLinesOfClosed', compact('IC670M', 'ICM688M2', 'WHDDA', 'COMPANY', 'PLANT', 'WHS', 'REPORTDATEDisp', 'allReportsUrls'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function exporttoExcel(Request $request)
|
public static function exporttoExcel(Request $request)
|
||||||
|
|||||||
@@ -2,55 +2,34 @@
|
|||||||
|
|
||||||
namespace Modules\M3\Http\Controllers;
|
namespace Modules\M3\Http\Controllers;
|
||||||
|
|
||||||
use Config;
|
|
||||||
use Datatables;
|
|
||||||
use DB;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use Illuminate\Support\Facades\Schema;
|
||||||
use Modules\M3\Models\ICM658M;
|
use Modules\M3\Models\ICM658M;
|
||||||
|
use Throwable;
|
||||||
|
use Yajra\DataTables\Facades\DataTables;
|
||||||
|
|
||||||
class ReplenishSettingsController extends Controller
|
class ReplenishSettingsController extends Controller
|
||||||
{
|
{
|
||||||
public static function index(Request $request)
|
public function index()
|
||||||
{
|
{
|
||||||
// Replenishment Table
|
$IC670M = [];
|
||||||
// $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')->get();
|
|
||||||
// Warehouse Table
|
|
||||||
// $iC670M = DB::connection(config('m3.connection', 'pgsql'))->table('ic670m')->get();
|
|
||||||
|
|
||||||
// Get Logged user Id
|
try {
|
||||||
$userId = m3_user() !== '' ? strtoupper(m3_user()) : '';
|
if (Schema::connection(config('m3.connection', 'pgsql'))->hasTable('ic670m')) {
|
||||||
// $userId = 'E1135818'; // Brad : E1135818 Malak : E2011812 ACOM_PDF
|
$IC670M = DB::connection(config('m3.connection', 'pgsql'))
|
||||||
$connection = config('m3.connection', 'pgsql');
|
->table('ic670m')
|
||||||
$iCM428M = Schema::connection($connection)->hasTable('icm428m')
|
->get();
|
||||||
? DB::connection($connection)->table('icm428m')->where('R428US', $userId)->where('R428STS', 'A')->first()
|
}
|
||||||
: null;
|
} catch (Throwable $exception) {
|
||||||
|
report($exception);
|
||||||
$userCO = isset($iCM428M->R428CO) ? $iCM428M->R428CO : '';
|
$IC670M = [];
|
||||||
$userPL = isset($iCM428M->R428PL) ? $iCM428M->R428PL : '';
|
|
||||||
$userWH = isset($iCM428M->R428WH) ? $iCM428M->R428WH : '';
|
|
||||||
|
|
||||||
if ($userCO != '') {
|
|
||||||
// Warehouse Table
|
|
||||||
$iC670M = Schema::connection($connection)->hasTable('ic670m')
|
|
||||||
? DB::connection($connection)->table('ic670m')
|
|
||||||
->where('WDCO', $userCO)
|
|
||||||
->where('WDPL', $userPL)
|
|
||||||
->where('WDWHS', $userWH)
|
|
||||||
->get()
|
|
||||||
: [];
|
|
||||||
} else {
|
|
||||||
$iC670M = [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// FROM PRDAT.REFERPS t1 LEFT JOIN ( SELECT R658CO,R658PL,R658WH,R658LC,R658PN,R658MQ,R658RQ,R658TL,R658RMQ,
|
return view(
|
||||||
// TRIM(R658WH)||TRIM(R658LC)||TRIM(R658PN) AS FULLID FROM EWOBJTST.ICM658M
|
'm3::liberty-theme.pages.ReplenishSettings',
|
||||||
// ) t2 ON t1.REFKEY = t2.FULLID WHERE t1.REFCAT = '658'";
|
compact('IC670M'),
|
||||||
// $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
|
);
|
||||||
// dd($rEFCAT658);
|
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.ReplenishSettings', ['IC670M' => $iC670M]);
|
|
||||||
// 'REFCAT658',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
@@ -62,7 +41,7 @@ class ReplenishSettingsController extends Controller
|
|||||||
|
|
||||||
$formInputs['R658IZLCF'] = isset($formInputs['R658IZLCF']) ? $formInputs['R658IZLCF'] : '0';
|
$formInputs['R658IZLCF'] = isset($formInputs['R658IZLCF']) ? $formInputs['R658IZLCF'] : '0';
|
||||||
|
|
||||||
ICM658M::insert($formInputs);
|
$iCM658MINS = ICM658M::insert($formInputs);
|
||||||
|
|
||||||
return redirect()->route('m3.replenishmentSettings.index');
|
return redirect()->route('m3.replenishmentSettings.index');
|
||||||
}
|
}
|
||||||
@@ -97,7 +76,7 @@ class ReplenishSettingsController extends Controller
|
|||||||
$r658PL = trim($request->R658PL);
|
$r658PL = trim($request->R658PL);
|
||||||
$r658WH = trim($request->R658WH);
|
$r658WH = trim($request->R658WH);
|
||||||
|
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')
|
$deleteRecord = DB::connection(config('m3.connection', 'pgsql'))->table('icm658m')
|
||||||
->where('R658PN', $r658PN)
|
->where('R658PN', $r658PN)
|
||||||
->where('R658CO', $r658CO)
|
->where('R658CO', $r658CO)
|
||||||
->where('R658LC', $r658LC)
|
->where('R658LC', $r658LC)
|
||||||
@@ -176,6 +155,6 @@ class ReplenishSettingsController extends Controller
|
|||||||
// $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
|
// $rEFCAT658 = DB::connection(config('m3.connection', 'pgsql'))->select($sqlstmt);
|
||||||
// dd($rEFCAT658);
|
// dd($rEFCAT658);
|
||||||
|
|
||||||
return Datatables::of($rEFCAT658)->addIndexColumn()->make(true);
|
return DataTables::of($rEFCAT658)->addIndexColumn()->make(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class carrierMaintController extends Controller
|
|||||||
->where('R428US', strtoupper(m3_user()))->get()->all();
|
->where('R428US', strtoupper(m3_user()))->get()->all();
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.carrierMaint', ['ICM160M' => $iCM160M, 'power_user' => $power_user]);
|
return view('m3::liberty-theme.pages.carrierMaint', compact('ICM160M', 'power_user'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class execSummaryController extends Controller
|
|||||||
$checkWeight = isset($request->checkWeight) ? $request->checkWeight : ''; // on
|
$checkWeight = isset($request->checkWeight) ? $request->checkWeight : ''; // on
|
||||||
$checkLines = isset($request->checkLines) ? $request->checkLines : ''; // on
|
$checkLines = isset($request->checkLines) ? $request->checkLines : ''; // on
|
||||||
|
|
||||||
if (! empty($wHArr) && $cO != '' && $reportPeriod != '') {
|
if (count($wHArr) > 0 && $cO != '' && $reportPeriod != '') {
|
||||||
switch ($reportPeriod) {
|
switch ($reportPeriod) {
|
||||||
case 'year':
|
case 'year':
|
||||||
// Set Dates based on reportPeriod type
|
// Set Dates based on reportPeriod type
|
||||||
@@ -160,7 +160,7 @@ class execSummaryController extends Controller
|
|||||||
Log::error($th);
|
Log::error($th);
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.execSummary', ['IC670M' => $iC670M, 'WHDDA' => $wHDDA]);
|
return view('m3::liberty-theme.pages.execSummary', compact('IC670M', 'WHDDA'));
|
||||||
// ,'ICM688M2',,'COMPANY','PLANT','WHS','reportDate'
|
// ,'ICM688M2',,'COMPANY','PLANT','WHS','reportDate'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class execSummaryLineController extends Controller
|
|||||||
$checkWeight = isset($request->checkWeight) ? $request->checkWeight : ''; // on
|
$checkWeight = isset($request->checkWeight) ? $request->checkWeight : ''; // on
|
||||||
$checkLines = isset($request->checkLines) ? $request->checkLines : ''; // on
|
$checkLines = isset($request->checkLines) ? $request->checkLines : ''; // on
|
||||||
|
|
||||||
if (! empty($wHArr) && $cO != '' && $reportPeriod != '') {
|
if (count($wHArr) > 0 && $cO != '' && $reportPeriod != '') {
|
||||||
switch ($reportPeriod) {
|
switch ($reportPeriod) {
|
||||||
case 'year':
|
case 'year':
|
||||||
// Set Dates based on reportPeriod type
|
// Set Dates based on reportPeriod type
|
||||||
@@ -199,7 +199,7 @@ class execSummaryLineController extends Controller
|
|||||||
Log::error($th);
|
Log::error($th);
|
||||||
}
|
}
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.execSummaryLine', ['IC670M' => $iC670M, 'WHDDA' => $wHDDA]);
|
return view('m3::liberty-theme.pages.execSummaryLine', compact('IC670M', 'WHDDA'));
|
||||||
// ,'ICM688M2',,'COMPANY','PLANT','WHS','reportDate'
|
// ,'ICM688M2',,'COMPANY','PLANT','WHS','reportDate'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class palletQtyController extends Controller
|
|||||||
$iC670M = Schema::connection($connection)->hasTable('ic670m')
|
$iC670M = Schema::connection($connection)->hasTable('ic670m')
|
||||||
? DB::connection($connection)->table('ic670m')->where('WDCO', $co)->where('WDPL', $plant)->where('WDWHS', $whs)->get() : collect();
|
? DB::connection($connection)->table('ic670m')->where('WDCO', $co)->where('WDPL', $plant)->where('WDWHS', $whs)->get() : collect();
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.palletQty', ['ICM709M' => $iCM709M, 'IC670M' => $iC670M, 'power_user' => $power_user]);
|
return view('m3::liberty-theme.pages.palletQty', compact('ICM709M', 'IC670M', 'power_user'));
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -38,6 +38,7 @@ class palletQtyController extends Controller
|
|||||||
|
|
||||||
// Insert record to ICM709M
|
// Insert record to ICM709M
|
||||||
// var_dump($request);
|
// var_dump($request);
|
||||||
|
// console.log($request);
|
||||||
// Verify record does not already exist in ICM709M
|
// Verify record does not already exist in ICM709M
|
||||||
$icm709m = DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M
|
$icm709m = DB::connection(config('m3.connection', 'pgsql'))->select("select count(*) as COUNT1 from ICM709M
|
||||||
where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'");
|
where AT9CO='$request->AT9CO' and AT9PLT='$request->AT9PLT' and AT9WHS='$request->AT9WHS' and AT9PART='$request->AT9PART'");
|
||||||
@@ -63,6 +64,7 @@ class palletQtyController extends Controller
|
|||||||
|
|
||||||
// Insert record to ICM709M
|
// Insert record to ICM709M
|
||||||
// var_dump($request);
|
// var_dump($request);
|
||||||
|
// console.log($request);
|
||||||
// Verify record does not already exist in ICM709M
|
// Verify record does not already exist in ICM709M
|
||||||
// DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY)
|
// DB::connection(config('m3.connection', 'pgsql'))->insert("insert into ICM709M (AT9CO, AT9PLT, AT9WHS, AT9PART, AT9QTY)
|
||||||
// values ('$request->AT9CO', '$request->AT9PLT', '$request->AT9WHS', '$request->AT9PART', '$request->AT9QTY')");
|
// values ('$request->AT9CO', '$request->AT9PLT', '$request->AT9WHS', '$request->AT9PART', '$request->AT9QTY')");
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ class pendingClosureController extends Controller
|
|||||||
|
|
||||||
return view(
|
return view(
|
||||||
'm3::liberty-theme.pages.pendingClosure',
|
'm3::liberty-theme.pages.pendingClosure',
|
||||||
['ICM705M1' => $iCM705M1, 'ICM698Ma' => $iCM698Ma, 'ICM699M' => $iCM699M, 'user' => $user, 'request' => $request, 'unprocessedArr' => $unprocessedArr, 'ICM699Ma' => $iCM699Ma],
|
compact('ICM705M1', 'ICM698Ma', 'ICM699M', 'user', 'request', 'unprocessedArr', 'ICM699Ma'),
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class sentinelController extends Controller
|
|||||||
->where('AYSTATUS', '')
|
->where('AYSTATUS', '')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$allowDeletion = ! empty($iCM695M1Sel->AYSENTPKR);
|
$allowDeletion = isset($iCM695M1Sel->AYSENTPKR) ? ($iCM695M1Sel->AYSENTPKR != '' ? true : false) : false;
|
||||||
|
|
||||||
if ($allowDeletion) {
|
if ($allowDeletion) {
|
||||||
$timestamp = date('Y-m-d H:i:s.u');
|
$timestamp = date('Y-m-d H:i:s.u');
|
||||||
@@ -33,13 +33,13 @@ class sentinelController extends Controller
|
|||||||
$time1 = date('His');
|
$time1 = date('His');
|
||||||
|
|
||||||
// Delete Records from ICM695M1 And ICM695M2
|
// Delete Records from ICM695M1 And ICM695M2
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm695m1')
|
$iCM695M1Del = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m1')
|
||||||
->where('AYINTBOX', $aYINTBOX)
|
->where('AYINTBOX', $aYINTBOX)
|
||||||
->where('AYCO', $aYCO)
|
->where('AYCO', $aYCO)
|
||||||
->where('AYWHS', $aYWHS)
|
->where('AYWHS', $aYWHS)
|
||||||
->delete();
|
->delete();
|
||||||
|
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm695m2')
|
$iCM695M2Del = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m2')
|
||||||
->where('AZINTBOX', $aYINTBOX)
|
->where('AZINTBOX', $aYINTBOX)
|
||||||
->where('AZCO', $aYCO)
|
->where('AZCO', $aYCO)
|
||||||
->where('AZWHS', $aYWHS)
|
->where('AZWHS', $aYWHS)
|
||||||
@@ -49,7 +49,7 @@ class sentinelController extends Controller
|
|||||||
$insertValues = "'$iCM695M1Sel->AYCO', '$iCM695M1Sel->AYWHS', '$iCM695M1Sel->AYSENTPKR', '$iCM695M1Sel->AYMACPKR', '$iCM695M1Sel->AYONO', '$iCM695M1Sel->AYRLNO', '$iCM695M1Sel->AYSHNO', '', 'Box $aYINTBOX emptied and repacked',
|
$insertValues = "'$iCM695M1Sel->AYCO', '$iCM695M1Sel->AYWHS', '$iCM695M1Sel->AYSENTPKR', '$iCM695M1Sel->AYMACPKR', '$iCM695M1Sel->AYONO', '$iCM695M1Sel->AYRLNO', '$iCM695M1Sel->AYSHNO', '', 'Box $aYINTBOX emptied and repacked',
|
||||||
'$timestamp', '$date1', '$time1', '$aYUSER','$timestamp', '$date1', '$time1', '$aYUSER','$aYINTBOX'";
|
'$timestamp', '$date1', '$time1', '$aYUSER','$timestamp', '$date1', '$time1', '$aYUSER','$aYINTBOX'";
|
||||||
|
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->insert("INSERT INTO ICM689M
|
$iCM689MInsert = DB::connection(config('m3.connection', 'pgsql'))->insert("INSERT INTO ICM689M
|
||||||
(A7CO, A7WHS, A7SENTPKR, A7MACPKR, A7ONO, A7RLNO, A7SHNO, A7SOURCE, A7ERRMSG, A7DISRAITS, A7DISRAID, A7DISRAIT, A7DISRAIU, A7DISRESTS ,A7DISRESD ,A7DISREST ,A7DISRESU , A7SPR15A01)
|
(A7CO, A7WHS, A7SENTPKR, A7MACPKR, A7ONO, A7RLNO, A7SHNO, A7SOURCE, A7ERRMSG, A7DISRAITS, A7DISRAID, A7DISRAIT, A7DISRAIU, A7DISRESTS ,A7DISRESD ,A7DISREST ,A7DISRESU , A7SPR15A01)
|
||||||
values ($insertValues)");
|
values ($insertValues)");
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class userControlController extends Controller
|
|||||||
$iC670M = Schema::connection($connection)->hasTable('ic670m')
|
$iC670M = Schema::connection($connection)->hasTable('ic670m')
|
||||||
? DB::connection($connection)->table('ic670m')->get() : collect();
|
? DB::connection($connection)->table('ic670m')->get() : collect();
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.userControl', ['ICM428M' => $iCM428M, 'IC670M' => $iC670M, 'power_user' => $power_user, 'USER_INFO' => $uSER_INFO]);
|
return view('m3::liberty-theme.pages.userControl', compact('ICM428M', 'IC670M', 'power_user', 'USER_INFO'));
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ class userPickingStats4 extends Controller
|
|||||||
// display webpage of statistic version 4
|
// display webpage of statistic version 4
|
||||||
$request->ports = Config::get('arrays.env_ports');
|
$request->ports = Config::get('arrays.env_ports');
|
||||||
$no_data = 'N';
|
$no_data = 'N';
|
||||||
if (empty($statistic4) && $_SERVER['REQUEST_URI'] != '/userPickingStats4') {
|
if (count($statistic4) == 0 && $_SERVER['REQUEST_URI'] != '/userPickingStats4') {
|
||||||
$no_data = 'Y';
|
$no_data = 'Y';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class userProfileController extends Controller
|
|||||||
|
|
||||||
// Check if user is eligible for Profile update
|
// Check if user is eligible for Profile update
|
||||||
if (isset($iCM428M->R428US)) {
|
if (isset($iCM428M->R428US)) {
|
||||||
return view('m3::liberty-theme.pages.userProfile', ['ICM428M' => $iCM428M, 'IC670M' => $iC670M]);
|
return view('m3::liberty-theme.pages.userProfile', compact('ICM428M', 'IC670M'));
|
||||||
} else {
|
} else {
|
||||||
abort(404);
|
abort(404);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ class utilitiesContoller extends Controller
|
|||||||
// Parse PDF file and build necessary objects.
|
// Parse PDF file and build necessary objects.
|
||||||
$parser = new Parser;
|
$parser = new Parser;
|
||||||
|
|
||||||
|
// dump($pdf);
|
||||||
// $text = $pdf->getText();
|
// $text = $pdf->getText();
|
||||||
// dump("Text Only");
|
// dump("Text Only");
|
||||||
// dump($text);
|
// dump($text);
|
||||||
@@ -163,13 +164,14 @@ class utilitiesContoller extends Controller
|
|||||||
->get();
|
->get();
|
||||||
|
|
||||||
foreach ($iCM688M2SLTMP as $key => $ICM688M2SL) {
|
foreach ($iCM688M2SLTMP as $key => $ICM688M2SL) {
|
||||||
|
// $counter == 10 ? exit : '';
|
||||||
|
|
||||||
$a5MACPKR = isset($ICM688M2SL->A5MACPKR) ? $ICM688M2SL->A5MACPKR : '';
|
$a5MACPKR = isset($ICM688M2SL->A5MACPKR) ? $ICM688M2SL->A5MACPKR : '';
|
||||||
$a5SENTPKR = isset($ICM688M2SL->A5SENTPKR) ? $ICM688M2SL->A5SENTPKR : '';
|
$a5SENTPKR = isset($ICM688M2SL->A5SENTPKR) ? $ICM688M2SL->A5SENTPKR : '';
|
||||||
|
|
||||||
dump('ICM688M2 Record: ' . $a5MACPKR . '-' . $a5SENTPKR);
|
dump('ICM688M2 Record: ' . $a5MACPKR . '-' . $a5SENTPKR);
|
||||||
|
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm799m')
|
$iCM799MINS = DB::connection(config('m3.connection', 'pgsql'))->table('icm799m')
|
||||||
->where('IMDELNO', '=', $a5MACPKR)
|
->where('IMDELNO', '=', $a5MACPKR)
|
||||||
->update(['IMSENTPKR' => $a5SENTPKR]);
|
->update(['IMSENTPKR' => $a5SENTPKR]);
|
||||||
}
|
}
|
||||||
@@ -353,7 +355,7 @@ class utilitiesContoller extends Controller
|
|||||||
$packageNum++;
|
$packageNum++;
|
||||||
|
|
||||||
// Insert new Record to ICM695M3 $gs1_128_bc
|
// Insert new Record to ICM695M3 $gs1_128_bc
|
||||||
DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')
|
$iCM695M3SQLInsert = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')
|
||||||
->insert(['A2CO' => $cOMPANY, 'A2WHS' => $wHS, 'A2PLANT' => $pLANT, 'A2MACPKR' => $macpkr, 'A2GS1LABEL' => $gs1_128_bc, 'A2INTBOX' => $a2INTBOX]);
|
->insert(['A2CO' => $cOMPANY, 'A2WHS' => $wHS, 'A2PLANT' => $pLANT, 'A2MACPKR' => $macpkr, 'A2GS1LABEL' => $gs1_128_bc, 'A2INTBOX' => $a2INTBOX]);
|
||||||
|
|
||||||
Log::channel('LabelCron')->info('<<< GS1-128...End of Label Creation for Mackpkr: ' . $macpkr);
|
Log::channel('LabelCron')->info('<<< GS1-128...End of Label Creation for Mackpkr: ' . $macpkr);
|
||||||
@@ -396,7 +398,7 @@ class utilitiesContoller extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// # Insert new Record to ICM695M3 $gs1_128_bc
|
// # Insert new Record to ICM695M3 $gs1_128_bc
|
||||||
// DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')
|
// $iCM695M3SQLInsert = DB::connection(config('m3.connection', 'pgsql'))->table('icm695m3')
|
||||||
// ->insert(['A2CO'=> $cOMPANY,'A2WHS'=> $wHS,'A2MACPKR'=> $macpkr,'A2GS1LABEL'=> $gs1_128_bc]);
|
// ->insert(['A2CO'=> $cOMPANY,'A2WHS'=> $wHS,'A2MACPKR'=> $macpkr,'A2GS1LABEL'=> $gs1_128_bc]);
|
||||||
|
|
||||||
return json_encode(['result' => 'success', 'GS1File' => $gS1FileNameNoRoot]);
|
return json_encode(['result' => 'success', 'GS1File' => $gS1FileNameNoRoot]);
|
||||||
@@ -413,6 +415,7 @@ class utilitiesContoller extends Controller
|
|||||||
{
|
{
|
||||||
print_r('>>> Generate PDF');
|
print_r('>>> Generate PDF');
|
||||||
|
|
||||||
|
// $builder->setBarcodeType('gs1-128');
|
||||||
// $builder->setFilename('barcode.png');
|
// $builder->setFilename('barcode.png');
|
||||||
// $builder->setImageFormat('png');
|
// $builder->setImageFormat('png');
|
||||||
// $builder->setWidth(500);
|
// $builder->setWidth(500);
|
||||||
@@ -589,6 +592,7 @@ class utilitiesContoller extends Controller
|
|||||||
$response = $controller->processShipment($myRequest);
|
$response = $controller->processShipment($myRequest);
|
||||||
|
|
||||||
$responseData = $response->getData();
|
$responseData = $response->getData();
|
||||||
|
// $responseJSON = json_encode($responseData);
|
||||||
// dump($responseJSON);
|
// dump($responseJSON);
|
||||||
|
|
||||||
$error = isset($responseData->error) ? $responseData->error : '';
|
$error = isset($responseData->error) ? $responseData->error : '';
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class whsePerfController extends Controller
|
|||||||
|
|
||||||
$pct_array = Config::get('arrays.whsePerf_targets');
|
$pct_array = Config::get('arrays.whsePerf_targets');
|
||||||
|
|
||||||
return view('m3::liberty-theme.pages.whsePerf', ['ICM711M' => $iCM711M, 'power_user' => $power_user, 'USER_INFO' => $uSER_INFO, 'date_in' => $date_in, 'pct_array' => $pct_array]);
|
return view('m3::liberty-theme.pages.whsePerf', compact('ICM711M', 'power_user', 'USER_INFO', 'date_in', 'pct_array'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +62,7 @@ class whsePerfController extends Controller
|
|||||||
|
|
||||||
$pct_array = Config::get('arrays.whsePerf_targets');
|
$pct_array = Config::get('arrays.whsePerf_targets');
|
||||||
|
|
||||||
$html = view('m3::liberty-theme.pages.whsePerf', ['ICM711M' => $iCM711M, 'power_user' => $power_user, 'USER_INFO' => $uSER_INFO, 'date_in' => $date_in, 'pct_array' => $pct_array])->render();
|
$html = view('m3::liberty-theme.pages.whsePerf', compact('ICM711M', 'power_user', 'USER_INFO', 'date_in', 'pct_array'))->render();
|
||||||
|
|
||||||
libxml_use_internal_errors(true);
|
libxml_use_internal_errors(true);
|
||||||
$doc = new \DOMDocument;
|
$doc = new \DOMDocument;
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ class M3ServiceProvider extends ServiceProvider
|
|||||||
$commands = collect(File::allFiles($commandPath))
|
$commands = collect(File::allFiles($commandPath))
|
||||||
->map(function ($file) {
|
->map(function ($file) {
|
||||||
return 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
|
return 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
|
||||||
|
|
||||||
})
|
})
|
||||||
->filter(function ($class) {
|
->filter(function ($class) {
|
||||||
return class_exists($class);
|
return class_exists($class);
|
||||||
|
|||||||
+22
-24
@@ -1,55 +1,54 @@
|
|||||||
mode: 'absorb' # or 'increment'
|
mode: increment
|
||||||
blade-directive: version
|
blade-directive: version
|
||||||
current:
|
current:
|
||||||
label: v
|
label: v
|
||||||
major: 1
|
major: 1
|
||||||
minor: 1
|
minor: 1
|
||||||
patch: 37
|
patch: 34
|
||||||
prerelease:
|
prerelease: null
|
||||||
buildmetadata:
|
buildmetadata: null
|
||||||
commit: 100001
|
commit: 100001
|
||||||
timestamp:
|
timestamp:
|
||||||
mode: absorb
|
mode: absorb
|
||||||
year:
|
year: null
|
||||||
month:
|
month: null
|
||||||
day:
|
day: null
|
||||||
hour:
|
hour: null
|
||||||
minute:
|
minute: null
|
||||||
second:
|
second: null
|
||||||
timezone:
|
timezone: null
|
||||||
commit:
|
commit:
|
||||||
mode: absorb
|
mode: absorb
|
||||||
length: 6
|
length: 6
|
||||||
increment-by: 1
|
increment-by: 1
|
||||||
git:
|
git:
|
||||||
from: 'local' # or "remote"
|
from: local
|
||||||
commit:
|
commit:
|
||||||
local: 'git rev-parse --verify HEAD'
|
local: 'git rev-parse --verify HEAD'
|
||||||
remote: 'git ls-remote {$repository}'
|
remote: 'git ls-remote {$repository}'
|
||||||
branch: refs/heads/master
|
branch: refs/heads/master
|
||||||
repository: '' ### you can use config() to get it here: {{ config('version.git.remote.repository') }}. Do not use env()
|
repository: ''
|
||||||
version:
|
version:
|
||||||
local: 'git describe'
|
local: 'git describe'
|
||||||
remote: 'git ls-remote {$repository} | grep tags/ | grep -v {} | cut -d / -f 3 | sort --version-sort | tail -1'
|
remote: 'git ls-remote {$repository} | grep tags/ | grep -v {} | cut -d / -f 3 | sort --version-sort | tail -1'
|
||||||
matcher: '/^(?P<label>[v|V]*[er]*[sion]*)[\.|\s]*(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/'
|
matcher: '/^(?P<label>[v|V]*[er]*[sion]*)[\.|\s]*(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/'
|
||||||
timestamp:
|
timestamp:
|
||||||
local: 'git show -s --format=%ci'
|
local: 'git show -s --format=%ci'
|
||||||
remote: 'git show -s --format=%ci origin/master' ## we will have to find a better way
|
remote: 'git show -s --format=%ci origin/master'
|
||||||
format:
|
format:
|
||||||
regex:
|
regex:
|
||||||
optional_bracket: '\[(?P<prefix>.*?)(?P<spaces>\s*)(?P<delimiter>\?\=)(?P<optional>.*?)\]'
|
optional_bracket: '\[(?P<prefix>.*?)(?P<spaces>\s*)(?P<delimiter>\?\=)(?P<optional>.*?)\]'
|
||||||
label: "{$label}"
|
label: '{$label}'
|
||||||
major: "{$major}"
|
major: '{$major}'
|
||||||
minor: "{$minor}"
|
minor: '{$minor}'
|
||||||
patch: "{$patch}"
|
patch: '{$patch}'
|
||||||
prerelease: "{$prerelease}"
|
prerelease: '{$prerelease}'
|
||||||
buildmetadata: "{$buildmetadata}"
|
buildmetadata: '{$buildmetadata}'
|
||||||
commit: "{$commit}"
|
commit: '{$commit}'
|
||||||
version: 'version {$major}.{$minor}.{$patch} (commit {$commit})'
|
version: 'version {$major}.{$minor}.{$patch} (commit {$commit})'
|
||||||
version-only: 'version {$major}.{$minor}.{$patch}'
|
version-only: 'version {$major}.{$minor}.{$patch}'
|
||||||
## Bracket enclosed expressions "[.?{$variable}]" are only rendered if the ?={$variable} is filled
|
|
||||||
full: '{$version-only}[.?={$prerelease}][+?={$buildmetadata}] (commit {$commit})'
|
full: '{$version-only}[.?={$prerelease}][+?={$buildmetadata}] (commit {$commit})'
|
||||||
compact: "v{$major}.{$minor}.{$patch}-{$commit}"
|
compact: 'v{$major}.{$minor}.{$patch}-{$commit}'
|
||||||
timestamp-year: '{$timestamp.year}'
|
timestamp-year: '{$timestamp.year}'
|
||||||
timestamp-month: '{$timestamp.month}'
|
timestamp-month: '{$timestamp.month}'
|
||||||
timestamp-day: '{$timestamp.day}'
|
timestamp-day: '{$timestamp.day}'
|
||||||
@@ -59,4 +58,3 @@ format:
|
|||||||
timestamp-timezone: '{$timestamp.timezone}'
|
timestamp-timezone: '{$timestamp.timezone}'
|
||||||
timestamp-datetime: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second}'
|
timestamp-datetime: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second}'
|
||||||
timestamp-full: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second} {$timestamp.timezone}'
|
timestamp-full: '{$timestamp.year}-{$timestamp.month}-{$timestamp.day} {$timestamp.hour}:{$timestamp.minute}:{$timestamp.second} {$timestamp.timezone}'
|
||||||
## add as many formats as you need !!!!
|
|
||||||
|
|||||||
Reference in New Issue
Block a user