From 157e3a189e735b2e25c6da7f6d6174feafcccb4b Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Mon, 2 Oct 2023 03:01:25 +0800 Subject: [PATCH 1/8] updated --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f083733..be9b6ac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: restart: unless-stopped tty: true ports: - - "9091:80" + - "8093:80" - "10443:443" volumes: - ./:/var/www From 860881b3c438e58a9a76ee9281be80b26cd081f9 Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Mon, 2 Oct 2023 03:08:36 +0800 Subject: [PATCH 2/8] updated --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index be9b6ac..1107cbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: restart: unless-stopped tty: true ports: - - "8093:80" + - "10003:80" - "10443:443" volumes: - ./:/var/www From 7d520a83003e38fc32c39e4fdc0172afdfe333f9 Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Mon, 2 Oct 2023 03:16:35 +0800 Subject: [PATCH 3/8] updated --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65b4641..bbdc433 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ WORKDIR /var/www # Copy the Laravel application files to the container COPY . . - +RUN a2enmod rewrite headers # Set appropriate permissions for Laravel storage and bootstrap cache RUN chown -R www-data:www-data storage bootstrap From 6e2745ff0d3358b45336a20c4db6bfd05362d91b Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Mon, 2 Oct 2023 03:23:58 +0800 Subject: [PATCH 4/8] updated --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bbdc433..8a08879 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,6 @@ WORKDIR /var/www # Copy the Laravel application files to the container COPY . . -RUN a2enmod rewrite headers # Set appropriate permissions for Laravel storage and bootstrap cache RUN chown -R www-data:www-data storage bootstrap From f53fd7dd3ba070f2c53ae2a400031a900c2c3daf Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Mon, 2 Oct 2023 18:14:40 +0800 Subject: [PATCH 5/8] updated --- app/Http/Controllers/paypal/PaypalController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index cfeb6c3..f9d373c 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -405,7 +405,7 @@ class PaypalController extends Controller if (count($grouped_item) <= 0) { $tax_value = 0; } 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) { + 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) { $tax_value = 0; } else { $tax_value = 0.10; From f9fe4d6546fe2e5aa10c347ec30c8983a6adb883 Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Sat, 14 Oct 2023 22:19:16 +0800 Subject: [PATCH 6/8] updated image url --- app/Http/Controllers/user/UserController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/user/UserController.php b/app/Http/Controllers/user/UserController.php index eb6a2c7..6a6ec7f 100755 --- a/app/Http/Controllers/user/UserController.php +++ b/app/Http/Controllers/user/UserController.php @@ -1019,8 +1019,10 @@ class UserController extends Controller { $post = $request->all(); $UserModel = new UserModel; + $newTeamStoreModel = new TeamStoreModel; $store_id = Auth::user()->store_id; + $store_array = $newTeamStoreModel->selectTeamStore('Id', $store_id); $store_name = $post['store_name']; $store_url = $post['store_url']; $orig_store_url = $post['orig_store_url']; @@ -1104,11 +1106,11 @@ class UserController extends Controller $filesystem->getDriver()->getAdapter()->setDirectoryPerm(0755); 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) { - $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( From 625d11521f9903e1619ec7d580709e17414b355d Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Sat, 28 Oct 2023 22:33:33 +0800 Subject: [PATCH 7/8] added required --- .../forms/roster-name-number-size-form.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php b/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php index 66359ed..b6d2fb0 100644 --- a/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php +++ b/resources/views/teamstore-sublayouts/forms/roster-name-number-size-form.blade.php @@ -13,7 +13,7 @@ - @foreach($roster as $ros) @@ -33,7 +33,7 @@ - @foreach($sizes_array as $size) From a2aba7b8e968a64bcbfcef293e1989d92cbebecb Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Fri, 16 Feb 2024 22:43:25 +0800 Subject: [PATCH 8/8] added tax --- app/Http/Controllers/paypal/PaypalController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index f9d373c..9c2093b 100755 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -405,7 +405,7 @@ class PaypalController extends Controller if (count($grouped_item) <= 0) { $tax_value = 0; } 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 == 340) { + 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; } else { $tax_value = 0.10;