Skip to content

Commit

Permalink
Updated some bits...
Browse files Browse the repository at this point in the history
  • Loading branch information
MinePoS Dedicated committed Sep 21, 2018
1 parent 3e92dac commit 1c74318
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
Binary file added .example.env.swp
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions app/helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public static function showContent(){
$isRoot = \Request::is('/');
return($loggedin || $isRoot);
}

public static function moneyFormat($number){
return number_format($number, 2, '.', ',');
}
}

?>
4 changes: 2 additions & 2 deletions config/self-update.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/'),
],
],

Expand All @@ -62,7 +62,7 @@
'bootstrap/cache',
'bower',
'storage/app',
'storage',
'storage/settings.json',
'storage/framework',
'storage/logs',
'storage/self-update',
Expand Down
4 changes: 2 additions & 2 deletions resources/views/buycraft/cart.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
@foreach(Cart::content() as $item)
<tr>
<td>{{$item->name}}</td>
<td>{{$item->price}}</td>
<td>{{Store::moneyFormat($item->price)}}</td>
<td>
<input type="number" min="1" class="btn btn-dark btn-dark-input" value="{{$item->qty}}">
</td>
Expand All @@ -56,7 +56,7 @@

@if(Cart::count() > 0)
<hr class="MinePoSHR">
Total: {{Cart::subtotal()}}
Total: {{Store::moneyFormat(Cart::subtotal())}}
<hr class="MinePoSHR">

<div class="row cart-button-row">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/buycraft/category.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@foreach($category->getProducts() as $product)
<tr>
<td>{{$product->name}}</td>
<td><p class="float-right">{{$product->price}} <a href="#" data-toggle="modal" data-target="#Product{{$product->id}}" class="btn btn-dark">Buy</a></p></td>
<td><p class="float-right">{{Store::moneyFormat($product->price)}} <a href="#" data-toggle="modal" data-target="#Product{{$product->id}}" class="btn btn-dark">Buy</a></p></td>
</tr>
@endforeach
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/buycraft/parts/modules/recent.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@foreach($orders as $order)
<div class="payment-row row">
<div class="col-sm-12" style="padding: 0">
<img src="{{$order->getHead()}}">{{$order->username}} ({{$order->total}} {{$order->currency}})
<img src="{{$order->getHead()}}">{{$order->username}} ({{Store::moneyFormat($order->total)}} {{$order->currency}})
</div>
</div>
@if($orders->last() != $order)
Expand Down
2 changes: 1 addition & 1 deletion routes/admin/web.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion storage/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"theme":"buycraft","admin":{"url":"admin"},"home_title":"MinePoS","home_desc":"<p>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":"[email protected]"}
{"theme":"buycraft","admin":{"url":"admin"},"home_title":"MinePoS","home_desc":"<p>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":"[email protected]","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"}

0 comments on commit 1c74318

Please sign in to comment.