cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-27 16:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wallet-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-up-with-api

Browse Source 
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
This commit is contained in:
edmondlang
2022-02-05 21:39:31 +08:00
parent 89c4debe14 6fa98bbd26
commit c52621c405
46 changed files with 1656 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/TransactionResource.php
+5 -1
View File
@@ -43,7 +43,11 @@ class TransactionResource extends JsonResource
})),
'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'),
'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A')
'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y h:i:s A'),
'interval' => [
'value' => (Carbon::parse($this->created_at)->addDays(3)->gt(Carbon::now()) ) ? '+' : '-' ,
'duration' => Carbon::parse($this->created_at)->addDays(3)->diff(Carbon::now())->format('%d'),
],
];
}
}