cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-12 09:11:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

new update

Browse Source
This commit is contained in:
Fayyazi
2019-12-17 11:42:56 +03:30
parent 9526ec80fd
commit 8cfb213b81
29 changed files with 373 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BarCodeController.php
+5 -6
View File
@@ -14,12 +14,11 @@ class BarCodeController extends Controller
{
if($Number != "undefined")
{
$URL = 'https://www.cssd-doc.com/Show/'.$Type.'/'.$Number;
$Barcode = DNS1D::getBarcodePNG($Number, "C128");
$QRCode = DNS2D::getBarcodePNG($Number, "QRCODE");
if ($Type == 'Cycle') {
$Cycle = Cycle::where('unique_id', $Number)->first();
$Number = $Cycle->id;
}
$QRCode = DNS2D::getBarcodePNG($URL, "QRCODE");
return \MessageResponse::data(['Barcode' => 'data:image/png;base64,' .$Barcode, 'QRCode' => 'data:image/png;base64,' .$QRCode, 'ShowLink' => 'Show/'.$Type.'/'.$Number]);
}
}
@@ -28,7 +27,7 @@ class BarCodeController extends Controller
if($TestResult)
{
$URL = 'https://www.cssd-doc.com/ShowTestResult/'.$TestResult->id;
$QRCode = DNS2D::getBarcodePNG($URL, "QRCODE");
$QRCode = DNS2D::getBarcodePNG($URL, "QRCODE");
return \MessageResponse::data(['QRCode' => 'data:image/png;base64,' .$QRCode]);
}
app/Http/Controllers/LabelController.php
+2 -2
View File
@@ -70,7 +70,7 @@ class LabelController extends Controller
'package_id' => $request->package_id
];
$LabelObj = Label::create($LabelData);
return \MessageResponse::success(trans('messages.success'));
return \MessageResponse::success(trans('messages.success'), null, $LabelObj);
}
public function edit(Label $Label)
{
@@ -81,7 +81,7 @@ class LabelController extends Controller
public function update(Request $request, Label $Label)
{
$Label->update($request->all());
return \MessageResponse::success(trans('messages.success'));
return \MessageResponse::success(trans('messages.success'), null, $Label);
}
public function destroy(Label $Label)
{
app/Http/Controllers/PackageController.php
+1 -1
View File
@@ -52,7 +52,7 @@ class PackageController extends Controller
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$PackageData = [
'name' => $request->name,
'unique_id' => $UniqueID,
'unique_id' => $request->unique_id,
'note' => $request->note,
'user_id' => auth('api')->user()->id,
'verified' => 'NotVerified',
app/Http/Requests/StorePackageRequest.php
+4 -3
View File
@@ -25,7 +25,8 @@ class StorePackageRequest extends FormRequest
switch ($this->method()) {
case 'POST': {
return [
'name' => 'required|max:100|unique:packages',
'name' => 'required|max:250|unique:packages',
'unique_id' => 'required|max:250|unique:packages',
'note' => 'nullable',
'items' => 'required',
];
@@ -35,8 +36,8 @@ class StorePackageRequest extends FormRequest
case 'PATCH': {
$Package = $this->route('Package');
return [
'name' => 'required|max:100|unique:packages,id,'.$Package->id,
'unique_id' => 'required|max:100|unique:packages,id,'.$Package->id,
'name' => 'required|max:250|unique:packages,id,'.$Package->id,
'unique_id' => 'required|max:250|unique:packages,id,'.$Package->id,
'note' => 'nullable',
'items' => 'required',
];