From 1c743181293e3e23e50b5d74a571aafc9d1093fd Mon Sep 17 00:00:00 2001 From: MinePoS Dedicated Date: Sat, 22 Sep 2018 01:16:02 +0200 Subject: [PATCH] Updated some bits... --- .example.env.swp | Bin 0 -> 1024 bytes app/helper.php | 4 ++++ config/self-update.php | 4 ++-- resources/views/buycraft/cart.blade.php | 4 ++-- resources/views/buycraft/category.blade.php | 2 +- .../buycraft/parts/modules/recent.blade.php | 2 +- routes/admin/web.php | 2 +- storage/settings.json | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .example.env.swp diff --git a/.example.env.swp b/.example.env.swp new file mode 100644 index 0000000000000000000000000000000000000000..92ba406eed876bd554929b76a2adf3d313d91f8d GIT binary patch literal 1024 zcmYc?$V<%2S1{5u)iY*50^arv3`P0*B}hUznYoFXIeNL7d8q~Y#d>+EIQ8i1>1UMW l=IHwZl?LPo>!(&E<`(3n>ZRtD;WT?xVl)IsLx6T6002nU6@UN$ literal 0 HcmV?d00001 diff --git a/app/helper.php b/app/helper.php index 58346015..0fb9f131 100755 --- a/app/helper.php +++ b/app/helper.php @@ -26,6 +26,10 @@ public static function showContent(){ $isRoot = \Request::is('/'); return($loggedin || $isRoot); } + + public static function moneyFormat($number){ +return number_format($number, 2, '.', ','); + } } ?> \ No newline at end of file diff --git a/config/self-update.php b/config/self-update.php index b6ede282..c494ec13 100755 --- a/config/self-update.php +++ b/config/self-update.php @@ -41,7 +41,7 @@ 'repository_vendor' => env('SELF_UPDATER_REPO_VENDOR', 'MinePoS'), 'repository_name' => env('SELF_UPDATER_REPO_NAME', 'Backend'), 'repository_url' => 'https://github.com/MinePoS/Backend.git', - 'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp'), + 'download_path' => env('SELF_UPDATER_DOWNLOAD_PATH', '/tmp/'), ], ], @@ -62,7 +62,7 @@ 'bootstrap/cache', 'bower', 'storage/app', - 'storage', + 'storage/settings.json', 'storage/framework', 'storage/logs', 'storage/self-update', diff --git a/resources/views/buycraft/cart.blade.php b/resources/views/buycraft/cart.blade.php index c9f8a61e..babe8d4d 100755 --- a/resources/views/buycraft/cart.blade.php +++ b/resources/views/buycraft/cart.blade.php @@ -32,7 +32,7 @@ @foreach(Cart::content() as $item) {{$item->name}} - {{$item->price}} + {{Store::moneyFormat($item->price)}} @@ -56,7 +56,7 @@ @if(Cart::count() > 0)
- Total: {{Cart::subtotal()}} + Total: {{Store::moneyFormat(Cart::subtotal())}}
diff --git a/resources/views/buycraft/category.blade.php b/resources/views/buycraft/category.blade.php index 546a4173..e2190b9b 100755 --- a/resources/views/buycraft/category.blade.php +++ b/resources/views/buycraft/category.blade.php @@ -13,7 +13,7 @@ @foreach($category->getProducts() as $product) {{$product->name}} -

{{$product->price}} Buy

+

{{Store::moneyFormat($product->price)}} Buy

@endforeach diff --git a/resources/views/buycraft/parts/modules/recent.blade.php b/resources/views/buycraft/parts/modules/recent.blade.php index 3fa586b2..2298c104 100755 --- a/resources/views/buycraft/parts/modules/recent.blade.php +++ b/resources/views/buycraft/parts/modules/recent.blade.php @@ -8,7 +8,7 @@ @foreach($orders as $order)
- {{$order->username}} ({{$order->total}} {{$order->currency}}) + {{$order->username}} ({{Store::moneyFormat($order->total)}} {{$order->currency}})
@if($orders->last() != $order) diff --git a/routes/admin/web.php b/routes/admin/web.php index 68cb5f5d..69699e6b 100755 --- a/routes/admin/web.php +++ b/routes/admin/web.php @@ -86,7 +86,7 @@ Route::get('settings/discord','Admin\SettingsController@showDiscord')->middleware('permission:edit settings')->name("admin.settings.discord"); Route::post('settings/discord','Admin\SettingsController@saveDiscord')->middleware('permission:edit settings')->name("admin.settings.discord"); - Route::post('settings/discord','Admin\SettingsController@testDiscord')->middleware('permission:edit settings')->name("admin.settings.discord.test"); + Route::post('settings/discord/test','Admin\SettingsController@testDiscord')->middleware('permission:edit settings')->name("admin.settings.discord.test"); Route::post('settings/pterodactyl/setup','Admin\SettingsController@magicPterodactyl')->middleware('permission:edit settings')->name("admin.settings.pterodactyl.setup"); diff --git a/storage/settings.json b/storage/settings.json index 84cbafcb..8f1a821f 100755 --- a/storage/settings.json +++ b/storage/settings.json @@ -1 +1 @@ -{"theme":"buycraft","admin":{"url":"admin"},"home_title":"MinePoS","home_desc":"

Demo MinePoS Store :)<\/p>","pterodactyl_link":"https:\/\/pterodactyl.minepos.net\/api\/","pterodactyl_key":"80qqDg8mdN3x3sqOdybDxwq7QpLOld1TY4zwxKMX7sFx0hNe","pterodactyl_appkey":"f5sUq0FcHL4NxlhbEsRRlZXhdThNecF9MBTVIKXXpeXBlrg7","PayPalSecret":"EAt5VBV3ae789prQ2xtltU6F17sQVPaXljXTHPOlHB8WLvQuKsAGWlcwhWiNE70ggXe-xCn9IqCe0tWN","PayPalClientID":"AWQMJBcuVcbMwVTYilN_fpB9M6cNxFZ7U5T0J-ATrfDbUrRkeVDP45iEYoxnpn-Hw9F_ALewAwrxkq0e","paypal_email":"seller@minepos.net"} \ No newline at end of file +{"theme":"buycraft","admin":{"url":"admin"},"home_title":"MinePoS","home_desc":"

Demo MinePoS Store :)<\/p>","pterodactyl_link":"https:\/\/pterodactyl.minepos.net\/api\/","pterodactyl_key":"YPxmLf1k5a6v1LcLClvIkHeoaCvYKcm1donvgWDhq71gJlWb","pterodactyl_appkey":"f5sUq0FcHL4NxlhbEsRRlZXhdThNecF9MBTVIKXXpeXBlrg7","PayPalSecret":"EAt5VBV3ae789prQ2xtltU6F17sQVPaXljXTHPOlHB8WLvQuKsAGWlcwhWiNE70ggXe-xCn9IqCe0tWN","PayPalClientID":"AWQMJBcuVcbMwVTYilN_fpB9M6cNxFZ7U5T0J-ATrfDbUrRkeVDP45iEYoxnpn-Hw9F_ALewAwrxkq0e","paypal_email":"seller@minepos.net","DISCORD_LOGIN_ENABLED":true,"DISCORD_ORDER_ENABLED":true,"DISCORD_LOGIN_WEBHOOK":"https:\/\/discordapp.com\/api\/webhooks\/414863378188599314\/ooz3EkkWBWUHRz2YtAll1IafYgeAFSF31uc1IO6FPuJhjeVH8JiNTvbrT-URgdD-18WJ","DISCORD_ORDER_WEBHOOK":"https:\/\/discordapp.com\/api\/webhooks\/423094221914767370\/FNvJAzz6u4ra8UUgx3II-p2drhH-ADOZp0fbRgDwkXR0zCluU_1wG47US9P3z0anxvVO"} \ No newline at end of file