diff --git a/Dockerfile b/Dockerfile index 65b4641..8a08879 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,6 @@ WORKDIR /var/www # Copy the Laravel application files to the container COPY . . - # Set appropriate permissions for Laravel storage and bootstrap cache RUN chown -R www-data:www-data storage bootstrap diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 9af83af..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 == 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; } else { $tax_value = 0.10; 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( diff --git a/docker-compose.yml b/docker-compose.yml index f083733..1107cbf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: restart: unless-stopped tty: true ports: - - "9091:80" + - "10003:80" - "10443:443" volumes: - ./:/var/www 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 @@