deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove more references to ab_account, Docker build tweaks, Fix error rendering charges

Browse Source
This commit is contained in:
Deon George 2021-07-19 16:23:38 +10:00
parent 8b08f79877
commit f22813bb5b
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-docker-x86_64.yml
View File

@ -27,7 +27,7 @@ docker:
- if [ -f init ]; then chmod 500 init; fi - if [ -f init ]; then chmod 500 init; fi
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true" - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
- echo -n ${CI_COMMIT_SHORT_SHA} > VERSION - echo -n ${CI_COMMIT_SHORT_SHA} > VERSION
- rm -rf vendor/ database/schema database/seeders database/factories - rm -rf vendor/ database/schema database/seeders database/factories/*
- docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} . - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
- docker push ${CI_REGISTRY_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
- docker push ${CI_REGISTRY_IMAGE}:${CACHETAG} - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}

2
.gitlab-test.yml
View File

@ -1,5 +1,5 @@
test: test:
image: registry.leenooks.net/leenooks/php:8.0-fpm-ext-test image: ${CI_REGISTRY}/leenooks/php:8.0-fpm-ext-test
stage: test stage: test

4
app/Http/Controllers/AdminController.php
View File

@ -25,12 +25,12 @@ class AdminController extends Controller
{ {
if ($request->post()) { if ($request->post()) {
$validation = $request->validate([ $validation = $request->validate([
'account_id' => 'required|exists:ab_account,id', 'account_id' => 'required|exists:accounts,id',
'date_payment' => 'required|date', 'date_payment' => 'required|date',
'checkout_id' => 'required|exists:ab_checkout,id', 'checkout_id' => 'required|exists:ab_checkout,id',
'total_amt' => 'required|numeric|min:0.01', 'total_amt' => 'required|numeric|min:0.01',
'fees_amt' => 'nullable|numeric|lt:total_amt', 'fees_amt' => 'nullable|numeric|lt:total_amt',
'source_id' => 'nullable|exists:ab_account,id', 'source_id' => 'nullable|exists:accounts,id',
'pending' => 'nullable|boolean', 'pending' => 'nullable|boolean',
'notes' => 'nullable|string', 'notes' => 'nullable|string',
'ip' => 'nullable|ip', 'ip' => 'nullable|ip',

2
app/Models/Charge.php
View File

@ -12,6 +12,6 @@ class Charge extends Model
public function getNameAttribute() public function getNameAttribute()
{ {
return sprintf('%s %s',$this->description,join('|',unserialize($this->getAttribute('attributes')))); return sprintf('%s %s',$this->description,$this->getAttribute('attributes') ? join('|',unserialize($this->getAttribute('attributes'))) : '');
} }
} }

6
routes/web.php
View File

@ -93,9 +93,9 @@ Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function
// Route::get('service/cancel/{o}','ServiceController@update') // Route::get('service/cancel/{o}','ServiceController@update')
// ->where('o','[0-9]+') // ->where('o','[0-9]+')
// ->middleware('can:update,o'); // ->middleware('can:update,o');
// Route::get('service/progress/{o}/{status}','UserHomeController@service_progress') Route::get('service/progress/{o}/{status}',[HomeController::class,'service_progress'])
// ->where('o','[0-9]+') ->where('o','[0-9]+')
// ->middleware('can:progress,o,status'); ->middleware('can:progress,o,status');
}); });
// Doorman Code Routes // Doorman Code Routes