Refactor Docker setup for Laravel 5.0 compatibility and optimize deployment process

- Updated Dockerfile configurations for various environments (alpine, basic, cloudrun, minimal, simple, test) to ensure compatibility with Laravel 5.0 and PHP 5.6.
- Added PHP compatibility documentation outlining mcrypt requirements and upgrade paths.
- Created cloudbuild.yaml for Google Cloud Build integration to streamline deployment to Cloud Run.
- Introduced docker-compose.local.yml for local development with MySQL and Redis services.
- Enhanced rebuild.sh script for easier local development and migration handling.
- Updated Laravel Blade views to correct asset paths.
- Added start-local.sh script for quick local setup and service management.

.dockerignore

@@ -1,18 +1,63 @@
+# Git files
 .git
 .gitignore
-.env
-.env.*
-.editorconfig
-.idea
-.vscode
+.gitattributes
+
+# Docker files
+Dockerfile*
+docker-compose*.yml
+.dockerignore
+
+# Documentation
+README.md
+DEPLOYMENT_GUIDE.md
 *.md
-docker-compose.yml
-Dockerfile
-vendor/
+
+# Development files
+.env.example
+.env.local
+.env.testing
+
+# IDE files
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS files
+.DS_Store
+Thumbs.db
+
+# Node modules and build files
 node_modules/
-storage/framework/cache/**
-storage/framework/sessions/**
-storage/framework/views/**
-storage/logs/**
-tests/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Laravel specific
+/vendor
+/storage/logs/*
+!/storage/logs/.gitkeep
+/storage/framework/cache/*
+!/storage/framework/cache/.gitkeep
+/storage/framework/sessions/*
+!/storage/framework/sessions/.gitkeep
+/storage/framework/views/*
+!/storage/framework/views/.gitkeep
+/bootstrap/cache/*
+!/bootstrap/cache/.gitkeep
+
+# Testing
+/tests
 phpunit.xml
+phpspec.yml
+
+# Build tools
+gulpfile.js
+package.json
+package-lock.json
+yarn.lock
+
+# Scripts
+start-local.sh
+rebuild.sh

DEPLOYMENT_GUIDE.md

@@ -0,0 +1,229 @@
+# Google Cloud Run Deployment Guide for Merchbay Laravel Application
+
+This guide will help you deploy your Laravel 5 application to Google Cloud Run using the provided `cloudbuild.yaml` configuration.
+
+## Prerequisites
+
+1. **Google Cloud Project**: Ensure you have a Google Cloud Project with billing enabled
+2. **APIs Enabled**: Enable the following APIs:
+   - Cloud Build API
+   - Cloud Run API
+   - Container Registry API (or Artifact Registry API)
+   - Cloud SQL API (if using Cloud SQL)
+   - Secret Manager API (recommended for secrets)
+
+3. **gcloud CLI**: Install and configure the Google Cloud CLI
+
+## Pre-deployment Setup
+
+### 1. Create Cloud SQL Instance (Recommended)
+
+```bash
+# Create MySQL instance
+gcloud sql instances create merchbay-db \
+    --database-version=MYSQL_8_0 \
+    --tier=db-f1-micro \
+    --region=us-central1
+
+# Create database
+gcloud sql databases create merchbay --instance=merchbay-db
+
+# Create user
+gcloud sql users create laravel_user \
+    --instance=merchbay-db \
+    --password=YOUR_SECURE_PASSWORD
+```
+
+### 2. Store Secrets in Secret Manager
+
+```bash
+# Application key (generate a new one)
+echo "base64:$(openssl rand -base64 32)" | gcloud secrets create APP_KEY --data-file=-
+
+# Database password
+echo "YOUR_DB_PASSWORD" | gcloud secrets create DB_PASSWORD --data-file=-
+
+# PayPal secrets
+echo "YOUR_PAYPAL_LIVE_SECRET" | gcloud secrets create PAYPAL_LIVE_SECRET --data-file=-
+echo "YOUR_PAYPAL_SANDBOX_SECRET" | gcloud secrets create PAYPAL_SANDBOX_SECRET --data-file=-
+
+# Mail password
+echo "YOUR_MAIL_PASSWORD" | gcloud secrets create MAIL_PASSWORD --data-file=-
+```
+
+### 3. Update cloudbuild.yaml Variables
+
+Update the substitution variables in `cloudbuild.yaml`:
+
+```yaml
+substitutions:
+  _SERVICE_NAME: 'merchbay-laravel'
+  _REGION: 'us-central1'  # Change to your preferred region
+  _CLOUDSQL_INSTANCE: 'YOUR_PROJECT_ID:us-central1:merchbay-db'
+  _DB_DATABASE: 'merchbay'
+  _DB_USERNAME: 'laravel_user'
+  # ... other variables
+```
+
+## Deployment Steps
+
+### 1. Set up Cloud Build Trigger
+
+```bash
+# Connect your repository to Cloud Build
+gcloud builds triggers create github \
+    --repo-name=YOUR_REPO_NAME \
+    --repo-owner=YOUR_GITHUB_USERNAME \
+    --branch-pattern="^main$" \
+    --build-config=cloudbuild.yaml
+
+# Or trigger manually
+gcloud builds submit --config=cloudbuild.yaml .
+```
+
+### 2. Manual Deployment (Alternative)
+
+```bash
+# Set your project ID
+export PROJECT_ID=your-project-id
+
+# Build and deploy
+gcloud builds submit --config=cloudbuild.yaml \
+    --substitutions=_PROJECT_ID=$PROJECT_ID,_SERVICE_NAME=merchbay-laravel
+```
+
+## Post-deployment Tasks
+
+### 1. Run Database Migrations
+
+```bash
+# Create a one-time job for migrations
+gcloud run jobs create laravel-migrate \
+    --image=gcr.io/$PROJECT_ID/merchbay-laravel:latest \
+    --region=us-central1 \
+    --set-env-vars="APP_ENV=production" \
+    --set-cloudsql-instances=$PROJECT_ID:us-central1:merchbay-db \
+    --command="php" \
+    --args="artisan,migrate,--force" \
+    --max-retries=1
+
+# Execute the migration
+gcloud run jobs execute laravel-migrate --region=us-central1 --wait
+```
+
+### 2. Set up Custom Domain (Optional)
+
+```bash
+# Map custom domain
+gcloud run domain-mappings create \
+    --service=merchbay-laravel \
+    --domain=your-domain.com \
+    --region=us-central1
+```
+
+### 3. Configure Load Balancer and CDN (Optional)
+
+For better performance, consider setting up:
+- Cloud Load Balancer
+- Cloud CDN for static assets
+- Cloud Storage for file uploads
+
+## Environment Variables Reference
+
+The following environment variables are configured in the Cloud Run service:
+
+### Application Settings
+- `APP_ENV=production`
+- `APP_DEBUG=false`
+- `APP_KEY` (from Secret Manager)
+
+### Database Settings
+- `DB_HOST=127.0.0.1` (Cloud SQL Proxy)
+- `DB_DATABASE=merchbay`
+- `DB_USERNAME=laravel_user`
+- `DB_PASSWORD` (from Secret Manager)
+
+### Cache & Session
+- `CACHE_DRIVER=redis` (requires Redis setup)
+- `SESSION_DRIVER=redis`
+- `QUEUE_DRIVER=database`
+
+### PayPal Configuration
+- `PAYPAL_MODE=live` (or 'sandbox' for testing)
+- `PAYPAL_LIVE_CLIENT_ID`
+- `PAYPAL_LIVE_SECRET`
+- `PAYPAL_SANDBOX_CLIENT_ID`
+- `PAYPAL_SANDBOX_SECRET`
+
+### Mail Configuration
+- `MAIL_DRIVER=smtp`
+- `MAIL_HOST`
+- `MAIL_PORT`
+- `MAIL_USERNAME`
+- `MAIL_PASSWORD`
+
+## Monitoring and Logging
+
+### Enable Application Insights
+
+```bash
+# Enable Cloud Logging
+gcloud logging sinks create laravel-logs \
+    bigquery.googleapis.com/projects/$PROJECT_ID/datasets/app_logs
+```
+
+### Set up Uptime Monitoring
+
+```bash
+# Create uptime check
+gcloud alpha monitoring uptime create \
+    --display-name="Merchbay Laravel App" \
+    --http-check-path="/" \
+    --hostname=your-service-url.run.app
+```
+
+## Troubleshooting
+
+### Common Issues
+
+1. **502 Bad Gateway**: Check logs with `gcloud run services logs read merchbay-laravel`
+2. **Database Connection Issues**: Verify Cloud SQL instance and VPC configuration
+3. **Memory Issues**: Increase memory allocation in cloudbuild.yaml
+4. **Timeout Issues**: Increase timeout and check for long-running operations
+
+### Debugging Commands
+
+```bash
+# View service logs
+gcloud run services logs read merchbay-laravel --region=us-central1
+
+# Get service details
+gcloud run services describe merchbay-laravel --region=us-central1
+
+# Check revisions
+gcloud run revisions list --service=merchbay-laravel --region=us-central1
+```
+
+## Security Considerations
+
+1. **Use Secret Manager** for all sensitive data
+2. **Enable VPC** for database connections
+3. **Configure IAM** with least privilege principle
+4. **Enable Cloud Armor** for DDoS protection
+5. **Use HTTPS** with managed SSL certificates
+6. **Regular Updates** for dependencies and base images
+
+## Cost Optimization
+
+1. **Set Min Instances to 0** for cost savings
+2. **Use Appropriate CPU/Memory** settings
+3. **Implement Caching** (Redis/Memcached)
+4. **Optimize Images** and use multi-stage builds
+5. **Monitor Usage** with Cloud Monitoring
+
+## Support
+
+For issues specific to:
+- **Cloud Run**: Check [Cloud Run documentation](https://cloud.google.com/run/docs)
+- **Laravel**: Check [Laravel documentation](https://laravel.com/docs)
+- **PayPal Integration**: Check [PayPal developer documentation](https://developer.paypal.com/)

Dockerfile

@@ -1,81 +1,40 @@
-# Build stage
-FROM php:5.6-fpm-alpine as composer
-
-# Install system dependencies and PHP extensions required for Composer
-RUN apk add --no-cache \
-    git \
-    curl \
-    zip \
-    unzip \
-    libmcrypt \
-    libmcrypt-dev \
-    zlib-dev \
-    libzip-dev \
-    autoconf \
-    make \
-    gcc \
-    g++ \
-    && docker-php-ext-install mcrypt mbstring zip \
-    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
-    && composer self-update --1
-
-ENV COMPOSER_ALLOW_SUPERUSER=1
-WORKDIR /app
-COPY composer.* ./
-
-# Install dependencies with Composer (optimize later after full copy)
-RUN composer config platform.php 5.6.40 \
-    && composer install --prefer-dist --no-dev --no-scripts --no-autoloader
-
-# Copy the rest of the application and optimize autoload
-COPY . .
-RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
-
-# Production stage
+# Use the official PHP image based on Alpine Linux
 FROM php:5.6-fpm-alpine
 
-# Install runtime dependencies & build PHP extensions
-RUN apk add --no-cache \
+# Install system dependencies and PHP extensions
+RUN apk --update --no-cache add \
     nginx \
-    curl \
-    libpng \
-    libjpeg-turbo \
-    freetype \
-    libzip \
-    libmcrypt \
-    zlib \
-    && apk add --no-cache --virtual .build-deps \
-    autoconf make gcc g++ \
-    libpng-dev libjpeg-turbo-dev freetype-dev libzip-dev libmcrypt-dev zlib-dev \
+    libpng-dev \
+    libjpeg-turbo-dev \
+    freetype-dev \
+    libzip-dev \
+    zip \
+    unzip \
+    libmcrypt-dev \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install -j"$(nproc)" gd pdo pdo_mysql zip mcrypt mbstring opcache \
-    && docker-php-ext-enable mcrypt \
-    && apk del .build-deps \
-    && php -m | grep -i mcrypt
-
-# Configure PHP for production
-RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
-    && echo "opcache.enable=1" >> /usr/local/etc/php/conf.d/opcache.ini \
-    && echo "opcache.memory_consumption=128" >> /usr/local/etc/php/conf.d/opcache.ini \
-    && echo "opcache.interned_strings_buffer=8" >> /usr/local/etc/php/conf.d/opcache.ini \
-    && echo "opcache.max_accelerated_files=4000" >> /usr/local/etc/php/conf.d/opcache.ini \
-    && echo "opcache.revalidate_freq=60" >> /usr/local/etc/php/conf.d/opcache.ini \
-    && echo "opcache.fast_shutdown=1" >> /usr/local/etc/php/conf.d/opcache.ini
+    && docker-php-ext-install gd pdo pdo_mysql zip mcrypt
 
+# Set the working directory in the container
 WORKDIR /var/www
 
-# Copy vendor & app code from build stage
-COPY --from=composer /app/vendor ./vendor
+# Copy the Laravel application files to the container
 COPY . .
 
-# Set appropriate permissions and create required directories
-RUN chown -R www-data:www-data storage bootstrap \
-    && mkdir -p /run/php \
-    && chown www-data:www-data /run/php \
-    && php artisan key:generate || true
+# Set appropriate permissions for Laravel storage and bootstrap cache
+RUN chown -R www-data:www-data storage bootstrap/cache
 
-# Healthcheck (FPM listens on 9000; adjust as needed if behind nginx)
-HEALTHCHECK --interval=30s --timeout=5s CMD php -m > /dev/null || exit 1
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+# Install Laravel dependencies
+RUN composer install --no-interaction --no-plugins --no-scripts
+
+# 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"]

Dockerfile.alpine

@@ -0,0 +1,71 @@
+# Debug Dockerfile - Let's try the original approach that was working
+FROM php:5.6-fpm-alpine
+
+# Set working directory
+WORKDIR /var/www
+
+# 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 \
+    curl \
+    git \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install gd pdo pdo_mysql zip mcrypt mbstring
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# 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/cache
+
+# Install Laravel dependencies
+RUN composer install --no-interaction --no-plugins --no-scripts --no-dev
+
+# Create .env file
+RUN if [ ! -f .env ]; then cp .env.example .env; fi
+
+# Generate application key
+RUN php artisan key:generate || true
+
+# Create directory for the socket and set permissions
+RUN mkdir -p /run/php && chown www-data:www-data /run/php
+
+# Configure nginx for Laravel
+RUN echo 'server {
+    listen 80;
+    server_name localhost;
+    root /var/www/public;
+    index index.php index.html index.htm;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+    }
+}' > /etc/nginx/conf.d/default.conf
+
+# Create startup script
+RUN echo '#!/bin/sh
+php-fpm -D
+nginx -g "daemon off;"' > /start.sh && chmod +x /start.sh
+
+# Expose port 80
+EXPOSE 80
+
+# Start both PHP-FPM and Nginx
+CMD ["/start.sh"]

Dockerfile.basic

@@ -0,0 +1,39 @@
+# Bare minimum working Dockerfile for Laravel 5.0
+FROM php:5.6-apache
+
+WORKDIR /var/www/html
+
+# Install absolute essentials only
+RUN apt-get update \
+    && apt-get install -y \
+        curl \
+        git \
+        libmcrypt-dev \
+    && docker-php-ext-install \
+        pdo \
+        pdo_mysql \
+        mcrypt \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Enable Apache rewrite
+RUN a2enmod rewrite
+
+# Configure Apache for Laravel
+ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+
+# Copy app and set permissions
+COPY . /var/www/html/
+RUN chown -R www-data:www-data /var/www/html
+
+# Basic Laravel setup
+RUN if [ ! -f .env ]; then cp .env.example .env; fi
+RUN composer install --no-dev --no-interaction --ignore-platform-reqs
+RUN php artisan key:generate || true
+
+EXPOSE 80
+CMD ["apache2-foreground"]

Dockerfile.cloudrun

@@ -0,0 +1,132 @@
+# Dockerfile optimized for Google Cloud Run
+# Use PHP 5.6 with Apache (matches Laravel 5.0 requirements perfectly)
+FROM php:5.6-apache
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Install system dependencies and PHP extensions required for Laravel
+RUN apt-get update && apt-get install -y \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libfreetype6-dev \
+    libmcrypt-dev \
+    zlib1g-dev \
+    zip \
+    unzip \
+    git \
+    curl \
+    libxml2-dev \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install \
+        pdo \
+        pdo_mysql \
+        mbstring \
+        zip \
+        gd \
+        xml \
+        mcrypt \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Enable Apache modules and configure
+RUN a2enmod rewrite headers
+RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
+
+# Configure Apache document root for Laravel
+ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
+# Copy Apache virtual host configuration
+COPY <<EOF /etc/apache2/sites-available/000-default.conf
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    DocumentRoot /var/www/html/public
+    
+    <Directory /var/www/html/public>
+        AllowOverride All
+        Require all granted
+    </Directory>
+    
+    # Logging
+    ErrorLog \${APACHE_LOG_DIR}/error.log
+    CustomLog \${APACHE_LOG_DIR}/access.log combined
+    
+    # Security headers
+    Header always set X-Content-Type-Options nosniff
+    Header always set X-Frame-Options DENY
+    Header always set X-XSS-Protection "1; mode=block"
+    Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains"
+    Header always set Referrer-Policy "strict-origin-when-cross-origin"
+</VirtualHost>
+EOF
+
+# Copy application files
+COPY . /var/www/html/
+
+# Fix Git ownership issue for the repository
+RUN git config --global --add safe.directory /var/www/html || true
+
+# Install PHP dependencies
+RUN composer install --no-dev --optimize-autoloader --no-interaction
+
+# Set proper permissions for Laravel
+RUN chown -R www-data:www-data /var/www/html \
+    && chmod -R 755 /var/www/html \
+    && chmod -R 775 /var/www/html/storage \
+    && chmod -R 775 /var/www/html/bootstrap/cache
+
+# Create .env file from .env.example if it doesn't exist
+RUN if [ ! -f /var/www/html/.env ]; then \
+        cp /var/www/html/.env.example /var/www/html/.env; \
+    fi
+
+# Switch to www-data user for Laravel commands to avoid ownership issues
+USER www-data
+
+# Generate application key (will be overridden by environment variables in Cloud Run)
+RUN php artisan key:generate || true
+
+# Clear and cache configuration for production
+RUN php artisan config:clear || true \
+    && php artisan route:clear || true \
+    && php artisan view:clear || true
+
+# Switch back to root for the remaining setup
+USER root
+
+# Create startup script
+COPY <<EOF /usr/local/bin/start.sh
+#!/bin/bash
+set -e
+
+# Fix Git ownership issue
+git config --global --add safe.directory /var/www/html || true
+
+# Wait for database to be ready (if using Cloud SQL)
+echo "Starting Laravel application..."
+
+# Run Laravel optimizations
+php artisan config:cache || true
+php artisan route:cache || true
+php artisan view:cache || true
+
+# Start Apache in foreground
+exec apache2-foreground
+EOF
+
+RUN chmod +x /usr/local/bin/start.sh
+
+# Expose port 80 (Cloud Run will map this to 8080)
+EXPOSE 80
+
+# Health check for Cloud Run
+HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
+    CMD curl -f http://localhost/ || exit 1
+
+# Use the startup script
+CMD ["/usr/local/bin/start.sh"]

Dockerfile.minimal

@@ -0,0 +1,86 @@
+# Minimal Dockerfile for Laravel 5.0 with PHP 5.6
+FROM php:5.6-apache
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Install only essential system dependencies
+RUN apt-get update && apt-get install -y \
+    libmcrypt-dev \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libfreetype6-dev \
+    zlib1g-dev \
+    zip \
+    unzip \
+    git \
+    curl \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install \
+        pdo \
+        pdo_mysql \
+        mcrypt \
+        gd \
+        zip \
+        mbstring \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Enable Apache modules
+RUN a2enmod rewrite
+RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
+
+# Configure Apache document root for Laravel
+ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
+# Simple Apache configuration
+RUN echo '<VirtualHost *:80>\n\
+    DocumentRoot /var/www/html/public\n\
+    <Directory /var/www/html/public>\n\
+        AllowOverride All\n\
+        Require all granted\n\
+    </Directory>\n\
+</VirtualHost>' > /etc/apache2/sites-available/000-default.conf
+
+# Copy application files
+COPY . /var/www/html/
+
+# Fix Git ownership issue
+RUN git config --global --add safe.directory /var/www/html || true
+
+# Install PHP dependencies
+RUN composer install --no-dev --optimize-autoloader --no-interaction
+
+# Set proper permissions
+RUN chown -R www-data:www-data /var/www/html \
+    && chmod -R 755 /var/www/html \
+    && chmod -R 775 /var/www/html/storage \
+    && chmod -R 775 /var/www/html/bootstrap/cache
+
+# Create .env file if it doesn't exist
+RUN if [ ! -f /var/www/html/.env ]; then \
+        cp /var/www/html/.env.example /var/www/html/.env; \
+    fi
+
+# Switch to www-data for Laravel commands
+USER www-data
+RUN php artisan key:generate || true
+USER root
+
+# Create simple startup script
+RUN echo '#!/bin/bash\n\
+set -e\n\
+echo "Starting Laravel application..."\n\
+exec apache2-foreground' > /usr/local/bin/start.sh \
+    && chmod +x /usr/local/bin/start.sh
+
+# Expose port 80
+EXPOSE 80
+
+# Start Apache
+CMD ["/usr/local/bin/start.sh"]

Dockerfile.simple

@@ -0,0 +1,75 @@
+# Ultra-minimal Dockerfile for Laravel 5.0 with PHP 5.6
+FROM php:5.6-apache
+
+# Set working directory
+WORKDIR /var/www/html
+
+# Install packages one by one to identify issues
+RUN apt-get update
+
+# Install core development tools first
+RUN apt-get install -y \
+    curl \
+    git \
+    zip \
+    unzip
+
+# Install mcrypt (most important for Laravel 5.0)
+RUN apt-get install -y libmcrypt-dev \
+    && docker-php-ext-install mcrypt
+
+# Install basic PHP extensions
+RUN docker-php-ext-install \
+    pdo \
+    pdo_mysql \
+    mbstring
+
+# Try to install GD dependencies
+RUN apt-get install -y \
+    libpng-dev \
+    libjpeg-dev \
+    libfreetype6-dev \
+    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+    && docker-php-ext-install gd
+
+# Install zip extension
+RUN apt-get install -y zlib1g-dev \
+    && docker-php-ext-install zip
+
+# Clean up
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Enable Apache rewrite module
+RUN a2enmod rewrite
+
+# Configure Apache
+RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
+ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+
+# Copy application files
+COPY . /var/www/html/
+
+# Set basic permissions
+RUN chown -R www-data:www-data /var/www/html \
+    && chmod -R 755 /var/www/html
+
+# Create .env file if needed
+RUN if [ ! -f /var/www/html/.env ]; then \
+        cp /var/www/html/.env.example /var/www/html/.env; \
+    fi
+
+# Install dependencies without dev packages
+RUN composer install --no-dev --no-interaction || true
+
+# Generate Laravel key
+RUN php artisan key:generate || true
+
+# Expose port 80
+EXPOSE 80
+
+# Start Apache
+CMD ["apache2-foreground"]

Dockerfile.test

@@ -0,0 +1,60 @@
+# Test Dockerfile to identify available packages
+FROM php:5.6-apache
+
+WORKDIR /var/www/html
+
+# Update package lists first
+RUN apt-get update
+
+# Test each package individually
+RUN apt-get install -y curl || echo "curl failed"
+RUN apt-get install -y git || echo "git failed"
+RUN apt-get install -y zip || echo "zip failed"
+RUN apt-get install -y unzip || echo "unzip failed"
+
+# Test mcrypt (most important)
+RUN apt-get install -y libmcrypt-dev || echo "libmcrypt-dev failed"
+
+# Test image libraries one by one
+RUN apt-get install -y libpng-dev || echo "libpng-dev failed"
+RUN apt-get install -y libjpeg-dev || echo "libjpeg-dev failed"
+RUN apt-get install -y libfreetype6-dev || echo "libfreetype6-dev failed"
+
+# Test zip library
+RUN apt-get install -y zlib1g-dev || echo "zlib1g-dev failed"
+
+# Try to install PHP extensions
+RUN docker-php-ext-install mcrypt || echo "mcrypt extension failed"
+RUN docker-php-ext-install pdo || echo "pdo extension failed"
+RUN docker-php-ext-install pdo_mysql || echo "pdo_mysql extension failed"
+RUN docker-php-ext-install mbstring || echo "mbstring extension failed"
+
+# Test GD configuration
+RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ || echo "gd configure failed"
+RUN docker-php-ext-install gd || echo "gd extension failed"
+
+# Test zip extension
+RUN docker-php-ext-install zip || echo "zip extension failed"
+
+# Clean up
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Basic Apache setup
+RUN a2enmod rewrite
+ENV APACHE_DOCUMENT_ROOT=/var/www/html/public
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+
+# Test copy and basic setup
+COPY . /var/www/html/
+RUN chown -R www-data:www-data /var/www/html
+
+# Test Laravel commands
+RUN if [ ! -f .env ]; then cp .env.example .env; fi || echo ".env creation failed"
+RUN composer install --no-dev --no-interaction || echo "composer install failed"
+RUN php artisan key:generate || echo "key generation failed"
+
+EXPOSE 80
+CMD ["apache2-foreground"]

PHP_COMPATIBILITY.md

@@ -0,0 +1,100 @@
+# Laravel 5.0 and PHP Compatibility Guide
+
+## Issue: mcrypt Extension Required
+
+Laravel 5.0 requires the `mcrypt` PHP extension, which was:
+
+- **Deprecated** in PHP 7.1
+- **Removed** in PHP 7.2+
+
+## Solutions
+
+### Option 1: Use PHP 5.6 (Current Implementation)
+
+The `Dockerfile.minimal` has been updated to use PHP 5.6 which is the ideal match for Laravel 5.0.
+
+**Pros:**
+
+- Perfect compatibility with Laravel 5.0
+- Native mcrypt support
+- All packages available and tested
+- Matches original development environment
+
+**Cons:**
+
+- PHP 5.6 reached end-of-life in December 2018
+- Security concerns for long-term production use
+
+### Option 2: Upgrade Laravel (Recommended for Production)
+Upgrade to Laravel 5.5+ which doesn't require mcrypt.
+
+```bash
+# Update composer.json
+"laravel/framework": "5.8.*"
+
+# Remove mcrypt dependencies and update encryption
+php artisan key:generate
+```
+
+### Option 3: Use OpenSSL Instead (Laravel 5.2+)
+If upgrading Laravel, update encryption configuration:
+
+```php
+// config/app.php
+'cipher' => 'AES-256-CBC',
+```
+
+## Current Docker Configuration
+
+The Dockerfile now uses:
+
+- **Base Image**: `php:5.6-apache`
+- **mcrypt Extension**: Native support (no installation issues)
+- **Other Extensions**: All Laravel 5.0 requirements met
+- **Package Compatibility**: Perfect match for PHP 5.6
+
+## Production Recommendations
+
+For a production deployment, consider:
+
+1. **Upgrade Laravel** to 5.8 or later (LTS)
+2. **Use PHP 7.4+** for better performance and security
+3. **Replace mcrypt** with OpenSSL encryption
+
+## Quick Upgrade Path (Optional)
+
+If you want to modernize the application:
+
+### Step 1: Update composer.json
+```json
+{
+    "require": {
+        "laravel/framework": "5.8.*"
+    }
+}
+```
+
+### Step 2: Update Dockerfile to use PHP 7.4
+```dockerfile
+FROM php:7.4-apache
+# Remove mcrypt installation
+```
+
+### Step 3: Update configuration
+```bash
+php artisan key:generate
+php artisan config:cache
+```
+
+## Security Note
+
+Since PHP 7.1 is end-of-life, monitor for security updates and consider upgrading the Laravel version for long-term production use.
+
+## Testing the Current Setup
+
+The current configuration should work with:
+```bash
+./start-local.sh
+```
+
+This will use PHP 7.1 with mcrypt support for Laravel 5.0 compatibility.

app/Http/Controllers/paypal/PaypalController.php

@@ -399,8 +399,7 @@ class PaypalController extends Controller
 	public function getTax($cartKey)
 	{
 		$m		 		= new TeamStoreModel;
-		$updated_getSubtotal 	= $m->getSubtotalNew($cartKey);
-		$original_subtotal 	= $m->getSubtotal($cartKey); // withoutTanle
+		$updated_getSubtotal 	= $m->getSubtotal($cartKey);
 		$grouped_item 	= $m->selectTeamStoreGroupByCartKey($cartKey);
 
 		if (count($grouped_item) <= 0) {
@@ -415,11 +414,10 @@ class PaypalController extends Controller
 
 
 		$order_grandtotal = $updated_getSubtotal[0]->Subtotal;
-		$order_subtotal = $original_subtotal[0]->Subtotal;
-		
 
 
-		$tax = $order_subtotal * $tax_value;
+
+		$tax = $order_grandtotal * $tax_value;
 
 		return [
 			'tax' => $tax,

app/Http/Controllers/teamstore/TeamStoreController.php

@@ -499,30 +499,6 @@ class TeamStoreController extends Controller
 					'ShippingCostId' => $shipping_cost_id
 				);
 			}
-		} elseif ($product_form == "number-size-form") {
-
-			// $order_names =  $post['order_names'];
-			$order_number =  $post['order_number'];
-			$order_size =  $post['order_size'];
-
-			foreach ($order_size as $key => $val) {
-				$items[] = array(
-					'ProductId'		=> $product_id,
-					'StoreURL'		=> $store_url,
-					'StoreId'		=> $store_id,
-					'FormUsed'		=> $product_form,
-					'CartKey' 	 	=> $cartKey,
-					'DesignCode'	=> $design_code,
-					'ProductURL' 	=> $ProductURL,
-					'ProductName' 	=> $product_name,
-					'Name' 		 	=> $product_name,
-					'Size' 		 	=> $order_size[$key],
-					'Number'     	=> $order_number[$key],
-					'Price'			=> $ProductPrice,
-					'Quantity'		=> 1,
-					'ShippingCostId' => $shipping_cost_id
-				);
-			}
 		} elseif ($product_form == "number-form") {
 
 			$order_number =  $post['order_number'];
@@ -978,7 +954,6 @@ class TeamStoreController extends Controller
 				'shippingFee' => number_format($shippingFee, 2),
 				'total' =>  number_format($finalSubTotal + $shippingFee + $tax["tax"], 2),
 				'subtotal' =>  number_format($finalSubTotal, 2),
-				'tax' => $tax["tax"],
 				'remaining_shippingfee' => number_format(99 - $finalSubTotal, 2)
 			));
 		} else {

app/Http/Controllers/user/UserController.php

@@ -348,16 +348,14 @@ class UserController extends Controller
 		$newTeamStoreModel 	= new TeamStoreModel;
 
 		$product_array 		= $newTeamStoreModel->selectTeamStoreProducts('ProductURL', $url);
-		$roster 		=     $newUserModel->getRoster($product_array[0]->Id);
 		$thumbnails_array 	= $newTeamStoreModel->getThumbnails($product_array[0]->Id);
 		$available_size = explode(",", $product_array[0]->AvailableSizes);
 		$shipping_cost = $newUserModel->selectShippingCost();
+
 		return view('user-layouts.view-store-item')->with('product_array', $product_array)
 			->with('available_size', $available_size)
 			->with('thumbnails_array', $thumbnails_array)
-			->with('shipping_cost', $shipping_cost)
-			->with('roster', $roster);
-			 
+			->with('shipping_cost', $shipping_cost);
 	}
 
 
@@ -1346,76 +1344,4 @@ class UserController extends Controller
 
 		return $array_address_book;
 	}
-
-	function roster(Request $request)
-	{
-		$UserModel				= new UserModel;
-		$post 					=	$request->all();
-
-		$response = $UserModel->insertRoster($post['data']);
-		
-		if($response) {
-			return response()->json(array(
-				'status' => true,
-				'message' => "Roster is successfully saved."
-			));
-		}
-
-		return response()->json(array(
-			'status' => false,
-			'message' => "Something went wrong. Please try again"
-		));
-		
-	}
-
-	function deleteRoster(Request $request) {
-		$UserModel				= new UserModel;
-		$post 					=	$request->all();
-
-		$response = $UserModel->deleteRoster($post['data']);
-		
-		if($response) {
-			return response()->json(array(
-				'status' => true,
-				'message' => "Roster is successfully deleted."
-			));
-		}
-
-		return response()->json(array(
-			'status' => false,
-			'message' => "Something went wrong. Please try again"
-		));
-
-	} 
-
-
-	function rosterUpdate(Request $request)
-	{
-		$UserModel				= new UserModel;
-		$post 					=	$request->all();
-
-		$response = $UserModel->updateRoster($post['data']);
-		
-		if($response) {
-			return response()->json(array(
-				'status' => true,
-				'message' => "Roster is successfully updated."
-			));
-		}
-
-		return response()->json(array(
-			'status' => false,
-			'message' => "Something went wrong. Please try again"
-		));
-		
-	}
-
-	function getCurrentRoster(Request $request) {
-		$productId = $request->query('product-id');
-		$newUserModel 		= new UserModel;
-		$roster 		=     $newUserModel->getRoster($productId);
-		return response()->json($roster);
-	}
-
-	
-}
+}

app/Http/routes.php

@@ -149,11 +149,6 @@ Route::group(['middleware' => 'normaluser'], function () {
 
 
 	Route::post('user/store-items/personal-design', 'user\UserController@saveNewItemFromDesigner');
-
-	Route::post('user/roster', 'user\UserController@roster');
-	Route::get('user/roster', 'user\UserController@getCurrentRoster');
-	Route::post('user/roster-delete', 'user\UserController@deleteRoster');
-	Route::post('user/roster-update', 'user\UserController@rosterUpdate');
 });
 
 Route::group(['middleware' => 'auth'], function () {

app/Models/teamstore/TeamStoreModel.php

@@ -189,16 +189,6 @@ class TeamStoreModel extends Model
 		return $i;
 	}
 
-	function getSubtotalNew($cartKey)
-	{
-
-		$i = DB::table('cart_tmp')->select(DB::raw('SUM(Quantity * Price) AS Subtotal'))
-			->where('CartKey', '=', $cartKey)
-			// ->where('VoucherId', '=', null)
-			->get();
-		return $i;
-	}
-
 	function updateStoreItem($data, $url)
 	{
 		$i = DB::table('teamstore_products')->where('ProductURL', $url)

app/Models/user/UserModel.php

@@ -425,44 +425,4 @@ class UserModel extends Model
 			->update($data);
 		return $i;
 	}
-
-	function insertRoster($data) {
-		$i = DB::table('roster')
-			->insert($data);
-		return $i;
-	}
-
-	function getRoster($productId)
-	{
-		$i = DB::table('roster')
-			->where('ProductId', $productId)
-			->get();
-		return $i;
-	}
-
-	 function deleteRoster($idArray)
-	{
-		$deletedRows = DB::table('roster')
-			->whereIn('Id', $idArray) // Replace 'id' with the actual column name if different
-			->delete();
-	
-		return $deletedRows; // Returns the number of rows deleted
-	}
-
-	function updateRoster($data)
-	{
-		$updatedRows = 0;
-
-		foreach ($data as $item) {
-			// Assuming each item contains an 'id' and the fields to update
-			$id = $item['Id'];
-			unset($item['Id']); // Remove 'id' from the update data
-
-			$updatedRows += DB::table('roster')
-				->where('Id', $id)
-				->update($item);
-		}
-
-		return $updatedRows; // Returns the total number of rows updated
-	}
-}
+}

cloudbuild.yaml

@@ -0,0 +1,156 @@
+# Google Cloud Build configuration for Laravel 5 application deployment to Cloud Run
+steps:
+  # Step 1: Build the Docker image
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - 'build'
+      - '-t'
+      - 'gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA'
+      - '-t'
+      - 'gcr.io/$PROJECT_ID/merchbay-laravel:latest'
+      - '-f'
+      - 'Dockerfile.simple'
+      - '.'
+    id: 'build-image'
+
+  # Step 2: Push the Docker image to Google Container Registry
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - 'push'
+      - 'gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA'
+    id: 'push-image'
+    waitFor: ['build-image']
+
+  # Step 3: Push the latest tag as well
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - 'push'
+      - 'gcr.io/$PROJECT_ID/merchbay-laravel:latest'
+    id: 'push-latest'
+    waitFor: ['build-image']
+
+  # Step 4: Run database migrations (optional - only if you have Cloud SQL configured)
+  # Uncomment and configure if you need to run migrations
+  # - name: 'gcr.io/cloud-builders/gcloud'
+  #   entrypoint: 'bash'
+  #   args:
+  #     - '-c'
+  #     - |
+  #       gcloud run jobs create laravel-migrate \
+  #         --image=gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA \
+  #         --region=$_REGION \
+  #         --set-env-vars="APP_ENV=production,APP_KEY=$_APP_KEY,DB_HOST=$_DB_HOST,DB_DATABASE=$_DB_DATABASE,DB_USERNAME=$_DB_USERNAME,DB_PASSWORD=$_DB_PASSWORD" \
+  #         --set-cloudsql-instances=$_CLOUDSQL_INSTANCE \
+  #         --command="php" \
+  #         --args="artisan,migrate,--force" \
+  #         --max-retries=1 \
+  #         --replace || true
+  #       gcloud run jobs execute laravel-migrate --region=$_REGION --wait
+  #   id: 'run-migrations'
+  #   waitFor: ['push-image']
+
+  # Step 5: Deploy to Cloud Run
+  - name: 'gcr.io/cloud-builders/gcloud'
+    args:
+      - 'run'
+      - 'deploy'
+      - '$_SERVICE_NAME'
+      - '--image'
+      - 'gcr.io/$PROJECT_ID/merchbay-laravel:$COMMIT_SHA'
+      - '--region'
+      - '$_REGION'
+      - '--platform'
+      - 'managed'
+      - '--allow-unauthenticated'
+      - '--port'
+      - '8080'
+      - '--memory'
+      - '$_MEMORY'
+      - '--cpu'
+      - '$_CPU'
+      - '--timeout'
+      - '$_TIMEOUT'
+      - '--concurrency'
+      - '$_CONCURRENCY'
+      - '--min-instances'
+      - '$_MIN_INSTANCES'
+      - '--max-instances'
+      - '$_MAX_INSTANCES'
+      - '--set-env-vars'
+      - 'APP_ENV=production,APP_DEBUG=false,APP_KEY=$_APP_KEY,DB_HOST=$_DB_HOST,DB_DATABASE=$_DB_DATABASE,DB_USERNAME=$_DB_USERNAME,DB_PASSWORD=$_DB_PASSWORD,CACHE_DRIVER=redis,SESSION_DRIVER=redis,QUEUE_DRIVER=database,PAYPAL_MODE=$_PAYPAL_MODE,PAYPAL_LIVE_CLIENT_ID=$_PAYPAL_LIVE_CLIENT_ID,PAYPAL_LIVE_SECRET=$_PAYPAL_LIVE_SECRET,PAYPAL_SANDBOX_CLIENT_ID=$_PAYPAL_SANDBOX_CLIENT_ID,PAYPAL_SANDBOX_SECRET=$_PAYPAL_SANDBOX_SECRET,MAIL_DRIVER=$_MAIL_DRIVER,MAIL_HOST=$_MAIL_HOST,MAIL_PORT=$_MAIL_PORT,MAIL_USERNAME=$_MAIL_USERNAME,MAIL_PASSWORD=$_MAIL_PASSWORD,GOOGLE_ANALYTICS_VIEW_ID=$_GOOGLE_ANALYTICS_VIEW_ID'
+      - '--set-cloudsql-instances'
+      - '$_CLOUDSQL_INSTANCE'
+      - '--vpc-connector'
+      - '$_VPC_CONNECTOR'
+      - '--add-cloudsql-instances'
+      - '$_CLOUDSQL_INSTANCE'
+    id: 'deploy-service'
+    waitFor: ['push-image']
+
+# Substitution variables - you can override these in your Cloud Build trigger
+substitutions:
+  # Service configuration
+  _SERVICE_NAME: 'merchbay-laravel'
+  _REGION: 'us-central1'
+  
+  # Resource limits
+  _MEMORY: '1Gi'
+  _CPU: '1000m'
+  _TIMEOUT: '300s'
+  _CONCURRENCY: '80'
+  _MIN_INSTANCES: '0'
+  _MAX_INSTANCES: '10'
+  
+  # Database configuration (Cloud SQL)
+  _CLOUDSQL_INSTANCE: 'YOUR_PROJECT_ID:REGION:INSTANCE_NAME'
+  _DB_HOST: '127.0.0.1'
+  _DB_DATABASE: 'merchbay'
+  _DB_USERNAME: 'laravel_user'
+  _DB_PASSWORD: 'YOUR_DB_PASSWORD'
+  
+  # VPC configuration (if needed)
+  _VPC_CONNECTOR: 'projects/YOUR_PROJECT_ID/locations/REGION/connectors/CONNECTOR_NAME'
+  
+  # Application configuration
+  _APP_KEY: 'base64:YOUR_APP_KEY_HERE'
+  
+  # PayPal configuration
+  _PAYPAL_MODE: 'live'
+  _PAYPAL_LIVE_CLIENT_ID: 'YOUR_PAYPAL_LIVE_CLIENT_ID'
+  _PAYPAL_LIVE_SECRET: 'YOUR_PAYPAL_LIVE_SECRET'
+  _PAYPAL_SANDBOX_CLIENT_ID: 'YOUR_PAYPAL_SANDBOX_CLIENT_ID'
+  _PAYPAL_SANDBOX_SECRET: 'YOUR_PAYPAL_SANDBOX_SECRET'
+  
+  # Mail configuration
+  _MAIL_DRIVER: 'smtp'
+  _MAIL_HOST: 'smtp.gmail.com'
+  _MAIL_PORT: '587'
+  _MAIL_USERNAME: 'your-email@domain.com'
+  _MAIL_PASSWORD: 'your-app-password'
+  
+  # Google Analytics
+  _GOOGLE_ANALYTICS_VIEW_ID: 'YOUR_GA_VIEW_ID'
+
+# Build options
+options:
+  # Use a more powerful machine for faster builds
+  machineType: 'E2_HIGHCPU_8'
+  
+  # Enable detailed logging
+  logging: CLOUD_LOGGING_ONLY
+
+# Build timeout
+timeout: '1200s'
+
+# Store build logs in Cloud Logging
+logsBucket: 'gs://YOUR_PROJECT_ID_cloudbuild-logs'
+
+# Available logs for debugging
+availableSecrets:
+  secretManager:
+    - versionName: 'projects/YOUR_PROJECT_ID/secrets/APP_KEY/versions/latest'
+      env: 'APP_KEY'
+    - versionName: 'projects/YOUR_PROJECT_ID/secrets/DB_PASSWORD/versions/latest'
+      env: 'DB_PASSWORD'
+    - versionName: 'projects/YOUR_PROJECT_ID/secrets/PAYPAL_LIVE_SECRET/versions/latest'
+      env: 'PAYPAL_LIVE_SECRET'

cloudrun/Dockerfile.cloudrun

@@ -1,72 +0,0 @@
-# Combined image for Cloud Run: nginx + php-fpm (PHP 5.6) for legacy Laravel 5
-# NOTE: PHP 5.6 is EOL; use only for legacy maintenance. Consider upgrading.
-
-FROM php:5.6-fpm
-
-# Set build args/env
-ARG APP_ENV=production
-ENV APP_ENV=${APP_ENV} \
-    APP_DEBUG=false \
-    OPCACHE_VALIDATE_TIMESTAMPS=0 \
-    COMPOSER_ALLOW_SUPERUSER=1 \
-    PORT=8080 \
-    PATH="/var/www/artisan:$PATH"
-
-WORKDIR /var/www
-
-# Install system deps (Debian variant easier than alpine for mixed services)
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    git curl unzip zip supervisor nginx \
-    libmcrypt4 libmcrypt-dev \
-    libpng-dev libjpeg62-turbo-dev libfreetype6-dev libzip-dev zlib1g-dev \
- && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
- && docker-php-ext-install gd mcrypt mbstring pdo pdo_mysql zip opcache \
- && rm -rf /var/lib/apt/lists/*
-
-# Install Composer (v1)
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
- && composer self-update --1
-
-# Copy composer files & install deps first (cache layer)
-COPY composer.* ./
-RUN composer config platform.php 5.6.40 \
- && composer install --no-dev --no-scripts --no-autoloader --prefer-dist
-
-# Copy application code
-COPY . .
-RUN composer dump-autoload --optimize --no-dev --classmap-authoritative || true
-
-# Nginx config
-COPY cloudrun/nginx.conf /etc/nginx/nginx.conf
-
-# Supervisord config
-COPY cloudrun/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# Remove default nginx site configs if present
-RUN rm -f /etc/nginx/sites-enabled/default /etc/nginx/conf.d/default.conf || true
-
-# Create runtime dirs
-RUN mkdir -p /run/php /var/log/supervisor /var/www/storage /var/www/bootstrap/cache \
- && chown -R www-data:www-data /var/www/storage /var/www/bootstrap/cache
-
-# PHP production ini tweaks
-RUN { \
-  echo "opcache.enable=1"; \
-  echo "opcache.memory_consumption=128"; \
-  echo "opcache.interned_strings_buffer=8"; \
-  echo "opcache.max_accelerated_files=4000"; \
-  echo "opcache.revalidate_freq=60"; \
-  echo "opcache.fast_shutdown=1"; \
-  echo "date.timezone=UTC"; \
-} > /usr/local/etc/php/conf.d/zz-custom.ini
-
-# Generate app key if missing (non-fatal if artisan fails early)
-RUN php artisan key:generate || true
-
-# Cloud Run listens on $PORT
-EXPOSE 8080
-
-# Health check path suggestion: /healthz (configure in Cloud Run if desired)
-
-# Start supervisor (manages php-fpm + nginx)
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

cloudrun/nginx.conf

@@ -1,42 +0,0 @@
-user  nginx;
-worker_processes  auto;
-error_log  /dev/stderr warn;
-pid        /var/run/nginx.pid;
-
-events { worker_connections 1024; }
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-    access_log    /dev/stdout main;
-    sendfile        on;
-    keepalive_timeout  65;
-    server_tokens off;
-
-    server {
-        listen       8080 default_server;
-        listen       [::]:8080 default_server;
-        root /var/www/public;
-        index index.php index.html;
-
-        location /healthz { return 200 'ok'; add_header Content-Type text/plain; }
-
-        location / {
-            try_files $uri $uri/ /index.php?$query_string;
-        }
-
-        location ~ \.php$ {
-            include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            fastcgi_pass 127.0.0.1:9000; # php-fpm
-            fastcgi_index index.php;
-            fastcgi_buffers 16 16k;
-            fastcgi_buffer_size 32k;
-        }
-
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
-            expires 30d;
-            access_log off;
-        }
-    }
-}

cloudrun/supervisord.conf

@@ -1,24 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/dev/stdout
-logfile_maxbytes=0
-
-[program:php-fpm]
-command=/usr/sbin/php-fpm5.6 -F
-priority=10
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:nginx]
-command=/usr/sbin/nginx -g 'daemon off;'
-priority=20
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0

docker-compose.local.yml

@@ -0,0 +1,75 @@
+# Docker Compose for local development and testing
+version: '3.8'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile.basic
+    ports:
+      - "8080:80"
+    environment:
+      - APP_ENV=local
+      - APP_DEBUG=true
+      - APP_KEY=base64:your-app-key-here
+      - DB_HOST=mysql
+      - DB_DATABASE=merchbay
+      - DB_USERNAME=laravel_user
+      - DB_PASSWORD=secret
+      - CACHE_DRIVER=file
+      - SESSION_DRIVER=file
+      - REDIS_HOST=redis
+      - QUEUE_DRIVER=sync
+      - PAYPAL_MODE=sandbox
+      - PAYPAL_SANDBOX_CLIENT_ID=your-sandbox-client-id
+      - PAYPAL_SANDBOX_SECRET=your-sandbox-secret
+      - MAIL_DRIVER=log
+    volumes:
+      - ./storage:/var/www/html/storage
+      - ./bootstrap/cache:/var/www/html/bootstrap/cache
+    depends_on:
+      - mysql
+      - redis
+    networks:
+      - app-network
+
+  mysql:
+    image: mysql:8.0
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=merchbay
+      - MYSQL_USER=laravel_user
+      - MYSQL_PASSWORD=secret
+    ports:
+      - "3306:3306"
+    volumes:
+      - mysql_data:/var/lib/mysql
+    networks:
+      - app-network
+
+  redis:
+    image: redis:7-alpine
+    ports:
+      - "6379:6379"
+    networks:
+      - app-network
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    environment:
+      - PMA_HOST=mysql
+      - PMA_USER=root
+      - PMA_PASSWORD=root
+    ports:
+      - "8081:80"
+    depends_on:
+      - mysql
+    networks:
+      - app-network
+
+volumes:
+  mysql_data:
+
+networks:
+  app-network:
+    driver: bridge

docker-compose.yml

@@ -1,3 +1,4 @@
+version: '3'
 services:
   
   #PHP Service
@@ -5,64 +6,34 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-      args:
-        - APP_ENV=production
     image: digitalocean.com/php
     container_name: app
     restart: unless-stopped
-    deploy:
-      resources:
-        limits:
-          cpus: '0.50'
-          memory: 512M
-        reservations:
-          cpus: '0.25'
-          memory: 256M
+    tty: true
     environment:
-      APP_ENV: production
-      APP_DEBUG: 'false'
-      PHP_OPCACHE_VALIDATE_TIMESTAMPS: 0
+      SERVICE_NAME: app
+      SERVICE_TAGS: dev
     working_dir: /var/www
     volumes:
-      - ./storage:/var/www/storage
+      - ./:/var/www
       - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
     networks:
       - app-network
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/"]
-      interval: 30s
-      timeout: 3s
-      retries: 3
 
   #Nginx Service
   webserver:
     image: nginx:alpine
     container_name: webserver
     restart: unless-stopped
-    deploy:
-      resources:
-        limits:
-          cpus: '0.30'
-          memory: 256M
-        reservations:
-          cpus: '0.10'
-          memory: 128M
+    tty: true
     ports:
       - "10003:80"
       - "10443:443"
     volumes:
-      - ./public:/var/www/public
+      - ./:/var/www
       - ./nginx/conf.d/:/etc/nginx/conf.d/
     networks:
       - app-network
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:80/"]
-      interval: 30s
-      timeout: 3s
-      retries: 3
-    depends_on:
-      app:
-        condition: service_healthy
 
 #Docker Networks
 networks:

nginx/conf.d/app.conf

@@ -1,60 +1,31 @@
 server {
     listen 80;
-    server_tokens off;
-    
-    # Compression
-    gzip on;
-    gzip_comp_level 5;
-    gzip_min_length 256;
-    gzip_proxied any;
-    gzip_vary on;
-    gzip_types
-        application/javascript
-        application/json
-        application/x-javascript
-        application/xml
-        text/css
-        text/javascript
-        text/plain
-        text/xml;
-    
-    client_max_body_size 100M;
-    fastcgi_read_timeout 1800;
-    
-    error_log  /var/log/nginx/error.log warn;
-    access_log /var/log/nginx/access.log combined buffer=512k flush=1m;
-    
-    root /var/www/public;
     index index.php index.html;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /var/www/public;
 
-     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;
-        }
+    location / {
         try_files $uri $uri/ /index.php?$query_string;
-
     }
+
     location ~ \.php$ {
-        fastcgi_index index.php;
-        fastcgi_pass app:9000;
-   
-        include fastcgi_params;
+        try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
-        fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
+        fastcgi_pass app:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
+
+    location ~ /\.ht {
+        deny all;
+    }
+
     location ~* \.(css|less|js|jpg|png|gif)$ {
-            add_header Cache-Control "no-cache, no-store, must-revalidate";
-            add_header Pragma "no-cache";
-            expires 0;
+        expires 0;
+        add_header Cache-Control "no-cache, no-store, must-revalidate";
+        add_header Pragma "no-cache";
     }
-
 }

rebuild.sh

@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Check if docker compose (new) or docker-compose (old) is available
+if command -v docker &>/dev/null; then
+    if docker compose version &>/dev/null; then
+        DOCKER_COMPOSE="docker compose"
+    elif command -v docker-compose &>/dev/null; then
+        DOCKER_COMPOSE="docker-compose"
+    else
+        echo "❌ Error: Neither 'docker compose' nor 'docker-compose' found."
+        echo "Please install Docker Desktop from https://www.docker.com/products/docker-desktop/"
+        exit 1
+    fi
+else
+    echo "❌ Error: Docker is not installed."
+    echo "Please install Docker Desktop from https://www.docker.com/products/docker-desktop/"
+    exit 1
+fi
+
+echo "🚀 Starting rebuild process..."
+
+# Function to display usage
+show_usage() {
+    echo "Usage: ./rebuild.sh [OPTIONS]"
+    echo "Options:"
+    echo "  -h, --help     Show this help message"
+    echo "  -c, --clean    Perform a clean rebuild (no cache)"
+    echo "  -f, --fresh    Perform a fresh migration"
+}
+
+# Default values
+CLEAN_BUILD=false
+FRESH_MIGRATION=false
+
+# Parse arguments
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        -h|--help) show_usage; exit 0 ;;
+        -c|--clean) CLEAN_BUILD=true ;;
+        -f|--fresh) FRESH_MIGRATION=true ;;
+        *) echo "Unknown parameter: $1"; show_usage; exit 1 ;;
+    esac
+    shift
+done
+
+# Pull latest changes from git
+echo "📥 Pulling latest changes from git..."
+if ! git pull; then
+    echo "❌ Git pull failed. Please resolve any conflicts and try again."
+    exit 1
+fi
+
+# Stop running containers
+echo "📥 Stopping running containers..."
+$DOCKER_COMPOSE down
+
+# Remove old images if clean build
+if [ "$CLEAN_BUILD" = true ] ; then
+    echo "🧹 Cleaning Docker cache..."
+    $DOCKER_COMPOSE rm -f
+    docker system prune -f
+fi
+
+# Build and start containers
+echo "🏗️  Building containers..."
+if [ "$CLEAN_BUILD" = true ] ; then
+    $DOCKER_COMPOSE build --no-cache
+else
+    $DOCKER_COMPOSE build
+fi
+
+# Start containers
+echo "🚀 Starting containers..."
+$DOCKER_COMPOSE up -d
+
+# Wait for the containers to be ready
+echo "⏳ Waiting for containers to be ready..."
+sleep 10
+
+# Clear Laravel cache
+echo "🧹 Clearing Laravel cache..."
+$DOCKER_COMPOSE exec app php artisan cache:clear
+$DOCKER_COMPOSE exec app php artisan config:clear
+$DOCKER_COMPOSE exec app php artisan view:clear
+
+# Run composer install
+echo "📦 Installing dependencies..."
+$DOCKER_COMPOSE exec app composer install
+
+# Generate application key if .env exists and APP_KEY is empty
+if [ -f .env ] && ! grep -q "^APP_KEY=[A-Za-z0-9+/]\{40\}$" .env; then
+    echo "🔑 Generating application key..."
+    $DOCKER_COMPOSE exec app php artisan key:generate
+fi
+
+# Run migrations if requested
+if [ "$FRESH_MIGRATION" = true ] ; then
+    echo "🔄 Running fresh migrations..."
+    $DOCKER_COMPOSE exec app php artisan migrate:fresh
+else
+    echo "🔄 Running migrations..."
+    $DOCKER_COMPOSE exec app php artisan migrate
+fi
+
+echo "✨ Rebuild completed!"
+echo "🌐 Your application should be available at http://localhost:8080" 

resources/views/emails/orders.blade.php

@@ -540,13 +540,6 @@
                                                                                     <td><b>Price</b></td>
                                                                                     <td><b>Quantity</b></td>
                                                                                 </tr>
-                                                                            @elseif($item->FormUsed == 'number-size-form')
-                                                                                <tr>
-                                                                                    <td><b>Number</b></td>
-                                                                                    <td><b>Size</b></td>
-                                                                                    <td><b>Price</b></td>
-                                                                                    <td><b>Quantity</b></td>
-                                                                                </tr>
                                                                             @else
                                                                             @endif
                                                                             <!-- table header  -->
@@ -673,17 +666,6 @@
                                                                                             <td>{{ $sub_item->Quantity }}
                                                                                             </td>
                                                                                         </tr>
-                                                                                    @elseif($item->FormUsed == 'number-size-form')
-                                                                                        <tr>
-                                                                                            <td>{{ $sub_item->Number }}
-                                                                                            </td>
-                                                                                            <td>{{ $sub_item->Size }}
-                                                                                            </td>
-                                                                                            <td>{{ $sub_item->Price }}
-                                                                                            </td>
-                                                                                            <td>{{ $sub_item->Quantity }}
-                                                                                            </td>
-                                                                                        </tr>
                                                                                     @else
                                                                                     @endif
                                                                                 @endif

resources/views/merchbay/cart.blade.php

@@ -174,15 +174,6 @@
                                                                 <th>Quantity</th>
                                                                 <th></th>
                                                             </tr>
-                                                        @elseif($item->FormUsed == 'number-size-form')
-                                                            <tr>
-                                                                <th>Number</th>
-                                                                <th>Size</th>
-                                                                <th>Price</th>
-                                                                <th>Quantity</th>
-                                                                <th></th>
-                                                            </tr>
-                                                        
                                                         @else
                                                         @endif
 
@@ -305,17 +296,6 @@
                                                                                 href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
                                                                                     class="fa fa-times"></i></a></td>
                                                                     </tr>
-                                                                @elseif($item->FormUsed == 'number-size-form')
-                                                                    <tr>
-                                                                        <td>{{ $sub_item->Number }}</td>
-                                                                        <td>{{ $sub_item->Size }}</td>
-                                                                        <td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
-                                                                        </td>
-                                                                        <td>{{ $sub_item->Quantity }}</td>
-                                                                        <td><a class="btn btn-xs btn-link pull-right"
-                                                                                href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
-                                                                                    class="fa fa-times"></i></a></td>
-                                                                    </tr>
                                                                 @else
                                                                 @endif
                                                             @endif

resources/views/merchbay_main.blade.php

@@ -10,11 +10,11 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
 
     <title>Merchbay</title>
-    <link rel="icon" href="{{ asset('public/favicon.ico') }}">
+    <link rel="icon" href="{{ asset('favicon.ico') }}">
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;400;500;600;700;800;900&display=swap" rel="stylesheet">
 
-    <link href="{{ asset('public/assets/css/merchbay/styles.css') }}" rel="stylesheet">
+    <link href="{{ asset('assets/css/merchbay/styles.css') }}" rel="stylesheet">
     <!-- <link href="{{ asset('public/assets/login/css/style.css') }}" rel="stylesheet">
     <link href="{{ asset('public/assets/login/css/form-elements.css') }}" rel="stylesheet"> -->
     <script src='https://www.google.com/recaptcha/api.js'></script>
@@ -258,7 +258,7 @@
         }
 
         function fetchCanada() {
-            $.getJSON("{{ asset('/public/api/canada.json') }}", function(items) {
+            $.getJSON("{{ asset('/api/canada.json') }}", function(items) {
                 var states = [];
 
                 Object.keys(items).forEach(function(state) {
@@ -307,7 +307,7 @@
         }
 
         function fetchUSA() {
-            $.getJSON("{{ asset('/public/api/usaCities.json') }}", function(data) {
+            $.getJSON("{{ asset('/api/usaCities.json') }}", function(data) {
                 var states = [];
 
                 for (i = 0; i < data.length; i++) {

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

@@ -1,45 +0,0 @@
-
-<div class="panel-design-details" id="orderListPanel">
-    <table class="table" id="tableRow" style="font-size:12px;">
-        <thead>
-            <tr>
-                <!-- <th>#</th> -->
-                {{-- <th class="col-md-5">Name</th> --}}
-                <th class="col-md-6">Number</th>
-                <th class="col-md-5">Size</th>
-                <th class="text-center"></th>
-            </tr>
-        </thead>
-        <tbody id="orderTableBody">
-            <tr class="table-tr-0">
-                {{-- <td>
-                    <input type="text" name="order_names[]" id="order_names" class="form-control input-sm inputName roster-input" placeholder="Name">
-                </td> --}}
-                <td>
-                    <select class="form-control input-sm roster-input" name="order_number[]">
-                        <option value="none">none</option>
-                        @for($i = 0; $i <= 99; $i++)
-                            <option value="{{ $i }}">{{ $i }}</option>
-                        @endfor
-                        <option value="00">00</option>
-                    </select>
-                </td>
-                <td>
-                    <select class="form-control input-sm order-size roster-input" name="order_size[]" style="border-right: 1px solid #ccc;"  data-row-number="1">
-                        @foreach($sizes_array as $size)
-                            <option value="{{ $size->Size }}">{{ $size->SizeDisplay }}</option>
-                        @endforeach
-                    </select>
-                </td>
-                <td id="action-column" class="text-center" style="padding: 4px !important; border-top: none">
-                    <span class="tr-remove-btn">
-                        <button type="button" id="addNewRow" class="btn btn-success btn-sm btn-roster-action" data-toggle="tooltip" title="Add Another"><i class="fa fa-plus" aria-hidden="true"></i></button>
-                    </span>
-                </td>
-            </tr>
-        </tbody>
-    </table>
-    <div id="addnew-btn-tbl-row">
-    </div>
-</div>
-                   

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

@@ -7,12 +7,11 @@
             margin-top:20px;
         }
     </style>
-    <div class="content-wrapper" id="addItem" style="min-height: 916px;">
+    <div class="content-wrapper" style="min-height: 916px;">
         <!-- Content Header (Page header) -->
         <section class="content-header">
             <h1>
-                Add Store Item 
-                {{-- <p>@{{ message }}</p> --}}
+                Add Store Item
             </h1>
             <ol class="breadcrumb">
                 <li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li>
@@ -93,9 +92,6 @@
                                         </div>
                                         <div class="form-group">
                                             <label>Item Form</label>
-                                            <div class="row">
-                                                <div class="col-lg-10"></div>
-                                            </div>
                                             <select class="form-control" name="itemForm">
                                                 <option value="jersey-and-shorts-form">Jersey and Shorts Form</option>
                                                 <option value="tshirt-form">T-Shirt Form</option>
@@ -106,7 +102,6 @@
                                                 <option value="name-size-form">Name and Size Form</option>
                                                 <option value="jersey-and-shorts-quantity-form">Jersey, Shorts and Quantity Form</option>
                                                 <option value="number-jersey-shorts-form">Number, Jersey and Shorts Form</option>
-                                                <option value="number-size-form">Number and Size Form</option>
                                                 <option value="roster-name-number-size-form">Roster and Size Form</option>
                                             </select>
                                         </div>

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

@@ -125,8 +125,7 @@
                                                 <option value="tshirt-form">T-Shirt Form</option>
                                                 <option value="quantity-form">Quantity Form</option>
                                                 <option value="name-and-number-form">Name and Number Form</option>
-                                                <option value="name-and-number-form">Name and Number Form</option>
-                                                <option value="number-size-form">Number and Size Form</option>
+                                                <option value="name-number-size-form">Name, Number and Size Form</option>
                                                 <option value="number-form">Number Only Form</option>
                                             </select>
                                         </div>

resources/views/user-layouts/order-details-body.blade.php

@@ -114,13 +114,6 @@
                         <th>Price</th>
                         <th>Quantity</th>
                     </tr>
-                @elseif($array_item[0]->FormUsed=="number-size-form")
-                    <tr>
-                        <th>Number</th>
-                        <th>Size</th>
-                        <th>Price</th>
-                        <th>Quantity</th>
-                    </tr>
                 @else
 
                 @endif
@@ -202,13 +195,6 @@
                         <td>{{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
                         <td>{{ $array_item[0]->Quantity }}</td>
                     </tr>
-                @elseif($array_item[0]->FormUsed=="number-size-form")
-                    <tr>
-                        <td>{{ $array_item[0]->Number }}</td>
-                        <td>{{ $array_item[0]->Size }}</td>
-                        <td>{{ $array_item[0]->Price . ' ' . $store_array[0]->StoreCurrency }}</td>
-                        <td>{{ $array_item[0]->Quantity }}</td>
-                    </tr>
                 @else
 
                 @endif

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

@@ -158,14 +158,6 @@
                                                                         <th>Quantity</th>
                                                                         <th></th>
                                                                     </tr>
-                                                                @elseif($item->FormUsed=="number-size-form")
-                                                                    <tr>
-                                                                        <th>Number</th>
-                                                                        <th>Size</th>
-                                                                        <th>Price</th>
-                                                                        <th>Quantity</th>
-                                                                        <th></th>
-                                                                    </tr>
                                                                 @else
 
                                                                 @endif
@@ -227,13 +219,6 @@
                                                                               <td>{{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
                                                                               <td>{{ $sub_item->Quantity }}</td>
                                                                             </tr>
-                                                                        @elseif($item->FormUsed=="number-size-form")
-                                                                            <tr>
-                                                                              <td>{{ $sub_item->Number }}</td>
-                                                                              <td>{{ $sub_item->Size }}</td>
-                                                                              <td>{{ $sub_item->Price . ' ' . $array_payment_details[0]->Currency }}</td>
-                                                                              <td>{{ $sub_item->Quantity }}</td>
-                                                                            </tr>
                                                                         @else
 
                                                                         @endif

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

@@ -127,7 +127,6 @@
                                                 <option value="name-and-number-form">Name and Number Form</option>
                                                 <option value="name-number-size-form">Name, Number and Size Form</option>
                                                 <option value="number-form">Number Only Form</option>
-                                                <option value="number-size-eform">Number and Size Form</option>
                                             </select>
                                         </div>
                                         <div class="form-group">

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

@@ -44,10 +44,6 @@
 	<!-- jquery-ui -->
 	<link href="{{ asset('/public/assets/css/jquery-ui.css') }}" rel="stylesheet">
 	<link href="{{asset('/public/designer/css/build.css')}}" rel="stylesheet">
-
-	
-	<script src="https://cdn.jsdelivr.net/npm/vue@2.7.14"></script>
-	<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 	<!--[if lt IE 9]>
@@ -2154,6 +2150,7 @@
 
 		function submitFormItemDetails() {
 			var data = $("#frm-item-details").serialize();
+			// console.log(data)
 			$.ajax({
 				type: 'POST',
 				url: "{{ url('user/store-items/update') }}",

resources/views/user-layouts/view-store-item.blade.php

@@ -1,644 +1,277 @@
 @extends('user-layouts.user_template')
 @section('content')
-    <style>
-        .hide-bullets {
-            list-style: none;
-            margin-left: -40px;
-            margin-top: 20px;
-        }
-    </style>
-
-
-    <div class="content-wrapper" id="viewStoreItem" style="min-height: 916px;">
-        <!-- Content Header (Page header) -->
-        <section class="content-header">
-            <h1>
-                @{{ title }}
-                <small>{{ $product_array[0]->ProductName }}</small>
-            </h1>
-            <ol class="breadcrumb">
-                <li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li>
-                <li><a href="{{ url('user/store-items') }}"><i class="fa fa-th"></i> Store Items</a></li>
-                <li class="active">{{ $product_array[0]->ProductName }}</li>
-            </ol>
-        </section>
-        <!-- Main content -->
-        <section class="content">
-            <div class="row">
-                <div class="col-md-7">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <button type="button" class="btn btn-default pull-right" data-toggle="modal"
-                                data-target="#myModal">Re-arrange / Delete thumbnail</button>
-                            <button type="button" class="btn btn-danger pull-right" id="btn_delete_store_id"
-                                style="margin-right: 5px;" data-id="{{ $product_array[0]->Id }}">Delete this
-                                Item</button>
+<style>
+    .hide-bullets {
+        list-style: none;
+        margin-left: -40px;
+        margin-top: 20px;
+    }
+</style>
+<div class="content-wrapper" style="min-height: 916px;">
+    <!-- Content Header (Page header) -->
+    <section class="content-header">
+        <h1>
+            Store Item
+            <small>{{ $product_array[0]->ProductName }}</small>
+        </h1>
+        <ol class="breadcrumb">
+            <li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li>
+            <li><a href="{{ url('user/store-items') }}"><i class="fa fa-th"></i> Store Items</a></li>
+            <li class="active">{{ $product_array[0]->ProductName }}</li>
+        </ol>
+    </section>
+    <!-- Main content -->
+    <section class="content">
+        <div class="row">
+            <div class="col-md-7">
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <button type="button" class="btn btn-default pull-right" data-toggle="modal" data-target="#myModal">Re-arrange / Delete thumbnail</button>
+                        <button type="button" class="btn btn-danger pull-right" id="btn_delete_store_id" style="margin-right: 5px;" data-id="{{ $product_array[0]->Id }}">Delete this Item</button>
+                    </div>
+                    <div class="box-body custom-box-body">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="row">
+                                    <div class="col-md-12 text-center">
+                                        @foreach($thumbnails_array as $thumbnail)
+                                        @if($thumbnail->ImageClass == 'active')
+                                        <img style="height:400px" src="{{ config('site_config.images_url')  }}/{{ $thumbnail->Image . '?t=' . time() }}" id="main-thumbnail">
+                                        @endif
+                                        @endforeach
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-md-12">
+                                        <ul class="hide-bullets">
+                                            <li class="col-sm-3 col-xs-4">
+                                                <a class="thumbnail btn-add-thumbnail" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; margin-bottom: -28px; cursor: pointer;">
+                                                    <!-- <span class="close">&times;</span> -->
+                                                    <img class="img img-responsive product-center " style="height: 65.45px;" src="{{ asset('/public/images/add-new-img.svg') }}" />
+                                                    <!-- <p class="center">Add Image</p> -->
+                                                    <p class="text-center">
+                                                        Add Image
+                                                    </p>
+                                                </a>
+                                            </li>
+                                            @foreach($thumbnails_array as $thumbnail)
+                                            <li class="col-sm-3 col-xs-4">
+                                                <a class="thumbnail a_thumbnail {{ $thumbnail->ImageClass }}" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; margin-bottom: -28px;">
+                                                    <!-- <span class="close">&times;</span> -->
+                                                    <img class="img img-responsive product-center image-thumbnails" style="height: 59.45px;" src="{{ config('site_config.images_url')  }}/{{ $thumbnail->Image . '?t=' . time() }}" />
+                                                </a>
+                                                <div class="funkyradio">
+                                                    <div class="funkyradio-primary">
+                                                        <input type="radio" id="{{ 'radio-' .$thumbnail->Id }}" data-product-id="{{ $product_array[0]->Id }}" data-id="{{ $thumbnail->Id }}" name="setActive" @if($thumbnail->ImageClass != null) checked @endif />
+                                                        <label for="{{ 'radio-' .$thumbnail->Id }}" style="border-top-left-radius: 0px; border-top-right-radius: 0px;">active</label>
+                                                    </div>
+                                                </div>
+                                            </li>
+                                            @endforeach
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- <div class="col-md-5">
+                                    asdasdadadsaad
+                                </div> -->
                         </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-5">
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">
+                            Item Details
+                        </h3>
+                    </div>
+                    <form id="frm-item-details">
+                        <!-- <input type="hidden" name="design_code" class="form-control" value=""> -->
                         <div class="box-body custom-box-body">
                             <div class="row">
                                 <div class="col-md-12">
-                                    <div class="row">
-                                        <div class="col-md-12 text-center">
-                                            @foreach ($thumbnails_array as $thumbnail)
-                                                @if ($thumbnail->ImageClass == 'active')
-                                                    <img style="height:400px"
-                                                        src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}"
-                                                        id="main-thumbnail">
-                                                @endif
+                                    <input type="hidden" class="form-control" name="item_url" value="{{ $product_array[0]->ProductURL }}" placeholder="Item Name">
+                                    <div class="form-group">
+                                        <label>SKU</label>
+                                        <input type="text" class="form-control" name="sku" value="{{ $product_array[0]->ProductCode }}" placeholder="SKU">
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Item Name</label>
+                                        <input type="text" class="form-control" name="itemName" value="{{ $product_array[0]->ProductName }}" placeholder="Item Name">
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Item Desription</label>
+                                        <textarea class="form-control" name="itemDescription">{{ $product_array[0]->ProductDescription }}</textarea>
+                                    </div>
+                                    <!-- <div class="form-group">
+                                        
+                                            <div class="checkbox checkbox-inline">
+                                                <input type="checkbox" class="styled" id="sale_chk" name="sale_chk" checked >
+                                                <label for="sale_chk"> Sell Item</label>
+                                            </div>
+                                        
+                                            <div class="checkbox checkbox-inline">
+                                                <input type="checkbox" class="styled" id="publish_chk" name="publish_chk" >
+                                                <label for="publish_chk"> Publish Design</label>
+                                            </div>
+                                            
+                                        </div> -->
+                                    <div class="form-group">
+                                        <label>Item Price</label>
+                                        <input id="item_price" name="item_price" class="form-control price_format" type="text" value="{{ $product_array[0]->ProductPrice }}" data-error="#err-price" />
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Item Form</label>
+                                        <select class="form-control" name="itemForm">
+                                            <option value="jersey-and-shorts-form" @if($product_array[0]->ProductForm == "jersey-and-shorts-form") selected @endif>Jersey and Shorts Form</option>
+                                            <option value="tshirt-form" @if($product_array[0]->ProductForm == "tshirt-form") selected @endif>T-Shirt Form</option>
+                                            <option value="quantity-form" @if($product_array[0]->ProductForm == "quantity-form") selected @endif>Quantity Form</option>
+                                            <option value="name-number-form" @if($product_array[0]->ProductForm == "name-number-form") selected @endif>Name and Number Form</option>
+                                            <option value="name-number-size-form" @if($product_array[0]->ProductForm == "name-number-size-form") selected @endif>Name, Number and Size Form</option>
+                                            <option value="number-form" @if($product_array[0]->ProductForm == "number-form") selected @endif>Number Only Form</option>
+                                            <option value="name-size-form" @if($product_array[0]->ProductForm == "name-size-form") selected @endif>Name and Size Form</option>
+                                            <option value="jersey-and-shorts-quantity-form" @if($product_array[0]->ProductForm == "jersey-and-shorts-quantity-form") selected @endif>Jersey, Shorts and Quantity Form</option>
+                                            <option value="number-jersey-shorts-form" @if($product_array[0]->ProductForm == "number-jersey-shorts-form") selected @endif>Number, Jersey and Shorts Form</option>
+                                            <option value="roster-name-number-size-form" @if($product_array[0]->ProductForm == "roster-name-number-size-form") selected @endif>Roster and Size Form</option> 
+                                        </select>
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Available Size</label>
+                                        <select class="form-control select2" data-error="#err_available_size" data-placeholder="Select Size" name="available_size[]" multiple="multiple" required>
+                                            <option value="toddler" @if(in_array("toddler", $available_size)) selected @endif>Toddler</option>
+                                            <option value="youth" @if(in_array("youth", $available_size)) selected @endif>Youth</option>
+                                            <option value="adult" @if(in_array("adult", $available_size)) selected @endif>Adult</option>
+                                            <option value="mask" @if(in_array("mask", $available_size)) selected @endif>Mask</option>
+                                            <option value="gaiter" @if(in_array("gaiter", $available_size)) selected @endif>Gaiter</option>
+                                            <option value="buckethat" @if(in_array("buckethat", $available_size)) selected @endif>Buckethat</option>
+                                            <option value="none" @if(in_array("none", $available_size)) selected @endif>None</option>
+                                        </select>
+                                        <span id="err_available_size"></span>
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Item Quantity <small>(Optional)</small></label>
+                                        <input id="item_quantity" name="item_quantity" class="form-control" type="number" min="0" value="{{ $product_array[0]->ProductAvailableQty }}" data-error="#err-quantity" />
+                                    </div>
+                                    {{-- {{ var_dump($product_array[0]) }} --}}
+                                    <div class="form-group">
+                                        <label>Item Privacy</label>
+                                        <select class="form-control" name="item_privacy">
+                                            <option value="public" @if($product_array[0]->PrivacyStatus == "public") selected @endif>Public</option>
+                                            <option value="private" @if($product_array[0]->PrivacyStatus == "private") selected @endif>Private</option>
+                                        </select>
+                                    </div>
+
+                                    <div class="form-group">
+                                        <label>Select Shipping Category</label>
+                                        <select class="form-control" name="shipping_cost" required>
+                                            <option value="0">None</option>
+                                            @foreach ($shipping_cost as $sc)
+                                            <option value="{{ $sc->Id }}" @if($sc->Id == $product_array[0]->ShippingCostId) selected @endif>{{ $sc->DisplayName }}</option>
                                             @endforeach
-                                        </div>
-                                    </div>
-                                    <div class="row">
-                                        <div class="col-md-12">
-                                            <ul class="hide-bullets">
-                                                <li class="col-sm-3 col-xs-4">
-                                                    <a class="thumbnail btn-add-thumbnail"
-                                                        style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; margin-bottom: -28px; cursor: pointer;">
-                                                        <!-- <span class="close">&times;</span> -->
-                                                        <img class="img img-responsive product-center "
-                                                            style="height: 65.45px;"
-                                                            src="{{ asset('/public/images/add-new-img.svg') }}" />
-                                                        <!-- <p class="center">Add Image</p> -->
-                                                        <p class="text-center">
-                                                            Add Image
-                                                        </p>
-                                                    </a>
-                                                </li>
-                                                @foreach ($thumbnails_array as $thumbnail)
-                                                    <li class="col-sm-3 col-xs-4">
-                                                        <a class="thumbnail a_thumbnail {{ $thumbnail->ImageClass }}"
-                                                            style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; margin-bottom: -28px;">
-                                                            <!-- <span class="close">&times;</span> -->
-                                                            <img class="img img-responsive product-center image-thumbnails"
-                                                                style="height: 59.45px;"
-                                                                src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}" />
-                                                        </a>
-                                                        <div class="funkyradio">
-                                                            <div class="funkyradio-primary">
-                                                                <input type="radio" id="{{ 'radio-' . $thumbnail->Id }}"
-                                                                    data-product-id="{{ $product_array[0]->Id }}"
-                                                                    data-id="{{ $thumbnail->Id }}" name="setActive"
-                                                                    @if ($thumbnail->ImageClass != null) checked @endif />
-                                                                <label for="{{ 'radio-' . $thumbnail->Id }}"
-                                                                    style="border-top-left-radius: 0px; border-top-right-radius: 0px;">active</label>
-                                                            </div>
-                                                        </div>
-                                                    </li>
-                                                @endforeach
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- <div class="col-md-5">
-                                                                    asdasdadadsaad
-                                                                </div> -->
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-5">
-                    <div class="box box-primary">
-                        <div class="box-header with-border">
-                            <h3 class="box-title">
-                                Item Details
-                            </h3>
-                        </div>
-                        <form id="frm-item-details">
-                            <!-- <input type="hidden" name="design_code" class="form-control" value=""> -->
-                            <div class="box-body custom-box-body">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <input type="hidden" class="form-control" name="item_url"
-                                            value="{{ $product_array[0]->ProductURL }}" placeholder="Item Name">
-                                        <div class="form-group">
-                                            <label>SKU</label>
-                                            <input type="text" class="form-control" name="sku"
-                                                value="{{ $product_array[0]->ProductCode }}" placeholder="SKU">
-                                        </div>
-                                        <div class="form-group">
-                                            <label>Item Name</label>
-                                            <input type="text" class="form-control" name="itemName"
-                                                value="{{ $product_array[0]->ProductName }}" placeholder="Item Name">
-                                        </div>
-                                        <div class="form-group">
-                                            <label>Item Desription</label>
-                                            <textarea class="form-control" name="itemDescription">{{ $product_array[0]->ProductDescription }}</textarea>
-                                        </div>
-                                        <!-- <div class="form-group">
-                                                                        
-                                                                <div class="checkbox checkbox-inline">
-                                                                    <input type="checkbox" class="styled" id="sale_chk" name="sale_chk" checked >
-                                                                    <label for="sale_chk"> Sell Item</label>
-                                                                </div>
-                                                            
-                                                                <div class="checkbox checkbox-inline">
-                                                                    <input type="checkbox" class="styled" id="publish_chk" name="publish_chk" >
-                                                                    <label for="publish_chk"> Publish Design</label>
-                                                                </div>
-                                                                
-                                                            </div> -->
-                                        <div class="form-group">
-                                            <label>Item Price</label>
-                                            <input id="item_price" name="item_price" class="form-control price_format"
-                                                type="text" value="{{ $product_array[0]->ProductPrice }}"
-                                                data-error="#err-price" />
-                                        </div>
-                                        <div class="form-group">
-                                            <label>Item Form</label>
-                                            <select class="form-control" name="itemForm" v-model="itemFormSelected"
-                                                @change="handleSelectItemForm">
-                                                <option value="jersey-and-shorts-form"
-                                                    @if ($product_array[0]->ProductForm == 'jersey-and-shorts-form') selected @endif>Jersey and Shorts
-                                                    Form</option>
-                                                <option value="tshirt-form"
-                                                    @if ($product_array[0]->ProductForm == 'tshirt-form') selected @endif>T-Shirt Form
-                                                </option>
-                                                <option value="quantity-form"
-                                                    @if ($product_array[0]->ProductForm == 'quantity-form') selected @endif>Quantity Form
-                                                </option>
-                                                <option value="name-number-form"
-                                                    @if ($product_array[0]->ProductForm == 'name-number-form') selected @endif>Name and Number
-                                                    Form</option>
-                                                <option value="name-number-size-form"
-                                                    @if ($product_array[0]->ProductForm == 'name-number-size-form') selected @endif>Name, Number and
-                                                    Size Form</option>
-                                                <option value="number-size-form"
-                                                    @if ($product_array[0]->ProductForm == 'number-size-form') selected @endif>Number and Size
-                                                    Form</option>
-                                                <option value="number-form"
-                                                    @if ($product_array[0]->ProductForm == 'number-form') selected @endif>Number Only Form
-                                                </option>
-                                                <option value="name-size-form"
-                                                    @if ($product_array[0]->ProductForm == 'name-size-form') selected @endif>Name and Size Form
-                                                </option>
-                                                <option value="jersey-and-shorts-quantity-form"
-                                                    @if ($product_array[0]->ProductForm == 'jersey-and-shorts-quantity-form') selected @endif>Jersey, Shorts
-                                                    and Quantity Form</option>
-                                                <option value="number-jersey-shorts-form"
-                                                    @if ($product_array[0]->ProductForm == 'number-jersey-shorts-form') selected @endif>Number, Jersey
-                                                    and Shorts Form</option>
-                                                <option value="roster-name-number-size-form"
-                                                    @if ($product_array[0]->ProductForm == 'roster-name-number-size-form') selected @endif>Roster and Size
-                                                    Form</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="form-group d-flex"
-                                            v-if="itemFormSelected == 'roster-name-number-size-form'">
-                                            <button type="button" class="btn btn-success btn-sm"
-                                                @click="addRosterModal">
-                                                <i class="fa fa-plus"></i> Add Roster
-                                            </button>
-                                            <button type="button" class="btn btn-warning btn-sm"
-                                                @click="viewRosterModal">
-                                                <i class="fa fa-eye"></i> View Roster
-                                            </button>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>Available Size</label>
-                                            <select class="form-control select2" data-error="#err_available_size"
-                                                data-placeholder="Select Size" name="available_size[]"
-                                                multiple="multiple" required>
-                                                <option value="toddler"
-                                                    @if (in_array('toddler', $available_size)) selected @endif>Toddler</option>
-                                                <option value="youth" @if (in_array('youth', $available_size)) selected @endif>
-                                                    Youth</option>
-                                                <option value="adult" @if (in_array('adult', $available_size)) selected @endif>
-                                                    Adult</option>
-                                                <option value="mask" @if (in_array('mask', $available_size)) selected @endif>
-                                                    Mask</option>
-                                                <option value="gaiter" @if (in_array('gaiter', $available_size)) selected @endif>
-                                                    Gaiter</option>
-                                                <option value="buckethat"
-                                                    @if (in_array('buckethat', $available_size)) selected @endif>Buckethat
-                                                </option>
-                                                <option value="none" @if (in_array('none', $available_size)) selected @endif>
-                                                    None</option>
-                                            </select>
-                                            <span id="err_available_size"></span>
-                                        </div>
-                                        <div class="form-group">
-                                            <label>Item Quantity <small>(Optional)</small></label>
-                                            <input id="item_quantity" name="item_quantity" class="form-control"
-                                                type="number" min="0"
-                                                value="{{ $product_array[0]->ProductAvailableQty }}"
-                                                data-error="#err-quantity" />
-                                        </div>
-                                        {{-- {{ var_dump($product_array[0]) }} --}}
-                                        <div class="form-group">
-                                            <label>Item Privacy</label>
-                                            <select class="form-control" name="item_privacy">
-                                                <option value="public" @if ($product_array[0]->PrivacyStatus == 'public') selected @endif>
-                                                    Public</option>
-                                                <option value="private"
-                                                    @if ($product_array[0]->PrivacyStatus == 'private') selected @endif>Private</option>
-                                            </select>
-                                        </div>
-
-                                        <div class="form-group">
-                                            <label>Select Shipping Category</label>
-                                            <select class="form-control" name="shipping_cost" required>
-                                                <option value="0">None</option>
-                                                @foreach ($shipping_cost as $sc)
-                                                    <option value="{{ $sc->Id }}"
-                                                        @if ($sc->Id == $product_array[0]->ShippingCostId) selected @endif>
-                                                        {{ $sc->DisplayName }}</option>
-                                                @endforeach
-                                            </select>
-                                            <span id="err_available_size"></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="box-footer">
-                                <!-- <button type="submit" class="btn btn-default">Cancel</button> -->
-                                <button type="submit" class="btn btn-primary pull-right">Save changes</button>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-
-            </div>
-        </section>
-        <!-- /.content -->
-
-        <!-- Modal -->
-        <div class="modal fade" id="myModal" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&times;</button>
-                        <h4 class="modal-title">Item Images</h4>
-                    </div>
-                    <div class="modal-body">
-                        <table class="table table-bordered table-condensed">
-                            <thead>
-                                <tr>
-                                    <th></th>
-                                    <th>Image</th>
-                                    <th class="col-sm-2 text-center">Action</th>
-                                </tr>
-                            </thead>
-                            <tbody id="sortable">
-                                @foreach ($thumbnails_array as $thumbnail)
-                                    <tr id="{{ 'item-' . $thumbnail->Id }}">
-                                        <td class="text-center" style="width: 50px"><i class="fa fa-bars"></i></td>
-                                        <td><img class="img img-responsive product-center" style="height: 59.45px;"
-                                                src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}" />
-                                        </td>
-                                        <td class="text-center">
-                                            <!-- <button class="btn btn-default btn-xs btn-edit-clipart" data-id="#"><i class="fa fa-edit"></i></button> -->
-                                            <button class="btn btn-default btn-sm btn-delete-item-image"
-                                                data-id="{{ $thumbnail->Id }}" data-filename="{{ $thumbnail->Image }}"
-                                                title="Delete Image"><i class="fa fa-trash"></i></button>
-                                        </td>
-                                    </tr>
-                                @endforeach
-
-
-                            </tbody>
-                        </table>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" id="btn_save_thumbnail_sorting">Save
-                            Changes</button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-
-        <div class="modal fade" id="modal_add_thumbnail" role="dialog">
-            <div class="modal-dialog modal-lg">
-                <div class="modal-content">
-                    <form id="frm_add_new_images">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                            <h4 class="modal-title">Add Image</h4>
-                        </div>
-                        <div class="modal-body">
-                            <div class="row grid-divider">
-                                <div class="col-sm-4">
-                                    <div class="col-padding">
-                                        <h3>Select Image(s)</h3>
-                                        <div class="form-group">
-                                            <input type="hidden" name="_id" value="{{ $product_array[0]->Id }}" />
-                                            <input type="file" class="form-control" id="upload_images"
-                                                name="upload_images[]" multiple accept="image/*" />
-                                        </div>
-                                        <div class="form-group">
-                                            <button type="button" id="clear_frm_add_new_images"
-                                                class="btn btn-default btn-block">Clear</button>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-8">
-                                    <div class="col-padding">
-                                        <h3>Preview</h3>
-                                        <div class="col-md-12">
-                                            <ul class="hide-bullets small-preview-thumb">
-                                            </ul>
-                                        </div>
+                                        </select>
+                                        <span id="err_available_size"></span>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="modal-footer">
-                            <button type="submit" id="btn_submit_new_item_image" class="btn btn-primary">Submit</button>
-                            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <div class="box-footer">
+                            <!-- <button type="submit" class="btn btn-default">Cancel</button> -->
+                            <button type="submit" class="btn btn-primary pull-right">Save changes</button>
                         </div>
                     </form>
                 </div>
             </div>
+
         </div>
+    </section>
+    <!-- /.content -->
+</div>
 
-        <div class="modal fade" id="modalAddRoster" role="dialog" data-backdrop="static" data-keyboard="false">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    {{-- @{{ roster }} --}}
-                    <form @submit.prevent="onRosterSubmit">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                            <h4 class="modal-title">Add Roster</h4>
-                        </div>
-                        <div class="modal-body">
-                            <table class="table">
-                                <tr>
-                                    <th>#</th>
-                                    <th>Name</th>
-                                    <th>Number</th>
-                                    <th></th>
-                                </tr>
-                                <tr v-for="(item, i) in roster" :key="i">
-                                    <td style="padding: 0px 0px 0px 8px;">@{{ i + 1 }}</td>
-                                    <td style="padding: 0px 0px 0px 8px;"><input type="text" placeholder="Player Name"
-                                            v-model="roster[i]['Name']" class="form-control"></td>
-                                    <td style="padding: 0px 8px 0px 0px;"><input type="text"
-                                            placeholder="Player Number" v-model="roster[i]['Number']" maxlength="2"
-                                            class="form-control"></td>
-                                    <td style="padding: 0px 8px 0px 0px; text-align: end;">
-                                        <button type="button" @click="removeRosterRow(i)" :disabled="roster.length <= 1"
-                                            class="btn btn-danger"><i class="fa fa-times-circle-o"></i></button>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="4" style="padding: 8px 8px 0px 8px; text-align: end;">
-                                        <button type="button" @click="addRosterRow" class="btn btn-primary">Add
-                                            Row</button>
-                                    </td>
-                                </tr>
-                            </table>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="submit" class="btn btn-primary" :disabled="isSubmit">
-                                <i v-if="isSubmit" class="fa fa-spinner fa-spin"></i> Submit
-
-                            </button>
-                            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        </div>
-                    </form>
-                </div>
+<!-- Modal -->
+<div class="modal fade" id="myModal" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title">Item Images</h4>
             </div>
-        </div>
+            <div class="modal-body">
+                <table class="table table-bordered table-condensed">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th>Image</th>
+                            <th class="col-sm-2 text-center">Action</th>
+                        </tr>
+                    </thead>
+                    <tbody id="sortable">
+                        @foreach($thumbnails_array as $thumbnail)
 
-        <div class="modal fade" id="modalViewRoster" role="dialog" data-backdrop="static" data-keyboard="false">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <form @submit.prevent="onRosterUpdate">
-                        <div class="modal-header">
-                            <button type="button" class="close" data-dismiss="modal">&times;</button>
-                            <h4 class="modal-title">Roster</h4>
-                        </div>
-                        <div class="modal-body">
-                            <div style="text-align: end;">
-                                <button type="button" @click.prevent="getRoster" class="btn btn-success" :disabled="isRefresh">
-                                    <i v-if="isRefresh" class="fa fa-spinner fa-spin"></i> Refresh
-    
-                                </button>
-                            </div>
-                            <table class="table">
-                                <tr>
-                                    <th>#</th>
-                                    <th>Name</th>
-                                    <th>Number</th>
-                                    <th></th>
-                                </tr>
-                                <tr v-for="(item, i) in currentRoster" :key="i">
-                                    <td style="padding: 0px 0px 0px 8px;">@{{ i + 1 }}</td>
-                                    <td style="padding: 0px 0px 0px 8px;"><input type="text" placeholder="Player Name"
-                                            v-model="currentRoster[i]['Name']" class="form-control"></td>
-                                    <td style="padding: 0px 8px 0px 0px;"><input type="text" maxlength="2"
-                                            placeholder="Player Number" v-model="currentRoster[i]['Number']"
-                                            class="form-control"></td>
-                                    <td style="padding: 0px 8px 0px 0px; text-align: end;">
-                                        <button type="button" @click="deleteRoster(i, item)" class="btn btn-danger"><i
-                                                class="fa fa-trash-o"></i></button>
-                                    </td>
-                                </tr>
-                                {{-- <tr>
-                                    <td colspan="4" style="padding: 8px 8px 0px 8px; text-align: end;">
-                                        <button type="button" @click="addRosterRow" class="btn btn-primary">Add
-                                            Row</button>
-                                    </td>
-                                </tr> --}}
-                            </table>
-                        </div>
-                        <div class="modal-footer">
-                            <button type="submit" class="btn btn-primary" :disabled="isSubmit">
-                                <i v-if="isSubmit" class="fa fa-spinner fa-spin"></i> Update
+                        <tr id="{{ 'item-' . $thumbnail->Id }}">
+                            <td class="text-center" style="width: 50px"><i class="fa fa-bars"></i></td>
+                            <td><img class="img img-responsive product-center" style="height: 59.45px;" src="{{ config('site_config.images_url')  }}/{{ $thumbnail->Image . '?t=' . time() }}" /></td>
+                            <td class="text-center">
+                                <!-- <button class="btn btn-default btn-xs btn-edit-clipart" data-id="#"><i class="fa fa-edit"></i></button> -->
+                                <button class="btn btn-default btn-sm btn-delete-item-image" data-id="{{ $thumbnail->Id }}" data-filename="{{ $thumbnail->Image }}" title="Delete Image"><i class="fa fa-trash"></i></button>
+                            </td>
+                        </tr>
+                        @endforeach
 
-                            </button>
-                            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                        </div>
-                    </form>
-                </div>
+
+                    </tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="btn_save_thumbnail_sorting">Save Changes</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
             </div>
         </div>
     </div>
+</div>
 
 
-
-    <script>
-        new Vue({
-            el: '#viewStoreItem',
-            data: {
-                title: "Store Item", // Passing Laravel data to Vue
-                showAddRoster: false,
-                itemFormSelected: {!! json_encode($product_array[0]->ProductForm) !!},
-                roster: [{
-                    Name: "",
-                    Number: "",
-                    ProductId: {!! json_encode($product_array[0]->Id) !!}
-                }],
-
-                currentRoster: {!! json_encode($roster) !!},
-                toBeDeletedRoster: [],
-                isSubmit: false,
-                isRefresh: false
-            },
-
-            methods: {
-                handleSelectItemForm() {
-                    console.log('Selected option:', this.itemFormSelected);
-                },
-
-                addRosterRow() {
-                    this.roster.push({
-                        Name: "",
-                        Number: "",
-                        ProductId: {!! json_encode($product_array[0]->Id) !!}
-                    })
-                },
-
-                deleteRoster(i, item) {
-                    this.currentRoster.splice(i, 1);
-                    this.toBeDeletedRoster.push(item.Id);
-                },
-
-                async onRosterUpdate() {
-                    // this.isSubmit = true;
-
-                    if (this.toBeDeletedRoster.length > 0) {
-                        this.postDeleteRoster();
-                    }
-
-                    await this.updateRoster();
-
-                    // this.isSubmit = false;
-                },
-
-                async postDeleteRoster() {
-
-                    const token = $('meta[name="csrf_token"]').attr('content')
-                    axios.post("{{ url('user/roster-delete') }}", {
-                            data: this.toBeDeletedRoster
-                        }, {
-                            headers: {
-                                "Content-Type": "application/json",
-                                'X-CSRF-TOKEN': token
-                            }
-                        })
-                        .then(response => {
-                            this.isSubmit = false;
-                            console.log(response.data);
-                            // alert("Roster is successfully saved.");
-                            // $('#modalAddRoster').modal('hide');
-                            // this.roster = [{
-                            //     Name: "",
-                            //     Number: "",
-                            //     ProductId: {!! json_encode($product_array[0]->Id) !!}
-                            // }]
-
-                        })
-                        .catch(error => {
-                            console.error(error); // Handle error
-                            this.isSubmit = false; // Hide loading indicator
-                        });
-                },
-
-                async onRosterSubmit() {
-                    this.isSubmit = true;
-                    const token = $('meta[name="csrf_token"]').attr('content')
-                    axios.post("{{ url('user/roster') }}", {
-                            data: this.roster
-                        }, {
-                            headers: {
-                                "Content-Type": "application/json",
-                                'X-CSRF-TOKEN': token
-                            }
-                        })
-                        .then(response => {
-                            this.isSubmit = false;
-                            console.log(response.data);
-
-                            const res = response.data;
-
-                            if (!res.status) {
-                                alert(res.message);
-                                return
-                            }
-
-                            alert(res.message);
-                            $('#modalAddRoster').modal('hide');
-                            this.roster = [{
-                                Name: "",
-                                Number: "",
-                                ProductId: {!! json_encode($product_array[0]->Id) !!}
-                            }]
-
-                        })
-                        .catch(error => {
-                            console.error(error); // Handle error
-                            this.isSubmit = false; // Hide loading indicator
-                        });
-                },
-
-                async updateRoster() {
-                    this.isSubmit = true;
-                    const token = $('meta[name="csrf_token"]').attr('content')
-                    axios.post("{{ url('user/roster-update') }}", {
-                            data: this.currentRoster
-                        }, {
-                            headers: {
-                                "Content-Type": "application/json",
-                                'X-CSRF-TOKEN': token
-                            }
-                        })
-                        .then(response => {
-                            this.isSubmit = false;
-                            console.log(response.data);
-                            alert("Roster is successfully updated.");
-                            $('#modalViewRoster').modal('hide');
+<div class="modal fade" id="modal_add_thumbnail" role="dialog">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <form id="frm_add_new_images">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                    <h4 class="modal-title">Add Image</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="row grid-divider">
+                        <div class="col-sm-4">
+                            <div class="col-padding">
+                                <h3>Select Image(s)</h3>
+                                <div class="form-group">
+                                    <input type="hidden" name="_id" value="{{ $product_array[0]->Id }}" />
+                                    <input type="file" class="form-control" id="upload_images" name="upload_images[]" multiple accept="image/*" />
+                                </div>
+                                <div class="form-group">
+                                    <button type="button" id="clear_frm_add_new_images" class="btn btn-default btn-block">Clear</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-sm-8">
+                            <div class="col-padding">
+                                <h3>Preview</h3>
+                                <div class="col-md-12">
+                                    <ul class="hide-bullets small-preview-thumb">
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" id="btn_submit_new_item_image" class="btn btn-primary">Submit</button>
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
 
 
-                        })
-                        .catch(error => {
-                            console.error(error); // Handle error
-                            this.isSubmit = false; // Hide loading indicator
-                        });
-                },
-
-                async getRoster() {
-                    this.isRefresh = true;
-                    const productId = {!! json_encode($product_array[0]->Id) !!}
-                    const token = $('meta[name="csrf_token"]').attr('content')
-                    axios.get("{{ url('user/roster') }}", {
-                            params: {
-                                'product-id': productId
-                            }
-                        }, {
-                            headers: {
-                                "Content-Type": "application/json",
-                                'X-CSRF-TOKEN': token
-                            }
-                        })
-                        .then(response => {
-                            this.isRefresh = false;
-                            console.log("getRoster", response)
-                            this.currentRoster = response.data;
-                        })
-                        .catch(error => {
-                            console.error(error); // Handle error
-                            this.isRefresh = false;
-                        });
-                },
-
-                removeRosterRow(i) {
-                    this.roster.splice(i, 1);
-                },
-
-                addRosterModal() {
-                    $('#modalAddRoster').modal('show');
-                },
-
-                viewRosterModal() {
-                    $('#modalViewRoster').modal('show');
-                    // this.getRoster()
-                }
-
-
-            },
-        });
-    </script>
-@endsection
+@endsection

run.sh

@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Helper script for docker compose workflow
-# Usage examples:
-#   ./run.sh up            # build (if needed) and start in background
-#   ./run.sh rebuild       # force full rebuild (no cache) and start
-#   ./run.sh down          # stop and remove containers
-#   ./run.sh logs          # follow logs
-#   ./run.sh artisan migrate
-#   ./run.sh sh            # shell into PHP app container
-#   ./run.sh restart       # restart containers
-#   ./run.sh build         # build images (uses cache)
-
-CMD=${1:-up}
-shift || true
-
-case "$CMD" in
-  build)
-    echo "[build] Building images (with cache)..."
-    docker compose build
-    ;;
-  up)
-    echo "[up] Starting services (build if needed)..."
-    docker compose up -d --build
-    ;;
-  rebuild)
-    echo "[rebuild] Full rebuild without cache..."
-    docker compose down || true
-    docker compose build --no-cache
-    docker compose up -d
-    ;;
-  down)
-    echo "[down] Stopping and removing services..."
-    docker compose down
-    ;;
-  restart)
-    echo "[restart] Restarting services..."
-    docker compose restart
-    ;;
-  logs)
-    echo "[logs] Following logs (Ctrl+C to exit)..."
-    docker compose logs -f --tail=200 "$@"
-    ;;
-  artisan)
-    echo "[artisan] php artisan $*"
-    docker compose exec app php artisan "$@"
-    ;;
-  sh)
-    echo "[sh] Opening shell in app container..."
-    docker compose exec app sh
-    ;;
-  *)
-    cat <<EOF
-Usage: ./run.sh <command> [args]
-Commands:
-  up         Build (if needed) and start containers
-  build      Build images using cache
-  rebuild    Rebuild images without cache then start
-  down       Stop and remove containers
-  restart    Restart running containers
-  logs       Follow logs (pass service names optionally)
-  artisan    Run php artisan <args>
-  sh         Shell into app container
-EOF
-    exit 1
-    ;;
- esac

start-local.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Quick start script for local development and testing before Cloud Run deployment
+
+set -e
+
+echo "🚀 Starting Merchbay Laravel Application Setup..."
+
+# Check if Docker is running
+if ! docker info > /dev/null 2>&1; then
+    echo "❌ Docker is not running. Please start Docker and try again."
+    exit 1
+fi
+
+# Determine which docker compose command to use
+if command -v docker-compose > /dev/null 2>&1; then
+    DOCKER_COMPOSE="docker-compose"
+elif docker compose version > /dev/null 2>&1; then
+    DOCKER_COMPOSE="docker compose"
+else
+    echo "❌ Neither 'docker-compose' nor 'docker compose' is available."
+    echo "Please install Docker Compose and try again."
+    exit 1
+fi
+
+echo "ℹ️ Using: $DOCKER_COMPOSE"
+
+# Check if .env file exists
+if [ ! -f .env ]; then
+    echo "📄 Creating .env file from .env.example..."
+    cp .env.example .env
+    echo "✅ .env file created. Please update it with your configuration."
+fi
+
+# Build and start services
+echo "🔨 Building Docker images..."
+$DOCKER_COMPOSE -f docker-compose.local.yml build
+
+echo "🚀 Starting services..."
+$DOCKER_COMPOSE -f docker-compose.local.yml up -d
+
+echo "⏳ Waiting for services to be ready..."
+sleep 30
+
+# Run Laravel setup commands
+echo "🔧 Setting up Laravel..."
+$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan key:generate
+#$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan migrate --force
+$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan config:cache
+$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan route:cache
+$DOCKER_COMPOSE -f docker-compose.local.yml exec app php artisan view:cache
+
+echo "✅ Setup complete!"
+echo ""
+echo "🌐 Your application is now running at:"
+echo "   Application: http://localhost:8080"
+echo "   phpMyAdmin:  http://localhost:8081"
+echo ""
+echo "📊 Check logs with:"
+echo "   $DOCKER_COMPOSE -f docker-compose.local.yml logs -f app"
+echo ""
+echo "🛑 Stop the application with:"
+echo "   $DOCKER_COMPOSE -f docker-compose.local.yml down"
+echo ""
+echo "🚀 When ready to deploy to Cloud Run, use:"
+echo "   gcloud builds submit --config=cloudbuild.yaml"