webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
franknstayn
2024-05-23 01:42:59 +08:00
parent 97bc491b07 a2aba7b8e9
commit 70496dc874
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -23,7 +23,6 @@ WORKDIR /var/www
# Copy the Laravel application files to the container # Copy the Laravel application files to the container
COPY . . COPY . .
# Set appropriate permissions for Laravel storage and bootstrap cache # Set appropriate permissions for Laravel storage and bootstrap cache
RUN chown -R www-data:www-data storage bootstrap RUN chown -R www-data:www-data storage bootstrap

2
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -405,7 +405,7 @@ class PaypalController extends Controller
if (count($grouped_item) <= 0) { if (count($grouped_item) <= 0) {
$tax_value = 0; $tax_value = 0;
} else { } else {
if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244 || $grouped_item[0]->StoreId == 301 || $grouped_item[0]->StoreId == 1 || $grouped_item[0]->StoreId == 329 || $grouped_item[0]->StoreId == 346) { if ($grouped_item[0]->StoreId == 76 || $grouped_item[0]->StoreId == 78 || $grouped_item[0]->StoreId == 111 || $grouped_item[0]->StoreId == 131 || $grouped_item[0]->StoreId == 30 || $grouped_item[0]->StoreId == 141 || $grouped_item[0]->StoreId == 162 || $grouped_item[0]->StoreId == 185 || $grouped_item[0]->StoreId == 244 || $grouped_item[0]->StoreId == 301 || $grouped_item[0]->StoreId == 1 || $grouped_item[0]->StoreId == 329 || $grouped_item[0]->StoreId == 340 || $grouped_item[0]->StoreId == 346) {
$tax_value = 0; $tax_value = 0;
} else { } else {
$tax_value = 0.10; $tax_value = 0.10;

6
app/Http/Controllers/user/UserController.php
View File

@@ -1019,8 +1019,10 @@ class UserController extends Controller
{ {
$post = $request->all(); $post = $request->all();
$UserModel = new UserModel; $UserModel = new UserModel;
$newTeamStoreModel = new TeamStoreModel;
$store_id = Auth::user()->store_id; $store_id = Auth::user()->store_id;
$store_array = $newTeamStoreModel->selectTeamStore('Id', $store_id);
$store_name = $post['store_name']; $store_name = $post['store_name'];
$store_url = $post['store_url']; $store_url = $post['store_url'];
$orig_store_url = $post['orig_store_url']; $orig_store_url = $post['orig_store_url'];
@@ -1104,11 +1106,11 @@ class UserController extends Controller
$filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755);
if ($request->file('store_logo') != null) { if ($request->file('store_logo') != null) {
$filesystem->put('/merchbay/teamstore/' . $orig_store_url . '/' . $store_logo_name, fopen($request->file('store_logo'), 'r+')); $filesystem->put('/merchbay/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_logo_name, fopen($request->file('store_logo'), 'r+'));
} }
if ($request->file('store_banner') != null) { if ($request->file('store_banner') != null) {
$filesystem->put('/merchbay/teamstore/' . $orig_store_url . '/' . $store_banner_name, fopen($request->file('store_banner'), 'r+')); $filesystem->put('/merchbay/teamstore/' . $store_array[0]->ImageFolder . '/' . $store_banner_name, fopen($request->file('store_banner'), 'r+'));
} }
return response()->json(array( return response()->json(array(

2
docker-compose.yml
View File

@@ -27,7 +27,7 @@ services:
restart: unless-stopped restart: unless-stopped
tty: true tty: true
ports: ports:
- "9091:80" - "10003:80"
- "10443:443" - "10443:443"
volumes: volumes:
- ./:/var/www - ./:/var/www

4
resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php
View File

@@ -13,7 +13,7 @@
<tr class="table-tr-0"> <tr class="table-tr-0">
<td class="w-50"> <td class="w-50">
<!-- <input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name"> --> <!-- <input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name"> -->
<select class="form-control input-sm select-name" id="order_names" name="order_names[]"> <select class="form-control input-sm select-name" id="order_names" required name="order_names[]">
<!-- <option value="none">none</option> --> <!-- <option value="none">none</option> -->
<option value="">Select Player</option> <option value="">Select Player</option>
@foreach($roster as $ros) @foreach($roster as $ros)
@@ -33,7 +33,7 @@
<input type="hidden" class="form-control input-sm roster-input" name="order_number[]" /> <input type="hidden" class="form-control input-sm roster-input" name="order_number[]" />
<!-- </td> --> <!-- </td> -->
<td class="w-50"> <td class="w-50">
<select class="form-control input-sm order-size roster-input" name="order_size[]" style="border-right: 1px solid #ccc;" data-row-number="1"> <select class="form-control input-sm order-size roster-input" required name="order_size[]" style="border-right: 1px solid #ccc;" data-row-number="1">
<option value="">Select Size</option> <option value="">Select Size</option>
@foreach($sizes_array as $size) @foreach($sizes_array as $size)
<option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option> <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>