Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
cda20be
sales return: update email template
goen94 Oct 23, 2022
a64fc30
sales return: update email template
goen94 Oct 23, 2022
f187834
middleware: update check default branch
goen94 Nov 11, 2022
97d9625
docker compose add phpmyadmin
bayuramadhans Nov 13, 2022
abcba8a
fix init project
bayuramadhans Nov 13, 2022
1a6ec67
purchase request - test case
bayuramadhans Nov 23, 2022
4b9ccee
self host masbug flysystem gdrive adapter
christhofer Dec 2, 2022
487788c
Merge pull request #423 from christhofer/gradin
martiendt Dec 2, 2022
157c147
Merge branch 'point-red:alpha1' into alpha1
goen94 Dec 5, 2022
6d93f53
sales return: update tdd
goen94 Dec 5, 2022
5d234b6
purchase request - update test case
bayuramadhans Dec 8, 2022
9ff509a
sales return: update tdd
goen94 Dec 8, 2022
50147bf
purchase request - update test case
bayuramadhans Dec 8, 2022
56aa45a
update sales return
goen94 Dec 15, 2022
c47cc2c
sales return: update tdd
goen94 Dec 16, 2022
f4490c4
Create LICENSE
martiendt Dec 21, 2022
c33608e
Merge pull request #414 from gunadi-w/alpha1
martiendt Dec 21, 2022
d9e20bf
sales return: remove auto send email
goen94 Dec 29, 2022
1818b2f
sales return: remove auto send email
goen94 Dec 29, 2022
bcaae26
Merge pull request #431 from gunadi-w/alpha1
martiendt Jan 20, 2023
a414587
sales return: fix email from
goen94 Jan 30, 2023
aae6932
sales return: update request approval query
goen94 Jan 31, 2023
ebc65bb
Merge pull request #432 from gunadi-w/alpha1
martiendt Jan 31, 2023
f165e26
sales return: get mail url from referer
goen94 Feb 4, 2023
aab8ba1
sales return: get mail url from referer
goen94 Feb 4, 2023
0a5546d
Merge branch 'alpha1' of https://github.com/gunadi-w/point into alpha1
goen94 Feb 4, 2023
39ead67
Merge branch 'point-red:alpha1' into alpha1
goen94 Feb 4, 2023
075f90b
Merge pull request #435 from gunadi-w/alpha1
martiendt Feb 6, 2023
493ef07
fix
martiendt May 11, 2023
e44c065
remove limit
martiendt May 24, 2023
58cfd68
Merge remote-tracking branch 'upstream/alpha1' into alpha1
bayuramadhans May 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2022 PointHub

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 4 additions & 0 deletions app/Console/Commands/NewCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ public function handle()
return;
}

ini_set('memory_limit', '4095M');
ini_set('max_execution_time', '0');

$dbName = $this->argument('database_name') ?? env('DB_DATABASE');

$this->line('create '.$dbName.' database');
Expand Down Expand Up @@ -100,5 +103,6 @@ public function handle()
$projectUser->save();

Artisan::call('tenant:database:reset', ['project_code' => 'dev']);
$this->line('process completed');
}
}
8 changes: 8 additions & 0 deletions app/Exceptions/ApiExceptionHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ public function apiExceptions($request, Throwable $exception)
], 400);
}

/* Handle if contain constraint violation but not instanceof QueryExcepetion */
if (strpos($exception->getMessage(), 'Integrity constraint violation') !== false) {
return response()->json([
'code' => 400,
'message' => 'Duplicate data entry',
], 400);
}

/* Handle server error or library error */
if ($exception->getCode() >= 500 || ! $exception->getCode()) {
return response()->json([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

use App\Model\UserActivity;
use App\Model\Sales\SalesReturn\SalesReturn;
use Exception;
use App\Model\Sales\SalesInvoice\SalesInvoiceReference;
use App\Model\Accounting\Journal;
use App\Model\Inventory\Inventory;

class SalesReturnApprovalByEmailController extends Controller
{
Expand All @@ -37,12 +41,31 @@ public function approve(Request $request)

$result = DB::connection('tenant')->transaction(function () use ($request) {
$salesReturns = SalesReturn::whereIn('id', $request->ids)->get();

foreach ($salesReturns as $salesReturn) {
try {
if ($salesReturn->form->approval_status === 1 && $salesReturn->form->cancellation_status === null) {
throw new Exception('form '.$salesReturn->form->number.' already approved', 422);
}
} catch (\Throwable $th) {
return response_error($th);
}
}

foreach ($salesReturns as $salesReturn) {
$form = $salesReturn->form;

// approve cancellation form
if ($form->cancellation_status === 0 && is_null($form->close_status)) {
if($form->approval_status === 1) {
SalesReturn::updateInvoiceQuantity($salesReturn, 'revert');
Inventory::where('form_id', $salesReturn->form->id)->delete();
Journal::where('form_id', $salesReturn->form->id)->orWhere('form_id_reference', $salesReturn->form->id)->delete();
SalesInvoiceReference::where('sales_invoice_id', $salesReturn->sales_invoice_id)
->where('referenceable_id', $salesReturn->id)
->where('referenceable_type', 'SalesReturn')->delete();
}

$form->cancellation_approval_by = $request->approver_id;
$form->cancellation_approval_at = now();
$form->cancellation_status = 1;
Expand All @@ -68,6 +91,7 @@ public function approve(Request $request)
SalesReturn::updateJournal($salesReturn);
SalesReturn::updateInventory($salesReturn->form, $salesReturn);
SalesReturn::updateInvoiceQuantity($salesReturn, 'update');
SalesReturn::updateSalesInvoiceReference($salesReturn);

$form->fireEventApprovedByEmail();

Expand All @@ -88,6 +112,7 @@ public function approve(Request $request)
*/
public function reject(Request $request)
{
$validated = $request->validate([ 'reason' => 'required|max:255' ]);
$this->request = $request;

$result = DB::connection('tenant')->transaction(function () use ($request) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use App\Model\Form;
use App\Model\UserActivity;
use App\Model\Sales\SalesReturn\SalesReturn;

use Exception;
use App\Mail\Sales\SalesReturnApprovalRequest;

class SalesReturnApprovalController extends Controller
Expand All @@ -31,12 +31,6 @@ public function index(Request $request)
$salesReturns = SalesReturn::joins($salesReturns, $request->get('join'))
->whereNull(Form::$alias . '.edited_number')
->where(Form::$alias . '.close_status', 0)
->orWhere(function ($query) {
$query
->where(Form::$alias . '.cancellation_status', 0)
->whereNull(Form::$alias . '.close_status')
->whereNull(Form::$alias . '.edited_number');
})
->orWhere(function ($query) {
$query
->where(Form::$alias . '.approval_status', 0)
Expand Down Expand Up @@ -68,27 +62,38 @@ public function index(Request $request)
*/
public function approve(Request $request, $id)
{

$result = DB::connection('tenant')->transaction(function () use ($id) {
$salesReturn = SalesReturn::findOrFail($id);
$salesReturn->checkQuantity($salesReturn->items);

$form = $salesReturn->form;
$form->approval_by = auth()->user()->id;
$form->approval_at = now();
$form->approval_status = 1;
$form->save();

SalesReturn::updateJournal($salesReturn);
SalesReturn::updateInventory($salesReturn->form, $salesReturn);
SalesReturn::updateInvoiceQuantity($salesReturn, 'update');
try {
$salesReturn = SalesReturn::findOrFail($id);
$salesReturn->checkQuantity($salesReturn->items);

$form = $salesReturn->form;

if ($form->approval_status === 1) {
throw new Exception('form already approved', 422);
}

$form->approval_by = auth()->user()->id;
$form->approval_at = now();
$form->approval_status = 1;
$form->save();

SalesReturn::updateJournal($salesReturn);
SalesReturn::updateInventory($salesReturn->form, $salesReturn);
SalesReturn::updateInvoiceQuantity($salesReturn, 'update');
SalesReturn::updateSalesInvoiceReference($salesReturn);


$form->fireEventApproved();

} catch (\Throwable $th) {
return response_error($th);
}

$form->fireEventApproved();

$salesReturn = SalesReturn::findOrFail($id);
$salesReturn->load('form');
return new ApiResource($salesReturn);
});


return $result;
}
Expand All @@ -100,7 +105,7 @@ public function approve(Request $request, $id)
*/
public function reject(Request $request, $id)
{
$validated = $request->validate([ 'reason' => 'required' ]);
$validated = $request->validate([ 'reason' => 'required|max:255' ]);

$result = DB::connection('tenant')->transaction(function () use ($request, $validated, $id) {
$salesReturn = SalesReturn::findOrFail($id);
Expand All @@ -112,6 +117,8 @@ public function reject(Request $request, $id)

$salesReturn->form->fireEventRejected();

$salesReturn = SalesReturn::findOrFail($id);
$salesReturn->load('form');
return new ApiResource($salesReturn);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use App\Model\Sales\SalesReturn\SalesReturn;
use App\Model\Accounting\Journal;
use App\Model\Inventory\Inventory;
use App\Model\Sales\SalesInvoice\SalesInvoiceReference;

class SalesReturnCancellationApprovalController extends Controller
{
Expand All @@ -32,13 +33,18 @@ public function approve(Request $request, $id)
SalesReturn::updateInvoiceQuantity($salesReturn, 'revert');
Inventory::where('form_id', $salesReturn->form->id)->delete();
Journal::where('form_id', $salesReturn->form->id)->orWhere('form_id_reference', $salesReturn->form->id)->delete();
SalesInvoiceReference::where('sales_invoice_id', $salesReturn->sales_invoice_id)
->where('referenceable_id', $salesReturn->id)
->where('referenceable_type', 'SalesReturn')->delete();
}

$salesReturn->form->cancellation_approval_by = auth()->user()->id;
$salesReturn->form->cancellation_approval_at = now();
$salesReturn->form->cancellation_status = 1;
$salesReturn->form->save();

$salesReturn = SalesReturn::findOrFail($salesReturn->id);
$salesReturn->load('form');
$salesReturn->form->fireEventCancelApproved();
} catch (\Throwable $th) {
return response_error($th);
Expand All @@ -57,7 +63,7 @@ public function approve(Request $request, $id)
*/
public function reject(Request $request, $id)
{
$request->validate([ 'reason' => 'required ']);
$request->validate([ 'reason' => 'required|max:255']);

$salesReturn = SalesReturn::findOrFail($id);

Expand All @@ -74,6 +80,8 @@ public function reject(Request $request, $id)
$salesReturn->form->cancellation_status = -1;
$salesReturn->form->save();

$salesReturn = SalesReturn::findOrFail($salesReturn->id);
$salesReturn->load('form');
$salesReturn->form->fireEventCancelRejected();
} catch (\Throwable $th) {
return response_error($th);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use Illuminate\Support\Facades\DB;
use App\Http\Requests\Sales\SalesReturn\SalesReturn\StoreSalesReturnRequest;
use App\Http\Requests\Sales\SalesReturn\SalesReturn\UpdateSalesReturnRequest;
use App\Http\Requests\Sales\SalesReturn\SalesReturn\DeleteSalesReturnRequest;
use Exception;

class SalesReturnController extends Controller
Expand Down Expand Up @@ -45,7 +46,6 @@ public function store(StoreSalesReturnRequest $request)
$salesReturn = SalesReturn::create($request->all());
$salesReturn
->load('form')
->load('customer')
->load('items');

return new ApiResource($salesReturn);
Expand Down Expand Up @@ -127,5 +127,7 @@ public function destroy(Request $request, $id)
$salesReturn->requestCancel($request);

return response()->json([], 204);


}
}
4 changes: 2 additions & 2 deletions app/Http/Middleware/TenantModuleAccessMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ public function handle($request, Closure $next, $module)
throw new UnauthorizedException();
}

$this->_hasDefaultBranch();

if ($this->action === 'read') {
return $next($request);
}

$this->_hasDefaultBranch();

$this->_hasDefaultWarehouse();

$this->_isWarehouseBranchAsDefault();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace App\Http\Requests\Sales\SalesReturn\SalesReturn;

use App\Http\Requests\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;

class DeleteSalesReturnRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$deleteRule = [
'reason' => 'required|max:255',
];

return array_merge($deleteRule);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?php

namespace App\Http\Requests\Sales\SalesReturn\SalesReturn;

use App\Http\Requests\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;

class RejectSalesReturnRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}

/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$rejectRule = [
'reason' => 'required|max:255',
];

return array_merge($rejectRule);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,22 @@ public function rules()

$rulesSalesReturn = [
'sales_invoice_id' => ValidationRule::foreignKey('sales_invoices'),

'items' => 'required|array',
'sub_total' => 'required|numeric|min:0',
'tax_base' => 'required|numeric|min:0',
'type_of_tax' => ValidationRule::typeOfTax(),
'tax' => 'required|numeric|min:0',
'amount' => 'required|numeric|min:0',
];

$rulesSalesReturnItems = [
'items.*.sales_invoice_item_id' => ValidationRule::foreignKey('sales_invoice_items'),
'items.*.item_name' => 'required|string',
'items.*.quantity' => ValidationRule::quantity(),
'items.*.quantity_sales' => ValidationRule::quantity(),
'items.*.unit' => ValidationRule::unit(),
'items.*.converter' => ValidationRule::converter(),
'items.*.total' => 'required|numeric|min:0',
];

return array_merge($rulesForm, $rulesSalesReturn, $rulesSalesReturnItems);
Expand Down
Loading