diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index e870e43..e382529 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -28,30 +28,43 @@ class PaypalController extends Controller public function __construct() { + $paypal_env = "live"; + $paypal_apiUrl = 'https://api.paypal.com'; // default + + if($paypal_env == 'live'){ + + $paypal_apiUrl = 'https://api.paypal.com'; + }else{ + $paypal_apiUrl = 'https://api.sandbox.paypal.com'; + } + $this->_apiContext = PayPal::ApiContext( - config('services.paypal.client_id'), - config('services.paypal.secret') + config('services.paypal_'.$paypal_env.'.client_id'), + config('services.paypal_'.$paypal_env.'.secret') + + // config('services.paypal_live.client_id'), + // config('services.paypal_live.secret') ); - // $this->_apiContext->setConfig(array( - // 'mode' => 'sandbox', - // 'service.EndPoint' => 'https://api.sandbox.paypal.com', - // 'http.ConnectionTimeOut' => 30, - // 'log.LogEnabled' => true, - // 'log.FileName' => storage_path('logs/paypal.log'), - // 'log.LogLevel' => 'FINE' - // )); - - // live - $this->_apiContext->setConfig(array( - 'mode' => 'live', - 'service.EndPoint' => 'https://api.paypal.com', + $this->_apiContext->setConfig(array( + 'mode' => $paypal_env, + 'service.EndPoint' => $paypal_apiUrl, 'http.ConnectionTimeOut' => 30, 'log.LogEnabled' => true, 'log.FileName' => storage_path('logs/paypal.log'), 'log.LogLevel' => 'FINE' - )); + )); + + // live + // $this->_apiContext->setConfig(array( + // 'mode' => 'sandbox', + // 'service.EndPoint' => 'https://api.paypal.com', + // 'http.ConnectionTimeOut' => 30, + // 'log.LogEnabled' => true, + // 'log.FileName' => storage_path('logs/paypal.log'), + // 'log.LogLevel' => 'FINE' + // )); } @@ -385,8 +398,8 @@ class PaypalController extends Controller ); Mail::send('emails.orders', $data, function ($message) use ($data) { - $message->from('no-reply@crewsportswear.com', 'CREW Sportswear'); - $message->bcc($data['email_cc'], 'Orders From CREW Sportswear'); + $message->from('no-reply@crewsportswear.com', 'Merchbay'); + $message->bcc($data['email_cc'], 'Orders From Merchbay'); $message->to($data['receiver'])->subject($data['subject']); }); // end email sending diff --git a/app/Http/Controllers/teamstore/TeamStoreController.php b/app/Http/Controllers/teamstore/TeamStoreController.php index 3299b46..a316c1b 100644 --- a/app/Http/Controllers/teamstore/TeamStoreController.php +++ b/app/Http/Controllers/teamstore/TeamStoreController.php @@ -621,7 +621,7 @@ class TeamStoreController extends Controller $finalSubTotal = $getSubtotal[0]->Subtotal; } - return view('sublayouts.cart') + return view('merchbay.cart') ->with('item_group', $items_group) ->with('row', $items) ->with('img_thumb', $item_thumbs) @@ -725,8 +725,6 @@ class TeamStoreController extends Controller $offData = $getVoucher[0]->VoucherValue . ' ' . $store_array[0]->StoreCurrency; } - - $message = '
+

Error:

+ {!! Session::get('cartkeyError') !!} +
+ @endif + + + + @if(count($row) > 0) +
+
+
+
{{ $store_array[0]->StoreName }}
+
+ @foreach($item_group as $item) + @if($item->VoucherId == null) +
+
+
+
+ @foreach($img_thumb as $img) + @if($img->ProductId == $item->ProductId) + + @endif + @endforeach +
+
+
+

+ {{ $item->ProductName }} +

+

Total Price: {{ $item->total_price . ' ' . $store_array[0]->StoreCurrency }} • Row(s): {{ $item->qty }}

+
+ + + @if($item->FormUsed=="jersey-and-shorts-form") + + + + + + + + + + @elseif($item->FormUsed=="tshirt-form") + + + + + + + + @elseif($item->FormUsed=="quantity-form") + + + + + + + + @elseif($item->FormUsed=="name-number-form") + + + + + + + + + @elseif($item->FormUsed=="name-number-size-form") + + + + + + + + + + @elseif($item->FormUsed=="number-form") + + + + + + + @elseif($item->FormUsed=="name-name2-size-form") + + + + + + + + + @elseif($item->FormUsed=="name-size-form") + + + + + + + + @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") + + + + + + + + @elseif($item->FormUsed=="number-jersey-shorts-form") + + + + + + + + + @else + + @endif + + @foreach($row as $sub_item) + @if($sub_item->ProductId == $item->ProductId) + + @if($item->FormUsed=="jersey-and-shorts-form") + + + + + + + + + + @elseif($item->FormUsed=="tshirt-form") + + + + + + + @elseif($item->FormUsed=="quantity-form") + + + + + + @elseif($item->FormUsed=="name-number-form") + + + + + + + + @elseif($item->FormUsed=="name-number-size-form") + + + + + + + + + @elseif($item->FormUsed=="number-form") + + + + + + + @elseif($item->FormUsed=="name-name2-size-form") + + + + + + + + + @elseif($item->FormUsed=="name-size-form") + + + + + + + + @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") + + + + + + + + @elseif($item->FormUsed=="number-jersey-shorts-form") + + + + + + + + + @else + + @endif + + @endif + @endforeach +
NameNumberJersey SizeShorts SizePriceQuantity
SizePriceQuantity
PriceQuantity
NameNumberPriceQuantity
NameNumberSizePriceQuantity
NumberPriceQuantity
Gamer TagNameSizePriceQuantity
NameSizePriceQuantity
Jersey SizeShorts SizePriceQuantity
NumberJersey SizeShorts SizePriceQuantity
@if($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif {{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Name2 }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Name }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->JerseySize}}{{ $sub_item->ShortsSize}}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
{{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
+
+
+
+
+ @endif + @endforeach +
+ +
+
+ @if(Session::has('msg')) +
+ +

Warning:

+ {!! Session::get('msg') !!} +
+ @endif +

Order Summary

+
+ +
+

Subtotal: {{ round($getSubtotal, 2) }} {{ $store_array[0]->StoreCurrency }}

+
+
+ @foreach($row as $item) + @if($item->VoucherId != null) +
+ @if($item->VoucherType == "Percentage") + + @else + + @endif + + +
+ @endif + @endforeach + +
+
+
+ + + + +
+ +
+
+
+ +
+
+ +
+
+ Continue Shopping +
+ +
+ +
+ @else +
+
+

Your cart is currently empty.

+
+
+ @endif + + + + + + +@endsection diff --git a/resources/views/merchbay/navbar.blade.php b/resources/views/merchbay/navbar.blade.php index 5294180..4c5f260 100644 --- a/resources/views/merchbay/navbar.blade.php +++ b/resources/views/merchbay/navbar.blade.php @@ -80,7 +80,7 @@ @endif
  • - + {{ \App\Http\Controllers\MainController::getCountCart() }} {{-- --}} diff --git a/resources/views/merchbay_main.blade.php b/resources/views/merchbay_main.blade.php index a557c8b..2cf7546 100644 --- a/resources/views/merchbay_main.blade.php +++ b/resources/views/merchbay_main.blade.php @@ -4,7 +4,7 @@ - + diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php deleted file mode 100644 index 845050e..0000000 --- a/resources/views/sublayouts/cart.blade.php +++ /dev/null @@ -1,319 +0,0 @@ -@extends('layout.main') -@section('content') - - - -
    -
    -
      - @if(isset($store_array[0]->StoreUrl)) -
    1. {{ $store_array[0]->StoreName }}
      2. - @else -
    2. Home
      3. - @endif -
    3. My Cart
      4. -
    -
    -
    - -
    -
    -

    MY CART

    - @if(Session::has('cartkeyError')) -
    - -

    Error:

    - {!! Session::get('cartkeyError') !!} -
    - @endif -
    -
    -
    - -@if(count($row) > 0) - -
    -
    -
    - @if(Session::has('msg')) -
    - -

    Warning:

    - {!! Session::get('msg') !!} -
    - @endif -

    Order Summary

    -
    - -
    -

    Subtotal: {{ round($getSubtotal, 2) }} {{ $store_array[0]->StoreCurrency }}

    -
    -
    - @foreach($row as $item) - @if($item->VoucherId != null) -
    - @if($item->VoucherType == "Percentage") - - @else - - @endif - - -
    - @endif - @endforeach - -
    -
    -
    - - - - -
    - -
    -
    -
    - -
    -
    - Continue Shopping -
    -
    -
    -
    -

    {{ $store_array[0]->StoreName }}

    -
    - @foreach($item_group as $item) - @if($item->VoucherId == null) -
    -
    -
    -
    - @foreach($img_thumb as $img) - @if($img->ProductId == $item->ProductId) - - @endif - @endforeach -
    -
    -
    -

    - {{ $item->ProductName }} -

    -

    Total Price: {{ $item->total_price . ' ' . $store_array[0]->StoreCurrency }} • Row(s): {{ $item->qty }}

    -
    - - - @if($item->FormUsed=="jersey-and-shorts-form") - - - - - - - - - - @elseif($item->FormUsed=="tshirt-form") - - - - - - - - @elseif($item->FormUsed=="quantity-form") - - - - - - - - @elseif($item->FormUsed=="name-number-form") - - - - - - - - - @elseif($item->FormUsed=="name-number-size-form") - - - - - - - - - - @elseif($item->FormUsed=="number-form") - - - - - - - @elseif($item->FormUsed=="name-name2-size-form") - - - - - - - - - @elseif($item->FormUsed=="name-size-form") - - - - - - - - @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") - - - - - - - - @elseif($item->FormUsed=="number-jersey-shorts-form") - - - - - - - - - @else - - @endif - - @foreach($row as $sub_item) - @if($sub_item->ProductId == $item->ProductId) - - @if($item->FormUsed=="jersey-and-shorts-form") - - - - - - - - - - @elseif($item->FormUsed=="tshirt-form") - - - - - - - @elseif($item->FormUsed=="quantity-form") - - - - - - @elseif($item->FormUsed=="name-number-form") - - - - - - - - @elseif($item->FormUsed=="name-number-size-form") - - - - - - - - - @elseif($item->FormUsed=="number-form") - - - - - - - @elseif($item->FormUsed=="name-name2-size-form") - - - - - - - - - @elseif($item->FormUsed=="name-size-form") - - - - - - - - @elseif($item->FormUsed=="jersey-and-shorts-quantity-form") - - - - - - - - @elseif($item->FormUsed=="number-jersey-shorts-form") - - - - - - - - - @else - - @endif - - @endif - @endforeach -
    NameNumberJersey SizeShorts SizePriceQuantity
    SizePriceQuantity
    PriceQuantity
    NameNumberPriceQuantity
    NameNumberSizePriceQuantity
    NumberPriceQuantity
    Gamer TagNameSizePriceQuantity
    NameSizePriceQuantity
    Jersey SizeShorts SizePriceQuantity
    NumberJersey SizeShorts SizePriceQuantity
    @if($sub_item->Name != '') {{ $sub_item->Name }} @else -- @endif {{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Name }}{{ $sub_item->Number }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Number }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Name }}{{ $sub_item->Name2 }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Name }}{{ $sub_item->Size }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->JerseySize}}{{ $sub_item->ShortsSize}}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    {{ $sub_item->Number }}{{ $sub_item->JerseySize }}{{ $sub_item->ShortsSize }}{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}{{ $sub_item->Quantity }}
    -
    -
    -
    -
    - @endif - @endforeach -
    - -
    -@else -
    -
    -

    Your cart is currently empty.

    -
    -
    - -@endif -@endsection