20 Commits

Author SHA1 Message Date
Frank John Begornia
e2fd4df26a Update deployment directory path in workflow to /var/www/apps/merchbay
Some checks failed
Deploy Development / deploy (push) Has been cancelled
2025-12-31 03:28:39 +08:00
Frank John Begornia
fa2956e8b6 Refactor deployment workflows and add SSL setup documentation for production
All checks were successful
Deploy Development / deploy (push) Successful in 2m13s
2025-12-22 23:23:10 +08:00
Frank John Begornia
e8d21d22f8 Add local environment configuration and setup documentation for development
All checks were successful
Deploy Development / deploy (push) Successful in 2m30s
2025-12-18 16:30:14 +08:00
Frank John Begornia
03434cede5 Fix potential undefined index notices in UserController by adding isset checks for store data
All checks were successful
Deploy Development / deploy (push) Successful in 2m22s
2025-12-18 15:22:24 +08:00
Frank John Begornia
609d014459 Enhance Docker cleanup in deployment workflows to reclaim space
All checks were successful
Deploy Development / deploy (push) Successful in 6m50s
2025-12-18 15:03:49 +08:00
Frank John Begornia
1d4b33ef9f Enhance deployment scripts by removing old Docker images and pruning unused resources
All checks were successful
Deploy Development / deploy (push) Successful in 2m27s
2025-12-18 14:51:20 +08:00
Frank John Begornia
14449ec0c1 Remove yakpro-po obfuscation steps from Dockerfile due to PHP 7.0 compatibility issues
All checks were successful
Deploy Development / deploy (push) Successful in 2m14s
2025-12-18 14:32:59 +08:00
Frank John Begornia
89201a8432 Add yakpro-po for code obfuscation and configuration for Laravel 5.0
Some checks failed
Deploy Development / deploy (push) Failing after 54s
2025-12-18 14:24:24 +08:00
Frank John Begornia
e6ffc878dd Add HTTPS schema enforcement in AppServiceProvider and set FORCE_HTTPS in Docker Compose
All checks were successful
Deploy Development / deploy (push) Successful in 2m31s
2025-12-18 14:22:09 +08:00
Frank John Begornia
807ac03d03 Refactor asset paths in Blade templates to remove 'public' prefix for improved consistency
All checks were successful
Deploy Development / deploy (push) Successful in 2m15s
2025-12-18 14:18:28 +08:00
Frank John Begornia
0a235a0ed2 Update README.md to enhance project documentation and clarify setup instructions
All checks were successful
Deploy Development / deploy (push) Successful in 6m23s
2025-12-18 14:07:01 +08:00
Frank John Begornia
c950a72fc8 Update Dockerfile to revert to PHP 7.0 and adjust Debian repository sources 2025-12-18 14:05:22 +08:00
Frank John Begornia
564719412b Add entrypoint script to set up permissions and create storage directories
Some checks failed
Deploy Development / deploy (push) Failing after 2m11s
2025-12-18 13:58:13 +08:00
Frank John Begornia
cd4c7086bf Update environment variables in deployment files for improved configuration
Some checks failed
Deploy Development / deploy (push) Failing after 2m35s
2025-12-18 13:48:54 +08:00
Frank John Begornia
0052044d6a Update Dockerfile to use PHP 7.3 and improve compatibility with Laravel 5.0
Some checks failed
Deploy Development / deploy (push) Failing after 4m26s
2025-12-18 13:36:54 +08:00
Frank John Begornia
d6a98811eb Add CI/CD workflows for building and deploying Docker images
Some checks failed
Deploy Development / deploy (push) Failing after 17s
2025-12-18 13:30:00 +08:00
Frank John Begornia
f197490606 updated 2024-11-27 17:42:12 +08:00
Frank John Begornia
f26c9c274b updated subtotal when orders have voucher 2024-11-27 17:13:00 +08:00
Frank John Begornia
54278c568d added roster config 2024-11-05 05:33:47 +08:00
Frank John Begornia
c68f28aa11 updated prod 2024-09-30 01:15:42 +08:00
59 changed files with 2230 additions and 432 deletions

BIN
.DS_Store vendored Normal file

Binary file not shown.

36
.env.local Normal file
View File

@@ -0,0 +1,36 @@
APP_ENV=local
APP_DEBUG=true
APP_KEY=base64:YOUR_APP_KEY_HERE
DB_HOST=db
DB_DATABASE=merchbay
DB_USERNAME=merchbay
DB_PASSWORD=secret
DB_PORT=3306
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
# Local mail (logs to storage/logs/laravel.log)
MAIL_DRIVER=log
MAIL_HOST=localhost
MAIL_PORT=1025
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
# Local URLs
APP_URL=http://localhost:8080
PROD_PRIVATE=http://localhost:8080
IMAGES_URL=http://localhost:8080
UPLOAD_URL=http://localhost:8080/uploads/
# Test Captcha (for local dev)
CAPTCHA_SITE_KEY=test_key
CAPTCHA_SECRET_KEY=test_secret
# Analytics (optional for local)
ANALYTICS_SITE_ID=
ANALYTICS_CLIENT_ID=
ANALYTICS_SERVICE_EMAIL=

View File

@@ -0,0 +1,57 @@
name: Build and Push Docker Image
on:
push:
tags:
- 'v*'
workflow_dispatch:
inputs:
tag:
description: 'Docker image tag (e.g., v1.0.0, latest)'
required: false
default: 'latest'
push_to_registry:
description: 'Push to registry?'
required: false
default: 'true'
jobs:
build-and-push:
runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Registry
uses: docker/login-action@v2
with:
registry: ${{ secrets.DOCKER_REGISTRY_URL }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Extract metadata
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ secrets.DOCKER_REGISTRY_URL }}/merchbay
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=raw,value=latest
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=registry,ref=${{ secrets.DOCKER_REGISTRY_URL }}/merchbay:buildcache
cache-to: type=registry,ref=${{ secrets.DOCKER_REGISTRY_URL }}/merchbay:buildcache,mode=max

View File

@@ -0,0 +1,161 @@
name: Deploy Development
on:
push:
branches:
- dev
workflow_dispatch:
jobs:
deploy:
runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps:
# 1⃣ Checkout code
- name: Checkout code
shell: sh
run: |
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo
cd /workspace/repo
git checkout $GITHUB_REF_NAME
# 2⃣ Build image
- name: Build Docker image
shell: sh
run: |
cd /workspace/repo
docker build -t merchbay:dev .
docker save merchbay:dev | gzip > merchbay_dev.tar.gz
# 3⃣ Setup SSH
- name: Setup SSH
shell: sh
env:
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
run: |
mkdir -p ~/.ssh
chmod 700 ~/.ssh
echo "$DEPLOY_SSH_KEY" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519
ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts
# 4⃣ Upload artifacts
- name: Upload image and compose
shell: sh
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
run: |
scp -i ~/.ssh/id_ed25519 \
/workspace/repo/merchbay_dev.tar.gz \
/workspace/repo/docker-compose.dev.yml \
${DEPLOY_USER}@${DEPLOY_HOST}:/tmp/
# 5⃣ Deploy on server
- name: Deploy on server
shell: sh
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
run: |
ssh -i ~/.ssh/id_ed25519 $DEPLOY_USER@$DEPLOY_HOST << 'EOF'
set -e
DEPLOY_DIR="/var/www/apps/merchbay_dev"
mkdir -p "$DEPLOY_DIR"
echo "📦 Loading image"
docker load < /tmp/merchbay_dev.tar.gz
echo "🧹 Removing old merchbay images"
docker images | grep merchbay | grep -v "$(docker images merchbay:dev -q)" | awk '{print $3}' | xargs -r docker rmi -f || true
echo "📄 Updating compose file"
cp /tmp/docker-compose.dev.yml "$DEPLOY_DIR/docker-compose.yml"
cd "$DEPLOY_DIR"
echo "🔍 Checking .env file"
if [ ! -f .env ]; then
echo "❌ .env file not found at $DEPLOY_DIR/.env"
echo "Please create it first with required variables:"
echo " - DB_*, PROD_PRIVATE, IMAGES_URL, UPLOAD_URL"
echo " - MAIL_*, CAPTCHA_*, ANALYTICS_*"
exit 1
fi
echo "🔧 Fixing .env permissions"
sudo chown $USER:$USER .env
sudo chmod 600 .env
echo "🌐 Ensure networks"
docker network inspect traefik-public >/dev/null 2>&1 || \
docker network create traefik-public
docker network inspect crew-app-net >/dev/null 2>&1 || \
docker network create crew-app-net
echo "🚀 Starting containers (env vars from .env file)"
docker compose up -d
echo "⏳ Waiting for app container"
sleep 15
if docker ps --format '{{.Names}}' | grep -q merchbay_app; then
echo "🧹 Clearing and rebuilding config cache"
docker compose exec -T app php artisan config:clear
docker compose exec -T app php artisan config:cache
else
echo "❌ App container not running"
docker compose logs
exit 1
fi
echo "🧹 Cleanup"
rm -f /tmp/merchbay_dev.tar.gz /tmp/docker-compose.dev.yml
echo "🧹 Aggressive Docker cleanup to reclaim space"
docker image prune -af --filter "until=24h" || true
docker container prune -f || true
docker volume prune -f || true
docker builder prune -af --filter "until=48h" || true
echo "📊 Docker space usage:"
docker system df
echo "✅ Deployment completed"
EOF
# 6⃣ Health check
- name: Health check
shell: sh
run: |
echo "⏳ Waiting for app to be ready..."
sleep 20
echo "🔍 Testing health check (ignoring SSL cert for now)..."
HTTP_CODE=$(curl -k -s -o /dev/null -w "%{http_code}" --max-time 30 https://dev.merchbay.app || echo "000")
if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ] || [ "$HTTP_CODE" = "301" ]; then
echo "✅ Health check passed! (HTTP $HTTP_CODE)"
echo "⚠️ Note: Using -k to ignore SSL cert. Check Traefik logs if cert not ready."
else
echo "❌ Health check failed! (HTTP $HTTP_CODE)"
echo ""
echo "💡 Troubleshooting:"
echo " 1. Check if container is running:"
echo " docker ps | grep merchbay_app"
echo ""
echo " 2. Check app logs:"
echo " docker logs merchbay_app"
echo ""
echo " 3. Check Traefik logs:"
echo " docker logs traefik"
echo ""
echo " 4. Test manually:"
echo " curl -Ik https://dev.merchbay.app"
exit 1
fi

181
.gitea/workflows/deploy.yml Normal file
View File

@@ -0,0 +1,181 @@
name: Deploy Production (merchbay.com)
on:
push:
branches:
- main
- master
workflow_dispatch:
jobs:
deploy:
runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps:
# 1⃣ Checkout code
- name: Checkout code
shell: sh
run: |
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo
cd /workspace/repo
git checkout $GITHUB_REF_NAME
# 2⃣ Build image
- name: Build Docker image
shell: sh
run: |
cd /workspace/repo
docker build -t merchbay:latest .
docker save merchbay:latest | gzip > merchbay.tar.gz
# 3⃣ Setup SSH
- name: Setup SSH
shell: sh
env:
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
run: |
mkdir -p ~/.ssh
chmod 700 ~/.ssh
echo "$DEPLOY_SSH_KEY" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519
ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts
# 4⃣ Upload artifacts
- name: Upload image and compose
shell: sh
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
run: |
scp -i ~/.ssh/id_ed25519 \
/workspace/repo/merchbay.tar.gz \
/workspace/repo/docker-compose.prod.yml \
${DEPLOY_USER}@${DEPLOY_HOST}:/tmp/
# 5⃣ Deploy on server
- name: Deploy on server
shell: sh
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
run: |
ssh -i ~/.ssh/id_ed25519 $DEPLOY_USER@$DEPLOY_HOST << 'EOF'
set -e
DEPLOY_DIR="/var/www/apps/merchbay"
sudo mkdir -p "$DEPLOY_DIR"
sudo chown $USER:$USER "$DEPLOY_DIR"
echo "<22> Stopping dev environment"
DEV_DIR="/var/www/apps/merchbay_dev"
if [ -d "$DEV_DIR" ]; then
cd "$DEV_DIR"
docker compose down || true
cd -
echo "✅ Dev environment stopped"
echo "📋 Copying .env from dev to production"
if [ -f "$DEV_DIR/.env" ]; then
cp "$DEV_DIR/.env" "$DEPLOY_DIR/.env"
echo "✅ .env file copied from dev to production"
else
echo "⚠️ No .env file found in dev directory"
fi else
echo " No dev environment found"
fi
echo "📦 Loading image"
docker load < /tmp/merchbay.tar.gz
echo "🧹 Removing dev images and old merchbay images"
docker images | grep "merchbay:dev" | awk '{print $3}' | xargs -r docker rmi -f || true
docker images | grep merchbay | grep -v "$(docker images merchbay:latest -q)" | awk '{print $3}' | xargs -r docker rmi -f || true
echo "📄 Updating compose file"
cp /tmp/docker-compose.prod.yml "$DEPLOY_DIR/docker-compose.yml"
cd "$DEPLOY_DIR"
echo "🔍 Checking .env file"
if [ ! -f .env ]; then
echo "❌ .env file not found at $DEPLOY_DIR/.env"
echo "Please create it first with required variables:"
echo " - DB_*, PROD_PRIVATE, IMAGES_URL, UPLOAD_URL"
echo " - MAIL_*, CAPTCHA_*, ANALYTICS_*"
exit 1
fi
echo "🔧 Fixing .env permissions"
sudo chown $USER:$USER .env
sudo chmod 600 .env
echo "🌐 Ensure networks"
docker network inspect traefik-public >/dev/null 2>&1 || \
docker network create traefik-public
docker network inspect crew-app-net >/dev/null 2>&1 || \
docker network create crew-app-net
echo "🚀 Starting containers (env vars from .env file)"
docker compose up -d
echo "⏳ Waiting for app container"
sleep 15
if docker ps --format '{{.Names}}' | grep -q merchbay_app; then
echo "🧹 Clearing and rebuilding config cache"
docker compose exec -T app php artisan config:clear
docker compose exec -T app php artisan config:cache
else
echo "❌ App container not running"
docker compose logs
exit 1
fi
echo "🧹 Cleanup"
rm -f /tmp/merchbay.tar.gz /tmp/docker-compose.prod.yml
echo "🧹 Aggressive Docker cleanup to reclaim space"
docker image prune -af --filter "until=24h" || true
docker container prune -f || true
docker volume prune -f || true
docker builder prune -af --filter "until=48h" || true
echo "📊 Docker space usage:"
docker system df
echo "✅ Production deployment completed!"
echo "🌐 Application available at: https://merchbay.com"
EOF
# 6⃣ Health check
- name: Health check
shell: sh
run: |
echo "⏳ Waiting for app to be ready..."
sleep 20
echo "🔍 Testing health check..."
HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" --max-time 30 https://merchbay.com || echo "000")
if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ] || [ "$HTTP_CODE" = "301" ]; then
echo "✅ Health check passed! (HTTP $HTTP_CODE)"
echo "🎉 Production deployment successful!"
else
echo "❌ Health check failed! (HTTP $HTTP_CODE)"
echo ""
echo "💡 Troubleshooting:"
echo " 1. Check if container is running:"
echo " docker ps | grep merchbay_app"
echo ""
echo " 2. Check app logs:"
echo " docker logs merchbay_app"
echo ""
echo " 3. Check Traefik logs:"
echo " docker logs traefik"
echo ""
echo " 4. Test manually:"
echo " curl -Ik https://merchbay.com"
exit 1
fi

125
DIGICERT_SSL_SETUP.md Normal file
View File

@@ -0,0 +1,125 @@
# DigiCert SSL Certificate Setup for Production
## Certificate Files Required
From DigiCert, you'll receive these files:
- `merchbay_com.crt` - Your domain certificate
- `merchbay_com.key` - Private key (generated during CSR creation)
- `DigiCertCA.crt` - Intermediate certificate
- `TrustedRoot.crt` - Root certificate (optional)
## Step 1: Combine Certificate Chain (on your local machine)
```bash
# Create full chain certificate
cat merchbay_com.crt DigiCertCA.crt > merchbay.com.crt
# Copy private key
cp merchbay_com.key merchbay.com.key
```
## Step 2: Upload to Production Server
```bash
# SSH to production server
ssh PROD_DEPLOY_USER@PROD_DEPLOY_HOST
# Create certificates directory
sudo mkdir -p /srv/certs
sudo chmod 700 /srv/certs
# Exit SSH, then upload from local machine
scp merchbay.com.crt PROD_DEPLOY_USER@PROD_DEPLOY_HOST:/tmp/
scp merchbay.com.key PROD_DEPLOY_USER@PROD_DEPLOY_HOST:/tmp/
# SSH back to server and move files
ssh PROD_DEPLOY_USER@PROD_DEPLOY_HOST
sudo mv /tmp/merchbay.com.crt /srv/certs/
sudo mv /tmp/merchbay.com.key /srv/certs/
sudo chmod 600 /srv/certs/*
sudo chown root:root /srv/certs/*
```
## Step 3: Upload Traefik Configuration
```bash
# From local machine
scp traefik-certs.yml PROD_DEPLOY_USER@PROD_DEPLOY_HOST:/tmp/
# SSH to server
ssh PROD_DEPLOY_USER@PROD_DEPLOY_HOST
sudo mkdir -p /srv/traefik
sudo mv /tmp/traefik-certs.yml /srv/traefik/dynamic-certs.yml
sudo chmod 644 /srv/traefik/dynamic-certs.yml
```
## Step 4: Update Traefik Container
Ensure your Traefik docker-compose.yml includes:
```yaml
services:
traefik:
image: traefik:v2.10
command:
- --providers.docker=true
- --providers.docker.exposedbydefault=false
- --providers.file.filename=/dynamic-certs.yml
- --entrypoints.web.address=:80
- --entrypoints.websecure.address=:443
- --entrypoints.web.http.redirections.entrypoint.to=websecure
- --entrypoints.web.http.redirections.entrypoint.scheme=https
ports:
- "80:80"
- "443:443"
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- /srv/certs:/srv/certs:ro
- /srv/traefik/dynamic-certs.yml:/dynamic-certs.yml:ro
networks:
- traefik-public
restart: unless-stopped
```
## Step 5: Restart Traefik
```bash
cd /opt/traefik # or wherever your traefik docker-compose.yml is
docker compose restart traefik
# Verify certificate is loaded
docker compose logs traefik | grep -i certificate
```
## Step 6: Deploy merchbay Application
Once Traefik is configured, deploy merchbay:
```bash
cd /var/www/merchbay
docker compose up -d
```
## Verification
```bash
# Check certificate
openssl s_client -connect merchbay.com:443 -servername merchbay.com < /dev/null 2>/dev/null | openssl x509 -noout -subject -issuer -dates
# Should show:
# subject=CN = merchbay.com
# issuer=O = DigiCert Inc, CN = DigiCert TLS RSA SHA256 2020 CA1
# notBefore=...
# notAfter=...
```
## Certificate Renewal
DigiCert certificates typically last 1-2 years. Set a reminder to renew 30 days before expiration and repeat Steps 1-3 and 5.
## Security Notes
- Never commit `.key` files to git
- Keep private keys secure (600 permissions)
- Use strong encryption for private key storage
- Consider using a certificate management system for automatic renewal

104
Dockerfile Normal file → Executable file
View File

@@ -1,46 +1,86 @@
# Use the official PHP image based on Alpine Linux # Use PHP 7.0 with Apache (has native mcrypt support for Laravel 5.0)
FROM php:5.6-fpm-alpine FROM php:7.0-apache
# Install system dependencies and PHP extensions # Update to use archived Debian repositories
RUN apk --update --no-cache add \ RUN sed -i 's|deb.debian.org|archive.debian.org|g' /etc/apt/sources.list \
nginx \ && sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list \
&& sed -i '/stretch-updates/d' /etc/apt/sources.list
# Install system dependencies
RUN apt-get update && apt-get install -y --allow-unauthenticated \
git \
curl \
libpng-dev \ libpng-dev \
libjpeg-turbo-dev \ libxml2-dev \
freetype-dev \ libmcrypt-dev \
libzip-dev \
zip \ zip \
unzip \ unzip \
libmcrypt-dev \ libfreetype6-dev \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \ libjpeg62-turbo-dev \
&& docker-php-ext-install gd pdo pdo_mysql zip mcrypt openssh-client \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j$(nproc) gd
# Set the working directory in the container # Install PHP extensions (mcrypt is built-in for PHP 7.0)
WORKDIR /var/www RUN docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath mcrypt tokenizer zip
# Clear cache # Enable Apache mod_rewrite
# RUN apt-get clean && rm -rf /var/lib/apt/lists/* RUN a2enmod rewrite
# Copy the Laravel application files to the container # Install Composer (version 1.x for better compatibility with Laravel 5.0)
COPY . . COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer
# Set appropriate permissions for Laravel storage and bootstrap cache # Set working directory
RUN chown -R www-data:www-data storage bootstrap WORKDIR /var/www/html
# Install Composer # Copy existing application directory contents
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer COPY . /var/www/html
# Install Laravel dependencies # Create storage directories and set permissions
RUN composer install --no-plugins --no-scripts RUN mkdir -p storage/framework/views \
storage/framework/cache \
storage/framework/sessions \
storage/logs \
bootstrap/cache
# Generate Laravel application key # Set proper ownership and permissions
RUN php artisan key:generate RUN chown -R www-data:www-data /var/www/html \
&& chmod -R 775 /var/www/html/storage \
&& chmod -R 775 /var/www/html/bootstrap/cache
# Create directory for the socket and set permissions # Create .env file if it doesn't exist
RUN mkdir -p /run/php && chown www-data:www-data /run/php RUN if [ ! -f .env ]; then cp .env.example .env; fi
# Copy the www.conf file to PHP-FPM pool.d directory # Install PHP dependencies (Laravel 5.0 compatible)
# COPY www.conf /usr/local/etc/php-fpm.d/www.conf RUN composer install --no-dev --no-interaction --prefer-dist
# Expose port 9000 and start php-fpm server # Generate application key
EXPOSE 9000 RUN php artisan key:generate || true
CMD ["php-fpm"]
# Run Laravel 5.0 optimization
RUN php artisan clear-compiled && php artisan optimize
# Note: yakpro-po obfuscation requires PHP 7.1+, incompatible with PHP 7.0
# For code protection with PHP 7.0, consider:
# 1. ionCube Encoder (commercial, most secure)
# 2. Keeping source code private and using proper access controls
# 3. Using --optimize flag in composer (already done above)
# Configure Apache DocumentRoot to point to Laravel's public directory
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
# Suppress Apache ServerName warning
RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
# Copy entrypoint script
COPY docker-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
# Expose port 80
EXPOSE 80
# Use entrypoint to set up permissions before starting Apache
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["apache2-foreground"]

133
LOCAL_DEVELOPMENT.md Normal file
View File

@@ -0,0 +1,133 @@
# Local Development Setup for Merchbay
## Quick Start
1. **Copy local environment file:**
```bash
cp .env.local .env
```
2. **Build and start containers:**
```bash
docker-compose -f docker-compose.local.yml up -d --build
```
3. **Generate application key:**
```bash
docker exec merchbay_app_local php artisan key:generate
```
4. **Run migrations:**
```bash
docker exec merchbay_app_local php artisan migrate
```
5. **Access the application:**
- **App:** http://localhost:8080
- **phpMyAdmin:** http://localhost:8081
- Username: `merchbay`
- Password: `secret`
## Development Commands
### View logs
```bash
# Application logs
docker exec merchbay_app_local tail -f storage/logs/laravel.log
# Apache logs
docker logs -f merchbay_app_local
```
### Run artisan commands
```bash
docker exec merchbay_app_local php artisan [command]
```
### Access container shell
```bash
docker exec -it merchbay_app_local bash
```
### Database access
```bash
docker exec -it merchbay_db_local mysql -u merchbay -psecret merchbay
```
### Clear caches
```bash
docker exec merchbay_app_local php artisan cache:clear
docker exec merchbay_app_local php artisan config:clear
docker exec merchbay_app_local php artisan view:clear
```
### Stop containers
```bash
docker-compose -f docker-compose.local.yml down
```
### Stop and remove volumes (clean slate)
```bash
docker-compose -f docker-compose.local.yml down -v
```
## Debugging
### Enable Xdebug (if needed)
Add to Dockerfile:
```dockerfile
RUN pecl install xdebug-2.9.8 && docker-php-ext-enable xdebug
```
### Check container status
```bash
docker-compose -f docker-compose.local.yml ps
```
### View all logs
```bash
docker-compose -f docker-compose.local.yml logs -f
```
## Hot Reload Development
For live code changes without rebuilding:
- Code changes in `.php` files are reflected immediately (via volume mount)
- View changes are reflected immediately
- Config/route changes require cache clearing
## Database Management
### Import SQL dump
```bash
docker exec -i merchbay_db_local mysql -u merchbay -psecret merchbay < dump.sql
```
### Export database
```bash
docker exec merchbay_db_local mysqldump -u merchbay -psecret merchbay > dump.sql
```
## Troubleshooting
### Permission issues
```bash
docker exec merchbay_app_local chown -R www-data:www-data storage bootstrap/cache
docker exec merchbay_app_local chmod -R 775 storage bootstrap/cache
```
### Reset everything
```bash
docker-compose -f docker-compose.local.yml down -v
docker rmi merchbay_app:local
rm .env
cp .env.local .env
docker-compose -f docker-compose.local.yml up -d --build
```
## Notes
- The local setup uses a separate MySQL container
- All code changes are live-mounted for easy development
- Mail is logged to `storage/logs/laravel.log` instead of being sent
- phpMyAdmin is available for easy database management

View File

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

View File

@@ -499,6 +499,30 @@ class TeamStoreController extends Controller
'ShippingCostId' => $shipping_cost_id '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") { } elseif ($product_form == "number-form") {
$order_number = $post['order_number']; $order_number = $post['order_number'];
@@ -954,6 +978,7 @@ class TeamStoreController extends Controller
'shippingFee' => number_format($shippingFee, 2), 'shippingFee' => number_format($shippingFee, 2),
'total' => number_format($finalSubTotal + $shippingFee + $tax["tax"], 2), 'total' => number_format($finalSubTotal + $shippingFee + $tax["tax"], 2),
'subtotal' => number_format($finalSubTotal, 2), 'subtotal' => number_format($finalSubTotal, 2),
'tax' => $tax["tax"],
'remaining_shippingfee' => number_format(99 - $finalSubTotal, 2) 'remaining_shippingfee' => number_format(99 - $finalSubTotal, 2)
)); ));
} else { } else {

View File

@@ -34,10 +34,10 @@ class UserController extends Controller
$post_data = array( $post_data = array(
'isStoreOwner' => true, 'isStoreOwner' => true,
'store_order' => $countStoreOrder[0]->count_order, 'store_order' => isset($countStoreOrder[0]->count_order) ? $countStoreOrder[0]->count_order : 0,
'store_income' => $storeIncome[0]->store_income, 'store_income' => isset($storeIncome[0]->store_income) ? $storeIncome[0]->store_income : 0,
'store_product_count' => $countStoreProduct[0]->store_product_count, 'store_product_count' => isset($countStoreProduct[0]->store_product_count) ? $countStoreProduct[0]->store_product_count : 0,
'store_published_product' => $countStorePublishedProduct[0]->store_published_product 'store_published_product' => isset($countStorePublishedProduct[0]->store_published_product) ? $countStorePublishedProduct[0]->store_published_product : 0
); );
} else { } else {
$post_data = array( $post_data = array(
@@ -348,14 +348,16 @@ class UserController extends Controller
$newTeamStoreModel = new TeamStoreModel; $newTeamStoreModel = new TeamStoreModel;
$product_array = $newTeamStoreModel->selectTeamStoreProducts('ProductURL', $url); $product_array = $newTeamStoreModel->selectTeamStoreProducts('ProductURL', $url);
$roster = $newUserModel->getRoster($product_array[0]->Id);
$thumbnails_array = $newTeamStoreModel->getThumbnails($product_array[0]->Id); $thumbnails_array = $newTeamStoreModel->getThumbnails($product_array[0]->Id);
$available_size = explode(",", $product_array[0]->AvailableSizes); $available_size = explode(",", $product_array[0]->AvailableSizes);
$shipping_cost = $newUserModel->selectShippingCost(); $shipping_cost = $newUserModel->selectShippingCost();
return view('user-layouts.view-store-item')->with('product_array', $product_array) return view('user-layouts.view-store-item')->with('product_array', $product_array)
->with('available_size', $available_size) ->with('available_size', $available_size)
->with('thumbnails_array', $thumbnails_array) ->with('thumbnails_array', $thumbnails_array)
->with('shipping_cost', $shipping_cost); ->with('shipping_cost', $shipping_cost)
->with('roster', $roster);
} }
@@ -1344,4 +1346,76 @@ class UserController extends Controller
return $array_address_book; 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);
}
} }

View File

@@ -149,6 +149,11 @@ Route::group(['middleware' => 'normaluser'], function () {
Route::post('user/store-items/personal-design', 'user\UserController@saveNewItemFromDesigner'); 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 () { Route::group(['middleware' => 'auth'], function () {

View File

@@ -189,6 +189,16 @@ class TeamStoreModel extends Model
return $i; 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) function updateStoreItem($data, $url)
{ {
$i = DB::table('teamstore_products')->where('ProductURL', $url) $i = DB::table('teamstore_products')->where('ProductURL', $url)

View File

@@ -425,4 +425,44 @@ class UserModel extends Model
->update($data); ->update($data);
return $i; 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
}
} }

View File

@@ -15,7 +15,11 @@ class AppServiceProvider extends ServiceProvider {
*/ */
public function boot() public function boot()
{ {
// // Force HTTPS URLs when behind a proxy (Traefik)
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
\URL::forceSchema('https');
}
Blade::extend(function($value) { Blade::extend(function($value) {
return preg_replace('/\@define(.+)/', '<?php ${1}; ?>', $value); return preg_replace('/\@define(.+)/', '<?php ${1}; ?>', $value);
}); });

View File

@@ -46,6 +46,9 @@
] ]
}, },
"config": { "config": {
"preferred-install": "dist" "preferred-install": "dist",
"allow-plugins": {
"kylekatarnls/update-helper": true
}
} }
} }

58
docker-compose.dev.yml Normal file
View File

@@ -0,0 +1,58 @@
services:
app:
image: merchbay:dev
container_name: merchbay_app_dev
restart: unless-stopped
environment:
- APP_ENV=${APP_ENV:-development}
- APP_DEBUG=${APP_DEBUG:-true}
- APP_URL=${APP_URL:-https://dev.merchbay.app}
- DB_CONNECTION=mysql
- DB_HOST=${DB_HOST}
- DB_PORT=${DB_PORT:-3306}
- DB_DATABASE=${DB_DATABASE}
- DB_USERNAME=${DB_USERNAME}
- DB_PASSWORD=${DB_PASSWORD}
- PROD_PRIVATE=${PROD_PRIVATE}
- IMAGES_URL=${IMAGES_URL}
- UPLOAD_URL=${UPLOAD_URL}
- FORCE_HTTPS=true
- MAIL_DRIVER=${MAIL_DRIVER}
- MAIL_HOST=${MAIL_HOST}
- MAIL_PORT=${MAIL_PORT}
- MAIL_USERNAME=${MAIL_USERNAME}
- MAIL_PASSWORD=${MAIL_PASSWORD}
- MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
- CAPTCHA_SITE_KEY=${CAPTCHA_SITE_KEY}
- CAPTCHA_SECRET_KEY=${CAPTCHA_SECRET_KEY}
- ANALYTICS_SITE_ID=${ANALYTICS_SITE_ID}
- ANALYTICS_CLIENT_ID=${ANALYTICS_CLIENT_ID}
- ANALYTICS_SERVICE_EMAIL=${ANALYTICS_SERVICE_EMAIL}
volumes:
- ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads
labels:
- "traefik.enable=true"
# Development environment (dev.merchbay.app)
- "traefik.http.routers.merchbay-dev.rule=Host(`dev.merchbay.app`)"
- "traefik.http.routers.merchbay-dev.entrypoints=websecure"
- "traefik.http.routers.merchbay-dev.tls=true"
- "traefik.http.routers.merchbay-dev.tls.certresolver=le"
- "traefik.http.services.merchbay-dev.loadbalancer.server.port=80"
# HTTP to HTTPS redirect
- "traefik.http.routers.merchbay-dev-http.rule=Host(`dev.merchbay.app`)"
- "traefik.http.routers.merchbay-dev-http.entrypoints=web"
- "traefik.http.routers.merchbay-dev-http.middlewares=https-redirect"
- "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
networks:
- traefik-public
- crew-app-net
- default
networks:
traefik-public:
external: true
crew-app-net:
external: true
default:
driver: bridge

81
docker-compose.local.yml Normal file
View File

@@ -0,0 +1,81 @@
services:
db:
image: mariadb:10.6
platform: linux/arm64
container_name: merchbay_db_local
restart: unless-stopped
environment:
MYSQL_DATABASE: merchbay
MYSQL_ROOT_PASSWORD: root
MYSQL_USER: merchbay
MYSQL_PASSWORD: secret
ports:
- "3306:3306"
volumes:
- db_data:/var/lib/mysql
networks:
- merchbay-local
app:
build:
context: .
dockerfile: Dockerfile
container_name: merchbay_app_local
restart: unless-stopped
ports:
- "8080:80"
environment:
- APP_ENV=local
- APP_DEBUG=true
- APP_URL=http://localhost:8080
- DB_CONNECTION=mysql
- DB_HOST=db
- DB_PORT=3306
- DB_DATABASE=merchbay
- DB_USERNAME=merchbay
- DB_PASSWORD=secret
- PROD_PRIVATE=http://localhost:8080
- IMAGES_URL=http://localhost:8080
- UPLOAD_URL=http://localhost:8080/uploads/
- MAIL_DRIVER=log
- MAIL_HOST=localhost
- MAIL_PORT=1025
- MAIL_USERNAME=null
- MAIL_PASSWORD=null
- MAIL_ENCRYPTION=null
- CAPTCHA_SITE_KEY=test_key
- CAPTCHA_SECRET_KEY=test_secret
- ANALYTICS_SITE_ID=
- ANALYTICS_CLIENT_ID=
- ANALYTICS_SERVICE_EMAIL=
volumes:
- ./:/var/www/html
- ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads
depends_on:
- db
networks:
- merchbay-local
phpmyadmin:
image: arm64v8/phpmyadmin
platform: linux/arm64
container_name: merchbay_phpmyadmin
restart: unless-stopped
ports:
- "8081:80"
environment:
PMA_HOST: db
PMA_PORT: 3306
MYSQL_ROOT_PASSWORD: root
depends_on:
- db
networks:
- merchbay-local
networks:
merchbay-local:
driver: bridge
volumes:
db_data:

57
docker-compose.prod.yml Normal file
View File

@@ -0,0 +1,57 @@
services:
app:
image: merchbay:latest
container_name: merchbay_app_prod
restart: unless-stopped
environment:
- APP_ENV=${APP_ENV:-production}
- APP_DEBUG=${APP_DEBUG:-false}
- APP_URL=${APP_URL:-https://merchbay.com}
- DB_CONNECTION=mysql
- DB_HOST=${DB_HOST}
- DB_PORT=${DB_PORT:-3306}
- DB_DATABASE=${DB_DATABASE}
- DB_USERNAME=${DB_USERNAME}
- DB_PASSWORD=${DB_PASSWORD}
- PROD_PRIVATE=${PROD_PRIVATE}
- IMAGES_URL=${IMAGES_URL}
- UPLOAD_URL=${UPLOAD_URL}
- FORCE_HTTPS=true
- MAIL_DRIVER=${MAIL_DRIVER}
- MAIL_HOST=${MAIL_HOST}
- MAIL_PORT=${MAIL_PORT}
- MAIL_USERNAME=${MAIL_USERNAME}
- MAIL_PASSWORD=${MAIL_PASSWORD}
- MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
- CAPTCHA_SITE_KEY=${CAPTCHA_SITE_KEY}
- CAPTCHA_SECRET_KEY=${CAPTCHA_SECRET_KEY}
- ANALYTICS_SITE_ID=${ANALYTICS_SITE_ID}
- ANALYTICS_CLIENT_ID=${ANALYTICS_CLIENT_ID}
- ANALYTICS_SERVICE_EMAIL=${ANALYTICS_SERVICE_EMAIL}
volumes:
- ./storage:/var/www/html/storage
- ./public/uploads:/var/www/html/public/uploads
labels:
- "traefik.enable=true"
# Production environment (merchbay.com) - Uses DigiCert SSL
- "traefik.http.routers.merchbay-prod.rule=Host(`merchbay.com`) || Host(`www.merchbay.com`)"
- "traefik.http.routers.merchbay-prod.entrypoints=websecure"
- "traefik.http.routers.merchbay-prod.tls=true"
- "traefik.http.services.merchbay-prod.loadbalancer.server.port=80"
# HTTP to HTTPS redirect
- "traefik.http.routers.merchbay-prod-http.rule=Host(`merchbay.com`) || Host(`www.merchbay.com`)"
- "traefik.http.routers.merchbay-prod-http.entrypoints=web"
- "traefik.http.routers.merchbay-prod-http.middlewares=https-redirect"
- "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
networks:
- traefik-public
- crew-app-net
- default
networks:
traefik-public:
external: true
crew-app-net:
external: true
default:
driver: bridge

101
docker-compose.yml Normal file → Executable file
View File

@@ -1,45 +1,74 @@
version: '3' # ⚠️ DEPRECATED: Use docker-compose.dev.yml or docker-compose.prod.yml instead
# This file is kept for reference only
#
# For development: docker-compose.dev.yml (dev.merchbay.app)
# For production: docker-compose.prod.yml (merchbay.com)
# For local dev: docker-compose.local.yml (localhost:8080)
services: services:
#PHP Service
app: app:
build: image: merchbay:latest
context: . container_name: merchbay_app
dockerfile: Dockerfile
image: digitalocean.com/php
container_name: app
restart: unless-stopped restart: unless-stopped
tty: true
environment: environment:
SERVICE_NAME: app - APP_ENV=${APP_ENV:-production}
SERVICE_TAGS: dev - APP_DEBUG=${APP_DEBUG:-false}
working_dir: /var/www - APP_URL=${APP_URL:-http://localhost}
- DB_CONNECTION=mysql
- DB_HOST=${DB_HOST}
- DB_PORT=${DB_PORT:-3306}
- DB_DATABASE=${DB_DATABASE}
- DB_USERNAME=${DB_USERNAME}
- DB_PASSWORD=${DB_PASSWORD}
- PROD_PRIVATE=${PROD_PRIVATE}
- IMAGES_URL=${IMAGES_URL}
- UPLOAD_URL=${UPLOAD_URL}
- FORCE_HTTPS=true
- MAIL_DRIVER=${MAIL_DRIVER}
- MAIL_HOST=${MAIL_HOST}
- MAIL_PORT=${MAIL_PORT}
- MAIL_USERNAME=${MAIL_USERNAME}
- MAIL_PASSWORD=${MAIL_PASSWORD}
- MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
- CAPTCHA_SITE_KEY=${CAPTCHA_SITE_KEY}
- CAPTCHA_SECRET_KEY=${CAPTCHA_SECRET_KEY}
- ANALYTICS_SITE_ID=${ANALYTICS_SITE_ID}
- ANALYTICS_CLIENT_ID=${ANALYTICS_CLIENT_ID}
- ANALYTICS_SERVICE_EMAIL=${ANALYTICS_SERVICE_EMAIL}
volumes: volumes:
- ./:/var/www - ./storage:/var/www/html/storage
- ./php/local.ini:/usr/local/etc/php/conf.d/local.ini - ./public/uploads:/var/www/html/public/uploads
labels:
- "traefik.enable=true"
# Development environment (dev.merchbay.app)
- "traefik.http.routers.merchbay-dev.rule=Host(`dev.merchbay.app`)"
- "traefik.http.routers.merchbay-dev.entrypoints=websecure"
- "traefik.http.routers.merchbay-dev.tls=true"
- "traefik.http.routers.merchbay-dev.tls.certresolver=letsencrypt"
- "traefik.http.services.merchbay-dev.loadbalancer.server.port=80"
# Production environment (merchbay.com) - Uses DigiCert SSL
- "traefik.http.routers.merchbay-prod.rule=Host(`merchbay.com`) || Host(`www.merchbay.com`)"
- "traefik.http.routers.merchbay-prod.entrypoints=websecure"
- "traefik.http.routers.merchbay-prod.tls=true"
- "traefik.http.services.merchbay-prod.loadbalancer.server.port=80"
# HTTP to HTTPS redirect - Development
- "traefik.http.routers.merchbay-dev-http.rule=Host(`dev.merchbay.app`)"
- "traefik.http.routers.merchbay-dev-http.entrypoints=web"
- "traefik.http.routers.merchbay-dev-http.middlewares=https-redirect"
# HTTP to HTTPS redirect - Production
- "traefik.http.routers.merchbay-prod-http.rule=Host(`merchbay.com`) || Host(`www.merchbay.com`)"
- "traefik.http.routers.merchbay-prod-http.entrypoints=web"
- "traefik.http.routers.merchbay-prod-http.middlewares=https-redirect"
- "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https"
networks: networks:
- app-network - traefik-public
- crew-app-net
- default
#Nginx Service
webserver:
image: nginx:alpine
container_name: webserver
restart: unless-stopped
tty: true
ports:
- "10003:80"
- "10443:443"
volumes:
- ./:/var/www
- ./nginx/conf.d/:/etc/nginx/conf.d/
networks:
- app-network
#Docker Networks
networks: networks:
app-network: traefik-public:
external: true
crew-app-net:
external: true
default:
driver: bridge driver: bridge
#Volumes
volumes:
dbdata:
driver: local

17
docker-entrypoint.sh Normal file
View File

@@ -0,0 +1,17 @@
#!/bin/bash
set -e
# Create storage directory structure if it doesn't exist
mkdir -p storage/framework/views
mkdir -p storage/framework/cache
mkdir -p storage/framework/sessions
mkdir -p storage/logs
mkdir -p storage/app/public
mkdir -p bootstrap/cache
# Set proper permissions
chown -R www-data:www-data storage bootstrap/cache
chmod -R 775 storage bootstrap/cache
# Execute the main command
exec "$@"

0
favicon.ico Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
nginx/conf.d/app.conf Normal file → Executable file
View File

0
php/local.ini Normal file → Executable file
View File

0
public/api/canada.json Normal file → Executable file
View File

0
public/api/usa.json Normal file → Executable file
View File

0
public/api/usaCities.old.json Normal file → Executable file
View File

0
public/assets/css/jquery-ui.css vendored Normal file → Executable file
View File

0
public/assets/files/Terms of Use.pdf Normal file → Executable file
View File

0
public/assets/js/jquery-ui.js vendored Normal file → Executable file
View File

0
public/images/MERCHBAY-LOGO.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
public/images/merchbay-black.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
public/images/merchbay-white.png Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

176
readme.md
View File

@@ -1,23 +1,171 @@
## Laravel PHP Framework # MerchBay
[![Build Status](https://travis-ci.org/laravel/framework.svg)](https://travis-ci.org/laravel/framework) A custom merchandise and apparel design platform built with Laravel 5.0, enabling users to create, customize, and order personalized products.
[![Total Downloads](https://poser.pugx.org/laravel/framework/downloads.svg)](https://packagist.org/packages/laravel/framework)
[![Latest Stable Version](https://poser.pugx.org/laravel/framework/v/stable.svg)](https://packagist.org/packages/laravel/framework)
[![Latest Unstable Version](https://poser.pugx.org/laravel/framework/v/unstable.svg)](https://packagist.org/packages/laravel/framework)
[![License](https://poser.pugx.org/laravel/framework/license.svg)](https://packagist.org/packages/laravel/framework)
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, queueing, and caching. ## 🚀 Tech Stack
Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked. - **Framework:** Laravel 5.0
- **PHP:** 7.0 with native mcrypt support
- **Web Server:** Apache 2.4
- **Database:** MySQL
- **Container:** Docker with Apache
- **Reverse Proxy:** Traefik (for SSL/TLS and routing)
## Official Documentation ## 📋 Prerequisites
Documentation for the framework can be found on the [Laravel website](http://laravel.com/docs). - Docker and Docker Compose
- Git
- Access to deployment server (for production/dev deployments)
## Contributing ## 🛠️ Local Development
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](http://laravel.com/docs/contributions). ### Building the Docker Image
### License ```bash
docker build -t merchbay:dev .
```
The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT) ### Running Locally
```bash
# Create .env file from example
cp .env.example .env
# Update .env with your local configuration
# Set database credentials, mail settings, etc.
# Run with docker-compose (customize docker-compose.yml for local setup)
docker-compose up -d
```
### Environment Variables
The following environment variables are required:
#### Database Configuration
- `DB_HOST` - Database host
- `DB_PORT` - Database port (default: 3306)
- `DB_DATABASE` - Database name
- `DB_USERNAME` - Database username
- `DB_PASSWORD` - Database password
#### Application URLs
- `APP_URL` - Application base URL
- `PROD_PRIVATE` - Production private server URL
- `IMAGES_URL` - Images server URL
- `UPLOAD_URL` - Upload directory URL
#### Mail Configuration
- `MAIL_DRIVER` - Mail driver (smtp)
- `MAIL_HOST` - SMTP host
- `MAIL_PORT` - SMTP port
- `MAIL_USERNAME` - SMTP username
- `MAIL_PASSWORD` - SMTP password
- `MAIL_ENCRYPTION` - Encryption type (tls/ssl)
#### Third-Party Services
- `CAPTCHA_SITE_KEY` - reCAPTCHA site key
- `CAPTCHA_SECRET_KEY` - reCAPTCHA secret key
- `ANALYTICS_SITE_ID` - Google Analytics site ID
- `ANALYTICS_CLIENT_ID` - Google Analytics client ID
- `ANALYTICS_SERVICE_EMAIL` - Google Analytics service email
## 🚢 Deployment
### Automated CI/CD with Gitea Actions
This project includes automated deployment workflows using Gitea Actions:
#### Development Deployment
Push to the `dev` branch to automatically deploy to dev environment:
```bash
git push origin dev
```
- Deploys to: `https://dev.merchbay.app`
#### Production Deployment
Push to the `main` or `master` branch to automatically deploy to production:
```bash
git push origin main
```
- Deploys to: `https://merchbay.app`
#### Docker Registry
Create version tags to build and push to Docker registry:
```bash
git tag -a v1.0.0 -m "Release v1.0.0"
git push origin v1.0.0
```
### Workflow Files
- `.gitea/workflows/deploy-dev.yml` - Development deployment
- `.gitea/workflows/deploy.yml` - Production deployment
- `.gitea/workflows/build-push.yml` - Docker image build and push
## 📁 Project Structure
```
merchbay/
├── app/ # Application core
│ ├── Http/ # Controllers, middleware, routes
│ ├── Models/ # Database models
│ └── Services/ # Business logic services
├── config/ # Configuration files
├── database/ # Migrations and seeds
├── public/ # Public assets (images, CSS, JS)
├── resources/ # Views and frontend assets
├── storage/ # Application storage
├── docker-compose.yml # Docker compose configuration
├── Dockerfile # Docker image definition
└── docker-entrypoint.sh # Container startup script
```
## 🔧 Development Notes
### Storage Permissions
The Docker entrypoint automatically creates and sets proper permissions for:
- `storage/framework/views`
- `storage/framework/cache`
- `storage/framework/sessions`
- `storage/logs`
- `bootstrap/cache`
### PHP Extensions
The following PHP extensions are installed:
- pdo_mysql
- mbstring
- exif
- pcntl
- bcmath
- mcrypt (native in PHP 7.0)
- tokenizer
- zip
- gd (with freetype and jpeg support)
## 🐛 Troubleshooting
### 500 Internal Server Error
1. Check container logs: `docker logs merchbay_app`
2. Verify storage permissions are set correctly
3. Ensure all environment variables are configured in `.env`
4. Check database connectivity
### Storage Permission Issues
The entrypoint script automatically fixes permissions on container start. If issues persist:
```bash
docker exec merchbay_app chown -R www-data:www-data storage bootstrap/cache
docker exec merchbay_app chmod -R 775 storage bootstrap/cache
```
## 📄 License
Proprietary - All rights reserved
## 🤝 Support
For support and questions, contact the development team.

0
resources/views/designer/vue_designer.blade.php Normal file → Executable file
View File

0
resources/views/emails/contact_us.blade.php Normal file → Executable file
View File

View File

@@ -540,6 +540,13 @@
<td><b>Price</b></td> <td><b>Price</b></td>
<td><b>Quantity</b></td> <td><b>Quantity</b></td>
</tr> </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 @else
@endif @endif
<!-- table header --> <!-- table header -->
@@ -666,6 +673,17 @@
<td>{{ $sub_item->Quantity }} <td>{{ $sub_item->Quantity }}
</td> </td>
</tr> </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 @else
@endif @endif
@endif @endif

0
resources/views/errors/404.blade.php Normal file → Executable file
View File

View File

@@ -174,6 +174,15 @@
<th>Quantity</th> <th>Quantity</th>
<th></th> <th></th>
</tr> </tr>
@elseif($item->FormUsed == 'number-size-form')
<tr>
<th>Number</th>
<th>Size</th>
<th>Price</th>
<th>Quantity</th>
<th></th>
</tr>
@else @else
@endif @endif
@@ -296,6 +305,17 @@
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td> class="fa fa-times"></i></a></td>
</tr> </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 @else
@endif @endif
@endif @endif

0
resources/views/merchbay/not_found.blade.php Normal file → Executable file
View File

0
resources/views/merchbay/privacy_policy.blade.php Normal file → Executable file
View File

0
resources/views/merchbay/terms_of_use.blade.php Normal file → Executable file
View File

0
resources/views/merchbay/track_order.blade.php Normal file → Executable file
View File

View File

@@ -10,13 +10,13 @@
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> <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> <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://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="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('/assets/login/css/style.css') }}" rel="stylesheet">
<link href="{{ asset('public/assets/login/css/form-elements.css') }}" rel="stylesheet"> --> <link href="{{ asset('/assets/login/css/form-elements.css') }}" rel="stylesheet"> -->
<script src='https://www.google.com/recaptcha/api.js'></script> <script src='https://www.google.com/recaptcha/api.js'></script>
<!-- Global site tag (gtag.js) - Google Analytics --> <!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-SB3QK6BR1N"></script> <script async src="https://www.googletagmanager.com/gtag/js?id=G-SB3QK6BR1N"></script>
@@ -258,7 +258,7 @@
} }
function fetchCanada() { function fetchCanada() {
$.getJSON("{{ asset('/public/api/canada.json') }}", function(items) { $.getJSON("{{ asset('//api/canada.json') }}", function(items) {
var states = []; var states = [];
Object.keys(items).forEach(function(state) { Object.keys(items).forEach(function(state) {
@@ -307,7 +307,7 @@
} }
function fetchUSA() { function fetchUSA() {
$.getJSON("{{ asset('/public/api/usaCities.json') }}", function(data) { $.getJSON("{{ asset('//api/usaCities.json') }}", function(data) {
var states = []; var states = [];
for (i = 0; i < data.length; i++) { for (i = 0; i < data.length; i++) {

0
resources/views/paypal/payment_success.blade.php Normal file → Executable file
View File

View File

@@ -0,0 +1,45 @@
<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>

View File

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

View File

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

View File

@@ -86,54 +86,6 @@
</div> </div>
<!-- ./col --> <!-- ./col -->
</div> </div>
{{-- <div class="row">
<div class="col-lg-12">
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">Total Sales</h3>
<div class="box-tools">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
</button>
<button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
</div>
</div>
<div class="box-body">
<div class="well">
<div class="form-group col-md-3">
<label class="control-label">Select Year: <span class="required">*</span></label>
<select type="text" class="form-control" placeholder="Select Select Year">
<option value="2020">2020</option>
<option value="2019">2019</option>
</select>
</div>
<div class="form-group col-md-3">
<label class="control-label">Select Month <span class="required">*</span></label>
<select class="form-control" placeholder="Select Date">
<option value="">January</option>
<option value="">February</option>
<option value="">March</option>
<option value="">April</option>
<option value="">May</option>
<option value="">June</option>
<option value="">July</option>
<option value="">August</option>
<option value="">September</option>
<option value="">October</option>
<option value="">November</option>
<option value="">December</option>
</select>
</div>
<div class="clearfix"></div>
</div>
<div class="chart">
<canvas id="myChart" style="height:350px"></canvas>
</div>
</div>
<!-- /.box-body -->
</div>
</div>
</div> --}}
@else @else
<div class="text-center" id="homepage-logo"> <div class="text-center" id="homepage-logo">

View File

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

View File

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

View File

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

View File

@@ -13,37 +13,41 @@
<meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" /> <meta http-equiv="Expires" content="0" />
<!-- Bootstrap 3.3.6 --> <!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/bootstrap/css/bootstrap.min.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/bootstrap/css/bootstrap.min.css')}}">
<!-- Font Awesome --> <!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
<!-- Ionicons --> <!-- Ionicons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/dist/css/AdminLTE.min.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/dist/css/AdminLTE.min.css')}}">
<!-- AdminLTE Skins. Choose a skin from the css/skins <!-- AdminLTE Skins. Choose a skin from the css/skins
folder instead of downloading all of them to reduce the load. --> folder instead of downloading all of them to reduce the load. -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/dist/css/skins/_all-skins.min.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/dist/css/skins/_all-skins.min.css')}}">
<!-- iCheck --> <!-- iCheck -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/plugins/iCheck/flat/blue.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/plugins/iCheck/flat/blue.css')}}">
<!-- Date Picker --> <!-- Date Picker -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/plugins/datepicker/datepicker3.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/plugins/datepicker/datepicker3.css')}}">
<!-- Daterange picker --> <!-- Daterange picker -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/plugins/daterangepicker/daterangepicker.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/plugins/daterangepicker/daterangepicker.css')}}">
<!-- bootstrap wysihtml5 - text editor --> <!-- bootstrap wysihtml5 - text editor -->
<link rel="stylesheet" href="{{asset('/public/bower_components/AdminLTE/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css')}}"> <link rel="stylesheet" href="{{asset('/bower_components/AdminLTE/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css')}}">
<!-- Select2 --> <!-- Select2 -->
<link href="{{asset('/public/bower_components/AdminLTE/plugins/select2/select2.min.css')}}" rel="stylesheet" /> <link href="{{asset('/bower_components/AdminLTE/plugins/select2/select2.min.css')}}" rel="stylesheet" />
<!-- ekko-lightbox --> <!-- ekko-lightbox -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.3.0/ekko-lightbox.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.3.0/ekko-lightbox.css" rel="stylesheet">
<!-- bootstrap-toggle --> <!-- bootstrap-toggle -->
<link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet"> <link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">
<!-- DataTables --> <!-- DataTables -->
<link rel="stylesheet" href="{{ asset('/public/bower_components/AdminLTE/plugins/datatables.net-bs/css/dataTables.bootstrap.min.css') }}"> <link rel="stylesheet" href="{{ asset('/bower_components/AdminLTE/plugins/datatables.net-bs/css/dataTables.bootstrap.min.css') }}">
<!-- datepicker --> <!-- datepicker -->
<link rel="stylesheet" href="{{ asset('/public/bower_components/AdminLTE/plugins/datepicker/datepicker3.css') }}"> <link rel="stylesheet" href="{{ asset('/bower_components/AdminLTE/plugins/datepicker/datepicker3.css') }}">
<!-- jquery-ui --> <!-- jquery-ui -->
<link href="{{ asset('/public/assets/css/jquery-ui.css') }}" rel="stylesheet"> <link href="{{ asset('/assets/css/jquery-ui.css') }}" rel="stylesheet">
<link href="{{asset('/public/designer/css/build.css')}}" rel="stylesheet"> <link href="{{asset('/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 --> <!-- 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:// --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@@ -624,41 +628,41 @@
<!-- ./wrapper --> <!-- ./wrapper -->
<!-- jQuery 2.2.3 --> <!-- jQuery 2.2.3 -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/jQuery/jquery-2.2.3.min.js')}}"></script>
<!-- Bootstrap 3.3.6 --> <!-- Bootstrap 3.3.6 -->
<script src="{{asset('/public/bower_components/AdminLTE/bootstrap/js/bootstrap.min.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/bootstrap/js/bootstrap.min.js')}}"></script>
<!-- daterangepicker --> <!-- daterangepicker -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.11.2/moment.min.js"></script>
<script src="{{asset('/public/bower_components/AdminLTE/plugins/daterangepicker/daterangepicker.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/daterangepicker/daterangepicker.js')}}"></script>
<!-- datepicker --> <!-- datepicker -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/datepicker/bootstrap-datepicker.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/datepicker/bootstrap-datepicker.js')}}"></script>
<!-- Bootstrap WYSIHTML5 --> <!-- Bootstrap WYSIHTML5 -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js')}}"></script>
<!-- Slimscroll --> <!-- Slimscroll -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/slimScroll/jquery.slimscroll.min.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/slimScroll/jquery.slimscroll.min.js')}}"></script>
<!-- FastClick --> <!-- FastClick -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/fastclick/fastclick.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/fastclick/fastclick.js')}}"></script>
<!-- AdminLTE App --> <!-- AdminLTE App -->
<script src="{{asset('/public/bower_components/AdminLTE/dist/js/app.min.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/dist/js/app.min.js')}}"></script>
<!-- AdminLTE dashboard demo (This is only for demo purposes) <!-- AdminLTE dashboard demo (This is only for demo purposes)
<script src="{{asset('/bower_components/AdminLTE/dist/js/pages/dashboard.js')}}"></script>--> <script src="{{asset('/bower_components/AdminLTE/dist/js/pages/dashboard.js')}}"></script>-->
<!-- AdminLTE for demo purposes --> <!-- AdminLTE for demo purposes -->
<script src="{{asset('/public/bower_components/AdminLTE/dist/js/demo.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/dist/js/demo.js')}}"></script>
<!-- Select2 --> <!-- Select2 -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.3/js/select2.min.js"></script>
<!-- validate jquery --> <!-- validate jquery -->
<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script> <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js"></script>
<!-- \priceformat --> <!-- \priceformat -->
<script src="{{asset('/public/designer/js/jquery.priceformat.min.js')}}"></script> <script src="{{asset('/designer/js/jquery.priceformat.min.js')}}"></script>
<!-- ekko-lightbox --> <!-- ekko-lightbox -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.3.0/ekko-lightbox.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.3.0/ekko-lightbox.js"></script>
<!-- bootstrap-toggle --> <!-- bootstrap-toggle -->
<script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script> <script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
<!-- DataTables --> <!-- DataTables -->
<script src="{{ asset('/public/bower_components/AdminLTE/plugins/datatables.net/js/jquery.dataTables.min.js') }}"></script> <script src="{{ asset('/bower_components/AdminLTE/plugins/datatables.net/js/jquery.dataTables.min.js') }}"></script>
<script src="{{ asset('/public/bower_components/AdminLTE/plugins/datatables.net-bs/js/dataTables.bootstrap.min.js') }}"></script> <script src="{{ asset('/bower_components/AdminLTE/plugins/datatables.net-bs/js/dataTables.bootstrap.min.js') }}"></script>
<script src="https://cdn.datatables.net/buttons/1.5.6/js/dataTables.buttons.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.5.6/js/dataTables.buttons.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.5.6/js/buttons.flash.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.5.6/js/buttons.flash.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
@@ -667,9 +671,9 @@
<script src="https://cdn.datatables.net/buttons/1.5.6/js/buttons.html5.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.5.6/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/1.5.6/js/buttons.print.min.js"></script> <script src="https://cdn.datatables.net/buttons/1.5.6/js/buttons.print.min.js"></script>
<!-- datepicker --> <!-- datepicker -->
<script src="{{asset('/public/bower_components/AdminLTE/plugins/datepicker/bootstrap-datepicker.js')}}"></script> <script src="{{asset('/bower_components/AdminLTE/plugins/datepicker/bootstrap-datepicker.js')}}"></script>
<!-- jquery-ui --> <!-- jquery-ui -->
<script src="{{ asset('/public/assets/js/jquery-ui.js') }}"></script> <script src="{{ asset('/assets/js/jquery-ui.js') }}"></script>
{{-- Chartjs --}} {{-- Chartjs --}}
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js"></script>
@@ -1787,7 +1791,7 @@
} }
function fetchCanada() { function fetchCanada() {
$.getJSON("{{ asset('/public/api/canada.json') }}", function(items) { $.getJSON("{{ asset('/api/canada.json') }}", function(items) {
var states = []; var states = [];
Object.keys(items).forEach(function(state) { Object.keys(items).forEach(function(state) {
@@ -1836,7 +1840,7 @@
} }
function fetchUSA() { function fetchUSA() {
$.getJSON("{{ asset('/public/api/usaCities.json') }}", function(data) { $.getJSON("{{ asset('/api/usaCities.json') }}", function(data) {
var states = []; var states = [];
for (i = 0; i < data.length; i++) { for (i = 0; i < data.length; i++) {
@@ -2150,7 +2154,6 @@
function submitFormItemDetails() { function submitFormItemDetails() {
var data = $("#frm-item-details").serialize(); var data = $("#frm-item-details").serialize();
// console.log(data)
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: "{{ url('user/store-items/update') }}", url: "{{ url('user/store-items/update') }}",

View File

@@ -1,277 +1,644 @@
@extends('user-layouts.user_template') @extends('user-layouts.user_template')
@section('content') @section('content')
<style> <style>
.hide-bullets { .hide-bullets {
list-style: none; list-style: none;
margin-left: -40px; margin-left: -40px;
margin-top: 20px; margin-top: 20px;
} }
</style> </style>
<div class="content-wrapper" style="min-height: 916px;">
<!-- Content Header (Page header) -->
<section class="content-header"> <div class="content-wrapper" id="viewStoreItem" style="min-height: 916px;">
<h1> <!-- Content Header (Page header) -->
Store Item <section class="content-header">
<small>{{ $product_array[0]->ProductName }}</small> <h1>
</h1> @{{ title }}
<ol class="breadcrumb"> <small>{{ $product_array[0]->ProductName }}</small>
<li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li> </h1>
<li><a href="{{ url('user/store-items') }}"><i class="fa fa-th"></i> Store Items</a></li> <ol class="breadcrumb">
<li class="active">{{ $product_array[0]->ProductName }}</li> <li><a href="{{ url('user') }}"><i class="fa fa-home"></i> Home</a></li>
</ol> <li><a href="{{ url('user/store-items') }}"><i class="fa fa-th"></i> Store Items</a></li>
</section> <li class="active">{{ $product_array[0]->ProductName }}</li>
<!-- Main content --> </ol>
<section class="content"> </section>
<div class="row"> <!-- Main content -->
<div class="col-md-7"> <section class="content">
<div class="box box-primary"> <div class="row">
<div class="box-header with-border"> <div class="col-md-7">
<button type="button" class="btn btn-default pull-right" data-toggle="modal" data-target="#myModal">Re-arrange / Delete thumbnail</button> <div class="box box-primary">
<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 class="box-header with-border">
</div> <button type="button" class="btn btn-default pull-right" data-toggle="modal"
<div class="box-body custom-box-body"> data-target="#myModal">Re-arrange / Delete thumbnail</button>
<div class="row"> <button type="button" class="btn btn-danger pull-right" id="btn_delete_store_id"
<div class="col-md-12"> style="margin-right: 5px;" data-id="{{ $product_array[0]->Id }}">Delete this
<div class="row"> Item</button>
<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>
<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="box-body custom-box-body">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<input type="hidden" class="form-control" name="item_url" value="{{ $product_array[0]->ProductURL }}" placeholder="Item Name"> <div class="row">
<div class="form-group"> <div class="col-md-12 text-center">
<label>SKU</label> @foreach ($thumbnails_array as $thumbnail)
<input type="text" class="form-control" name="sku" value="{{ $product_array[0]->ProductCode }}" placeholder="SKU"> @if ($thumbnail->ImageClass == 'active')
</div> <img style="height:400px"
<div class="form-group"> src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}"
<label>Item Name</label> id="main-thumbnail">
<input type="text" class="form-control" name="itemName" value="{{ $product_array[0]->ProductName }}" placeholder="Item Name"> @endif
</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 @endforeach
</select> </div>
<span id="err_available_size"></span> </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>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="box-footer"> <div class="modal-footer">
<!-- <button type="submit" class="btn btn-default">Cancel</button> --> <button type="submit" id="btn_submit_new_item_image" class="btn btn-primary">Submit</button>
<button type="submit" class="btn btn-primary pull-right">Save changes</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</section>
<!-- /.content -->
</div>
<!-- Modal --> <div class="modal fade" id="modalAddRoster" role="dialog" data-backdrop="static" data-keyboard="false">
<div class="modal fade" id="myModal" role="dialog"> <div class="modal-dialog">
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content"> {{-- @{{ roster }} --}}
<div class="modal-header"> <form @submit.prevent="onRosterSubmit">
<button type="button" class="close" data-dismiss="modal">&times;</button> <div class="modal-header">
<h4 class="modal-title">Item Images</h4> <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>
</div> </div>
<div class="modal-body"> </div>
<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 }}"> <div class="modal fade" id="modalViewRoster" role="dialog" data-backdrop="static" data-keyboard="false">
<td class="text-center" style="width: 50px"><i class="fa fa-bars"></i></td> <div class="modal-dialog">
<td><img class="img img-responsive product-center" style="height: 59.45px;" src="{{ config('site_config.images_url') }}/{{ $thumbnail->Image . '?t=' . time() }}" /></td> <div class="modal-content">
<td class="text-center"> <form @submit.prevent="onRosterUpdate">
<!-- <button class="btn btn-default btn-xs btn-edit-clipart" data-id="#"><i class="fa fa-edit"></i></button> --> <div class="modal-header">
<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> <button type="button" class="close" data-dismiss="modal">&times;</button>
</td> <h4 class="modal-title">Roster</h4>
</tr> </div>
@endforeach <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
</tbody> </button>
</table> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div> </div>
<div class="modal-footer"> </form>
<button type="button" class="btn btn-primary" id="btn_save_thumbnail_sorting">Save Changes</button> </div>
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="modal fade" id="modal_add_thumbnail" role="dialog">
<div class="modal-dialog modal-lg"> <script>
<div class="modal-content"> new Vue({
<form id="frm_add_new_images"> el: '#viewStoreItem',
<div class="modal-header"> data: {
<button type="button" class="close" data-dismiss="modal">&times;</button> title: "Store Item", // Passing Laravel data to Vue
<h4 class="modal-title">Add Image</h4> showAddRoster: false,
</div> itemFormSelected: {!! json_encode($product_array[0]->ProductForm) !!},
<div class="modal-body"> roster: [{
<div class="row grid-divider"> Name: "",
<div class="col-sm-4"> Number: "",
<div class="col-padding"> ProductId: {!! json_encode($product_array[0]->Id) !!}
<h3>Select Image(s)</h3> }],
<div class="form-group">
<input type="hidden" name="_id" value="{{ $product_array[0]->Id }}" /> currentRoster: {!! json_encode($roster) !!},
<input type="file" class="form-control" id="upload_images" name="upload_images[]" multiple accept="image/*" /> toBeDeletedRoster: [],
</div> isSubmit: false,
<div class="form-group"> isRefresh: false
<button type="button" id="clear_frm_add_new_images" class="btn btn-default btn-block">Clear</button> },
</div>
</div> methods: {
</div> handleSelectItemForm() {
<div class="col-sm-8"> console.log('Selected option:', this.itemFormSelected);
<div class="col-padding"> },
<h3>Preview</h3>
<div class="col-md-12"> addRosterRow() {
<ul class="hide-bullets small-preview-thumb"> this.roster.push({
</ul> Name: "",
</div> Number: "",
</div> ProductId: {!! json_encode($product_array[0]->Id) !!}
</div> })
</div> },
</div>
<div class="modal-footer"> deleteRoster(i, item) {
<button type="submit" id="btn_submit_new_item_image" class="btn btn-primary">Submit</button> this.currentRoster.splice(i, 1);
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button> this.toBeDeletedRoster.push(item.Id);
</div> },
</form>
</div> async onRosterUpdate() {
</div> // this.isSubmit = true;
</div>
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');
})
.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

0
storage/keys/crewsportswear_app.key Normal file → Executable file
View File

0
storage/keys/crewsportswear_app.ppk Normal file → Executable file
View File

17
traefik-certs.yml Normal file
View File

@@ -0,0 +1,17 @@
# Traefik Dynamic Configuration for Custom SSL Certificates
# This file should be uploaded to /srv/traefik/dynamic/traefik-certs.yml on production server
tls:
certificates:
# Production SSL Certificate (DigiCert)
# Note: merchbay.com.crt should be a bundle containing www_merchbay_com.crt + DigiCertCA.crt
- certFile: /srv/certs/merchbay.com.crt
keyFile: /srv/certs/merchbay.com.key
stores:
- default
stores:
default:
defaultCertificate:
certFile: /srv/certs/merchbay.com.crt
keyFile: /srv/certs/merchbay.com.key

54
yakpro-po.cnf Normal file
View File

@@ -0,0 +1,54 @@
<?php
// yakpro-po configuration for Laravel 5.0
$conf = new StdClass;
// Directories to obfuscate (relative to project root)
$conf->t_directories = [
'app'
];
// Directories/files to skip
$conf->t_skip = [
'vendor',
'storage',
'bootstrap',
'config',
'database',
'public',
'resources',
'tests',
'.env',
'.env.example',
'artisan',
'server.php'
];
// Obfuscation options
$conf->obfuscate_string_literal = false; // Don't obfuscate strings (can break Laravel)
$conf->obfuscate_function_name = true; // Obfuscate function names
$conf->obfuscate_class_name = true; // Obfuscate class names (except Laravel core)
$conf->obfuscate_variable_name = true; // Obfuscate variable names
$conf->obfuscate_property_name = true; // Obfuscate property names
$conf->obfuscate_class_constant_name = true;
$conf->obfuscate_constant_name = true;
$conf->obfuscate_namespace_name = false; // Keep namespaces readable
$conf->obfuscate_label_name = true;
// Keep Laravel framework methods/classes readable
$conf->t_ignore_constants = ['APP_ENV', 'APP_DEBUG', 'APP_URL', 'APP_KEY'];
$conf->t_ignore_methods = [
'__construct', '__destruct', '__call', '__get', '__set',
'boot', 'register', 'handle', 'middleware', 'authorize'
];
// Scrambler mode
$conf->scrambler = true;
// Allow multiple PHP versions
$conf->allow_and_operator = true;
// Output directory (will be overridden in command)
$conf->t_dir = null;
return $conf;