Merge commit 'e1cf0dc676c06cd7b0dc4b138614d1766f5f1e26'

* commit 'e1cf0dc676c06cd7b0dc4b138614d1766f5f1e26': (42 commits)
  updated shipping for global
  added docker files and update roster form
  updated
  updated
  upadted
  upadted
  upadted
  upadted
  updated
  updated
  uppdated
  uppdated
  uppdated
  uppdated
  uppdated
  updated
  updated
  updated
  updated
  updated
  ...

Dockerfile

@@ -0,0 +1,47 @@
+# Use the official PHP image based on Alpine Linux
+FROM php:5.6-fpm-alpine
+
+# Install system dependencies and PHP extensions
+RUN apk --update --no-cache add \
+    nginx \
+    libpng-dev \
+    libjpeg-turbo-dev \
+    freetype-dev \
+    libzip-dev \
+    zip \
+    unzip \
+    libmcrypt-dev \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install gd pdo pdo_mysql zip mcrypt
+
+# Set the working directory in the container
+WORKDIR /var/www
+
+# Clear cache
+# RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# 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
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Install Laravel dependencies
+RUN composer install --no-plugins --no-scripts
+
+# Generate Laravel application key
+RUN php artisan key:generate
+
+# Create directory for the socket and set permissions
+RUN mkdir -p /run/php && chown www-data:www-data /run/php
+
+# Copy the www.conf file to PHP-FPM pool.d directory
+COPY www.conf /usr/local/etc/php-fpm.d/www.conf
+
+# Expose port 9000 and start php-fpm server
+EXPOSE 9000
+CMD ["php-fpm"]

app/Http/Controllers/teamstore/TeamStoreController.php

@@ -840,7 +840,7 @@ class TeamStoreController extends Controller
 					}
 				}
 
-				if ($getVoucher[0]->VoucherType === "Shipping") {
+				if ($getVoucher[0]->VoucherType === "Shipping" && $getVoucher[0]->UserId != null) {
 
 					if (Auth::guest()) {
 						return response()->json(array(

docker-compose.yml

@@ -0,0 +1,45 @@
+version: '3'
+services:
+  
+  #PHP Service
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: digitalocean.com/php
+    container_name: app
+    restart: unless-stopped
+    tty: true
+    environment:
+      SERVICE_NAME: app
+      SERVICE_TAGS: dev
+    working_dir: /var/www
+    volumes:
+      - ./:/var/www
+      - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
+    networks:
+      - app-network
+
+  #Nginx Service
+  webserver:
+    image: nginx:alpine
+    container_name: webserver
+    restart: unless-stopped
+    tty: true
+    ports:
+      - "9091:80"
+      - "443:443"
+    volumes:
+      - ./:/var/www
+      - ./nginx/conf.d/:/etc/nginx/conf.d/
+    networks:
+      - app-network
+
+#Docker Networks
+networks:
+  app-network:
+    driver: bridge
+#Volumes
+volumes:
+  dbdata:
+    driver: local

nginx/conf.d/app.conf

@@ -0,0 +1,39 @@
+server {
+    listen 80;
+    index index.php index.html;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /var/www;
+    index index.php index.html;
+
+     location / {
+        if ($request_method = 'OPTIONS') {
+                add_header 'Access-Control-Allow-Origin' '*';
+                add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, PUT, DELETE, HEAD';
+                add_header 'Access-Control-Max-Age' '1728000';
+                add_header 'Access-Control-Allow-Headers' '*';
+                #add_header 'Content-Type: text/plain; charset=UTF-8';
+                #add_header 'Content-Length: 0';
+                return 204;
+        }
+        try_files $uri $uri/ /index.php?$query_string;
+
+    }
+    location ~ \.php$ {
+        fastcgi_index index.php;
+        fastcgi_pass app:9000;
+   
+        include fastcgi_params;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+
+    }
+    location ~* \.(css|less|js|jpg|png|gif)$ {
+            add_header Cache-Control "no-cache, no-store, must-revalidate";
+            add_header Pragma "no-cache";
+            expires 0;
+    }
+
+}

php/local.ini

@@ -0,0 +1,2 @@
+upload_max_filesize=40M
+post_max_size=40M

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

@@ -15,6 +15,7 @@
                     <!-- <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[]">
                         <!-- <option value="none">none</option> -->
+                        <option value="">Select Player</option>
                         @foreach($roster as $ros)
                         <option value="{{ $ros->Name }}" data-number="{{ $ros->Number }}">{{ $ros->Name }} - {{ $ros->Number }}</option>
                         @endforeach
@@ -33,6 +34,7 @@
                 <!-- </td> -->
                 <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">
+                        <option value="">Select Size</option>
                         @foreach($sizes_array as $size)
                         <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
                         @endforeach

resources/views/user-layouts/user_template.blade.php

@@ -669,7 +669,7 @@
 	<!-- datepicker -->
 	<script src="{{asset('/public/bower_components/AdminLTE/plugins/datepicker/bootstrap-datepicker.js')}}"></script>
 	<!-- jquery-ui -->
-	<script src="{{ asset('/public/assets/js/jquery-ui.js') }}></script>
+	<script src="{{ asset('/public/assets/js/jquery-ui.js') }}"></script>
 	{{-- Chartjs --}}
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js"></script>