diff --git a/Modules/M3/Http/Controllers/API/M3Controller.php b/Modules/M3/Http/Controllers/API/M3Controller.php index de8f9031..6b809b5f 100644 --- a/Modules/M3/Http/Controllers/API/M3Controller.php +++ b/Modules/M3/Http/Controllers/API/M3Controller.php @@ -45,7 +45,10 @@ class M3Controller extends Controller dd('Index'); } - public function create() {} + public function create() + { + // This API controller does not expose a create form. + } public function store(Request $request) { @@ -147,7 +150,6 @@ class M3Controller extends Controller $CarrierCode = isset($jsonFile['CarrierCode']) ? $jsonFile['CarrierCode'] : ''; $ShipmentPONumber = isset($jsonFile['ShipmentPONumber']) ? $jsonFile['ShipmentPONumber'] : ''; // CustPo $ShipTerms = isset($jsonFile['ShipTerms']) ? $jsonFile['ShipTerms'] : ''; - // $ExchangeRate = isset($jsonFile["ExchangeRate"]) ? $jsonFile["ExchangeRate"] : ''; $OrderClass = isset($jsonFile['OrderClass']) ? $jsonFile['OrderClass'] : ''; $GS1Label = isset($jsonFile['GS1-128Label']) ? $jsonFile['GS1-128Label'] : '0'; $CurrencyExchangeRate = isset($jsonFile['CurrencyExchangeRate']) ? $jsonFile['CurrencyExchangeRate'] : ''; @@ -342,7 +344,6 @@ class M3Controller extends Controller 'ShipmentPONumber' => $ShipmentPONumber, 'ShipmentPOLine' => $ShipmentPOLine, 'ShipTerms' => $ShipTerms, - 'ExchangeRate' => $ExchangeRate, 'OrderClass' => $OrderClass, 'LocationType' => $LocationType, 'PallSize' => $PallSize, @@ -369,17 +370,16 @@ class M3Controller extends Controller // Sanitize String $fieldValue = Helper::sanityzeString($fieldValues[$key] ?? ''); // Check Var Types & Length - $LengthTest = Helper::checkLength($fieldValue, $value[1], $value[2]); + $lengthTest = Helper::checkLength($fieldValue, $value[1], $value[2]); - if (! $LengthTest[413] || ! $LengthTest[411] || ! $LengthTest[417]) { - // Log::error($key .' :: '. $value[0].' :: '. $value[1] .' JSONF: '.$$keyVar .' Type: '.$value[2] ); - if (! $LengthTest[413]) { + if (! $lengthTest[413] || ! $lengthTest[411] || ! $lengthTest[417]) { + if (! $lengthTest[413]) { $message[] = ['code' => '413', 'status' => 'error', 'message' => 'Field: ' . $key . ' is larger then expected']; } - if (! $LengthTest[411]) { + if (! $lengthTest[411]) { $message[] = ['code' => '411', 'status' => 'error', 'message' => 'Field: ' . $key . ' is empty']; } - if (! $LengthTest[417]) { + if (! $lengthTest[417]) { $message[] = ['code' => '417', 'status' => 'error', 'message' => 'Field: ' . $key . 'type is different then Expected type: ' . $value[2]]; } diff --git a/Modules/M3/Http/Controllers/utilitiesContoller.php b/Modules/M3/Http/Controllers/utilitiesContoller.php index d8e8c843..2789374c 100644 --- a/Modules/M3/Http/Controllers/utilitiesContoller.php +++ b/Modules/M3/Http/Controllers/utilitiesContoller.php @@ -563,7 +563,6 @@ class utilitiesContoller extends Controller // // Check if the PDF was generated correctly // if (!file_exists($tempPdfPath) || filesize($tempPdfPath) === 0) { - // throw new Exception('PDF generation failed.'); // } // Create an Imagick instance