Skip to content

asd #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hartanto119 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

asd #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bae8b8e
Merge pull request #1 from HugoYaw22/main
Hartanto119 Apr 21, 2022
1ab13b4
asd
Hartanto119 Apr 21, 2022
5778151
asd
Hartanto119 Apr 22, 2022
0bf2671
asd
Hartanto119 Apr 24, 2022
1388f26
asd
Hartanto119 Apr 25, 2022
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
6 changes: 3 additions & 3 deletions app/Http/Controllers/CommonController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public function getCountries()
public function getStatus()
{
return [
['name' => 'components.dropdown.values.statusDDL.active', 'code' => '1'],
['name' => 'components.dropdown.values.statusDDL.inactive', 'code' => '0'],
['name' => 'components.dropdown.values.statusDDL.active', 'code' => 'ACTIVE'],
['name' => 'components.dropdown.values.statusDDL.inactive', 'code' => 'INACTIVE'],
];
}

Expand All @@ -35,4 +35,4 @@ public function getRandGenerator(Request $request)
{

}
}
}
5 changes: 1 addition & 4 deletions app/Http/Requests/CapitalGroupRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Illuminate\Foundation\Http\FormRequest;
use Vinkla\Hashids\Facades\Hashids;

class BranchRequest extends FormRequest
class CapitalGroupRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
Expand All @@ -27,9 +27,6 @@ public function authorize()
*/
public function rules()
{
$investorId = $this->has('investor_id') ? Hashids::decode($this['investor_id'])[0]:null;
$groupId = $this->has('group_id') ? Hashids::decode($this['group_id'])[0]:null;
$cashId = $this->has('cash_id') ? Hashids::decode($this['cash_id'])[0]:null;

$nullableArr = [
'date' => 'nullable',
Expand Down
7 changes: 4 additions & 3 deletions app/Http/Requests/CapitalRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ public function rules()
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'ref_number' => 'required|integer|digits_between:1,255',
'group_id' => 'required',
'capital_status' => 'required',
'amount' => 'required|integer|digits_between:1,29',
];
return array_merge($rules_store, $nullableArr);
case 'update':
Expand Down
39 changes: 29 additions & 10 deletions app/Http/Requests/CustomerGroupRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,47 @@ public function rules()
$companyId = $this->has('company_id') ? Hashids::decode($this['company_id'])[0]:null;

$nullableArr = [
'address' => 'nullable',
'city' => 'nullable',
'contact' => 'nullable',
'sell_at_cost' => 'nullable',
'round_on' => 'nullable',
'remarks' => 'nullable',
];

$currentRouteMethod = $this->route()->getActionMethod();
switch($currentRouteMethod) {
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'name' => 'required|min:3|max:255',
'max_open_invoice' => 'required|integer|digits_between:1,11',
'max_outstanding_invoice' => 'required|integer|digits_between:1,16',
'max_invoice_age' => 'required|integer|digits_between:1,11',
'payment_term' => 'required|integer|digits_between:1,11',
'selling_point' => 'required|integer|digits_between:1,8',
'selling_point_multiple' => 'required|integer|digits_between:1,16',
'price_markup_percent' => 'required|integer|digits_between:1,16',
'price_markup_nominal' => 'required|integer|digits_between:1,16',
'price_markdown_percent' => 'required|integer|digits_between:1,16',
'price_markdown_nominal' => 'required|integer|digits_between:1,16',
'round_digit' => 'required|integer|digits_between:1,11',
'cash_id' => ['required', 'bail'],
];
return array_merge($rules_store, $nullableArr);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
$rules_update = [
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'name' => 'required|min:3|max:255',
'max_open_invoice' => 'required|integer|digits_between:1,11',
'max_outstanding_invoice' => 'required|integer|digits_between:1,16',
'max_invoice_age' => 'required|integer|digits_between:1,11',
'payment_term' => 'required|integer|digits_between:1,11',
'selling_point' => 'required|integer|digits_between:1,8',
'selling_point_multiple' => 'required|integer|digits_between:1,16',
'price_markup_percent' => 'required|integer|digits_between:1,16',
'price_markup_nominal' => 'required|integer|digits_between:1,16',
'price_markdown_percent' => 'required|integer|digits_between:1,16',
'price_markdown_nominal' => 'required|integer|digits_between:1,16',
'round_digit' => 'required|integer|digits_between:1,11',
'cash_id' => ['required', 'bail'],
];
return array_merge($rules_update, $nullableArr);
default:
Expand Down
19 changes: 15 additions & 4 deletions app/Http/Requests/CustomerRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,34 @@ public function rules()
'city' => 'nullable',
'contact' => 'nullable',
'remarks' => 'nullable',
'is_member' => 'nullable',
'zone' => 'nullable',
'tax_id' => 'nullable',
];

$currentRouteMethod = $this->route()->getActionMethod();
switch($currentRouteMethod) {
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'customer_group_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'name' => 'required|min:3|max:255',
'max_open_invoice' => 'required|integer|digits_between:1,11',
'max_outstanding_invoice' => 'required|numeric|min:0|max:999999999999999',
'max_invoice_age' => 'required|integer|digits_between:1,11',
'payment_term' => 'required|integer|digits_between:1,11',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_store, $nullableArr);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
'customer_group_id' => ['required', 'bail'],
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'name' => 'required|min:3|max:255',
'max_open_invoice' => 'required|integer|digits_between:1,11',
'max_outstanding_invoice' => 'required|numeric|min:0|max:999999999999999',
'max_invoice_age' => 'required|integer|digits_between:1,11',
'payment_term' => 'required|integer|digits_between:1,11',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_update, $nullableArr);
Expand Down
13 changes: 2 additions & 11 deletions app/Http/Requests/ExpenseGroupRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,22 @@ public function rules()
{
$companyId = $this->has('company_id') ? Hashids::decode($this['company_id'])[0]:null;

$nullableArr = [
'address' => 'nullable',
'city' => 'nullable',
'contact' => 'nullable',
'remarks' => 'nullable',
];

$currentRouteMethod = $this->route()->getActionMethod();
switch($currentRouteMethod) {
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_store, $nullableArr);
return array_merge($rules_store);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_update, $nullableArr);
return array_merge($rules_update);
default:
return [
'' => 'required'
Expand Down
20 changes: 13 additions & 7 deletions app/Http/Requests/ExpenseRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,34 @@ public function rules()
$companyId = $this->has('company_id') ? Hashids::decode($this['company_id'])[0]:null;

$nullableArr = [
'address' => 'nullable',
'city' => 'nullable',
'contact' => 'nullable',
'remarks' => 'nullable',
'posted' => 'nullable',
];

$currentRouteMethod = $this->route()->getActionMethod();
switch($currentRouteMethod) {
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'branch_id' => ['required', 'bail'],
'expense_group_id' => ['required', 'bail'],
'cash_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'payment_term_type' => 'required|integer|digits_between:1,11',
'amount' => 'required|integer|digits_between:1,19',
'amount_owed' => 'required|integer|digits_between:1,19',
];
return array_merge($rules_store, $nullableArr);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
'branch_id' => ['required', 'bail'],
'expense_group_id' => ['required', 'bail'],
'cash_id' => ['required', 'bail'],
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'payment_term_type' => 'required|integer|digits_between:1,11',
'amount' => 'required|integer|digits_between:1,19',
'amount_owed' => 'required|integer|digits_between:1,19',
];
return array_merge($rules_update, $nullableArr);
default:
Expand Down
13 changes: 2 additions & 11 deletions app/Http/Requests/IncomeGroupRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,22 @@ public function rules()
{
$companyId = $this->has('company_id') ? Hashids::decode($this['company_id'])[0]:null;

$nullableArr = [
'address' => 'nullable',
'city' => 'nullable',
'contact' => 'nullable',
'remarks' => 'nullable',
];

$currentRouteMethod = $this->route()->getActionMethod();
switch($currentRouteMethod) {
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_store, $nullableArr);
return array_merge($rules_store);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_update, $nullableArr);
return array_merge($rules_update);
default:
return [
'' => 'required'
Expand Down
20 changes: 13 additions & 7 deletions app/Http/Requests/IncomeRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,34 @@ public function rules()
$companyId = $this->has('company_id') ? Hashids::decode($this['company_id'])[0]:null;

$nullableArr = [
'address' => 'nullable',
'city' => 'nullable',
'contact' => 'nullable',
'remarks' => 'nullable',
'posted' => 'nullable',
];

$currentRouteMethod = $this->route()->getActionMethod();
switch($currentRouteMethod) {
case 'store':
$rules_store = [
'company_id' => ['required', 'bail'],
'branch_id' => ['required', 'bail'],
'income_group_id' => ['required', 'bail'],
'cash_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'payment_term_type' => 'required|integer|digits_between:1,11',
'amount' => 'required|integer|digits_between:1,19',
'amount_owed' => 'required|integer|digits_between:1,19',
];
return array_merge($rules_store, $nullableArr);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
'branch_id' => ['required', 'bail'],
'income_group_id' => ['required', 'bail'],
'cash_id' => ['required', 'bail'],
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
'payment_term_type' => 'required|integer|digits_between:1,11',
'amount' => 'required|integer|digits_between:1,19',
'amount_owed' => 'required|integer|digits_between:1,19',
];
return array_merge($rules_update, $nullableArr);
default:
Expand Down
7 changes: 4 additions & 3 deletions app/Http/Requests/InvestorRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,16 @@ public function rules()
$rules_store = [
'company_id' => ['required', 'bail'],
'code' => ['required', 'max:255', new uniqueCode(table: 'branches', companyId: $companyId)],
'name' => 'required|max:255',
'name' => 'required|min:3|max:255',
'tax_number' => 'required|integer|digits_between:1,255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_store, $nullableArr);
case 'update':
$rules_update = [
'company_id' => ['required', 'bail'],
'code' => new uniqueCode(table: 'branches', companyId: $companyId, exceptId: $this->route('id')),
'name' => 'required|max:255',
'name' => 'required|min:3|max:255',
'tax_number' => 'required|integer|digits_between:1,255',
'status' => ['required', new validDropDownValue('ACTIVE_STATUS')]
];
return array_merge($rules_update, $nullableArr);
Expand Down
24 changes: 24 additions & 0 deletions app/Http/Resources/CapitalGroupResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?php

namespace App\Http\Resources;

use Illuminate\Http\Resources\Json\JsonResource;

class CapitalGroupResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
return [
'hId' => $this->hId,
'company' => new CompanyResource($this->company),
'code' => $this->code,
'name' => $this->name,
];
}
}
30 changes: 30 additions & 0 deletions app/Http/Resources/CapitalResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace App\Http\Resources;

use Illuminate\Http\Resources\Json\JsonResource;

class CapitalResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
*/
public function toArray($request)
{
return [
'hId' => $this->hId,
'company' => new CompanyResource($this->company),
'ref_number' => $this->ref_number,
'investor' => new InvestorResource($this->investor),
'group' => new CustomerGroupResource($this->group),
'cash' => new CashResource($this->cash),
'date' => $this->date,
'capital_status' => $this->capital_status,
'amount' => $this->amount,
'remarks' => $this->remarks,
];
}
}
Loading