webmaster/crewsportswear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed broken link on cart page.

Browse Source
This commit is contained in:
franknstayn
2019-11-06 07:26:02 -06:00
parent a9145ea484
commit 3698312664
7 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.htaccess
View File

@@ -2,14 +2,13 @@
<IfModule mod_negotiation.c> <IfModule mod_negotiation.c>
Options -MultiViews Options -MultiViews
</IfModule> </IfModule>
RewriteEngine On RewriteEngine On
# Redirect Trailing Slashes... # Redirect Trailing Slashes...
RewriteRule ^(.*)/$public /$1 [L,R=301] RewriteRule ^(.*)/$public /$1 [L,R=301]
RewriteCond %{SERVER_PORT} 80
RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L]
# Handle Front Controller... # Handle Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L] RewriteRule ^ index.php [L]
</IfModule> </IfModule>

20
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -27,24 +27,24 @@ class PaypalController extends Controller {
config('services.paypal.secret')); config('services.paypal.secret'));
$this->_apiContext->setConfig(array( /* $this->_apiContext->setConfig(array(
'mode' => 'sandbox', 'mode' => 'sandbox',
'service.EndPoint' => 'https://api.sandbox.paypal.com', 'service.EndPoint' => 'https://api.sandbox.paypal.com',
'http.ConnectionTimeOut' => 30, 'http.ConnectionTimeOut' => 30,
'log.LogEnabled' => true, 'log.LogEnabled' => true,
'log.FileName' => storage_path('logs/paypal.log'), 'log.FileName' => storage_path('logs/paypal.log'),
'log.LogLevel' => 'FINE' 'log.LogLevel' => 'FINE'
)); )); */
// live // live
// $this->_apiContext->setConfig(array( $this->_apiContext->setConfig(array(
// 'mode' => 'live', 'mode' => 'live',
// 'service.EndPoint' => 'https://api.paypal.com', 'service.EndPoint' => 'https://api.paypal.com',
// 'http.ConnectionTimeOut' => 30, 'http.ConnectionTimeOut' => 30,
// 'log.LogEnabled' => true, 'log.LogEnabled' => true,
// 'log.FileName' => storage_path('logs/paypal.log'), 'log.FileName' => storage_path('logs/paypal.log'),
// 'log.LogLevel' => 'FINE' 'log.LogLevel' => 'FINE'
// )); ));
} }

45
composer.lock generated
View File

@@ -909,33 +909,28 @@
}, },
{ {
"name": "league/flysystem-sftp", "name": "league/flysystem-sftp",
"version": "1.0.14", "version": "1.0.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem-sftp.git", "url": "https://github.com/thephpleague/flysystem-sftp.git",
"reference": "f28d742a3e81258417293fd9a179a350154ab8f7" "reference": "cab59dd2277e02fe46f5f23195672a02ed49774d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/f28d742a3e81258417293fd9a179a350154ab8f7", "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/cab59dd2277e02fe46f5f23195672a02ed49774d",
"reference": "f28d742a3e81258417293fd9a179a350154ab8f7", "reference": "cab59dd2277e02fe46f5f23195672a02ed49774d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"league/flysystem": "~1.0", "league/flysystem": "~1.0",
"php": ">=5.4.0", "php": ">=5.6.0",
"phpseclib/phpseclib": "~2.0" "phpseclib/phpseclib": "~2.0"
}, },
"require-dev": { "require-dev": {
"mockery/mockery": "0.9.*", "mockery/mockery": "0.9.*",
"phpunit/phpunit": "~4.0" "phpunit/phpunit": "^5.7.25"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"League\\Flysystem\\Sftp\\": "src/" "League\\Flysystem\\Sftp\\": "src/"
@@ -952,7 +947,7 @@
} }
], ],
"description": "Flysystem adapter for SFTP", "description": "Flysystem adapter for SFTP",
"time": "2017-07-11T12:29:45+00:00" "time": "2019-10-16T20:05:49+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
@@ -2786,22 +2781,22 @@
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
"version": "3.2.2", "version": "3.3.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
"reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5", "php": "^5.6 || ^7.0",
"phpdocumentor/reflection-common": "^1.0@dev", "phpdocumentor/reflection-common": "^1.0.0",
"phpdocumentor/type-resolver": "^0.3.0", "phpdocumentor/type-resolver": "^0.4.0",
"webmozart/assert": "^1.0" "webmozart/assert": "^1.0"
}, },
"require-dev": { "require-dev": {
@@ -2827,20 +2822,20 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
"time": "2017-08-08T06:39:58+00:00" "time": "2017-11-10T14:09:06+00:00"
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
"version": "0.3.0", "version": "0.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git", "url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
"reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2874,7 +2869,7 @@
"email": "me@mikevanriel.com" "email": "me@mikevanriel.com"
} }
], ],
"time": "2017-06-03T08:32:36+00:00" "time": "2017-07-14T14:27:02+00:00"
}, },
{ {
"name": "phpspec/php-diff", "name": "phpspec/php-diff",

2
config/filesystems.php
View File

@@ -84,7 +84,7 @@ return [
'uploads' => [ 'uploads' => [
'driver' => 'local', 'driver' => 'local',
'root' => 'C:\\wamp\\www\\uploads\\images\\', 'root' => '/var/www/html/uploads/images',
], ],
], ],

12
config/services.php
View File

@@ -35,15 +35,15 @@ return [
], ],
// sandbox // sandbox
'paypal' => [ /* 'paypal' => [
'client_id' => 'AQuz-HKzQiL7FygkG8skSekaWf-RP6Rgj4f1XeX1Ghp86bUFj7tQXVT1xbpluu5_WCGRbQpOVGtlJKVB', 'client_id' => 'AQuz-HKzQiL7FygkG8skSekaWf-RP6Rgj4f1XeX1Ghp86bUFj7tQXVT1xbpluu5_WCGRbQpOVGtlJKVB',
'secret' => 'EJAMKxQsl-mFkL_4J_90cvTamYfcsgswqgIxz9wQPiRAwJ6sy_wNsttMlmrXIpxI96JpYzdMXkLCHAPz' 'secret' => 'EJAMKxQsl-mFkL_4J_90cvTamYfcsgswqgIxz9wQPiRAwJ6sy_wNsttMlmrXIpxI96JpYzdMXkLCHAPz'
], ], */
// live // live
// 'paypal' => [ 'paypal' => [
// 'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq', 'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq',
// 'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_' 'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_'
// ], ],
]; ];

5
config/site_config.php
View File

@@ -16,7 +16,8 @@ return [
// 'company_name' => env('COMPANY_NAME','Acme Inc'), // 'company_name' => env('COMPANY_NAME','Acme Inc'),
// 'company_email' => env('COMPANY_email','contact@acme.inc'), // 'company_email' => env('COMPANY_email','contact@acme.inc'),
'prod_private_server_ip' => env('http://localhost', 'http://localhost'), 'prod_private_server_ip' => env('https://crewsportswear.app', 'https://crewsportswear.app'),
'uploads' => env('http://localhost/uploads/images/', 'http://localhost/uploads/images/'), // local 'uploads' => env('https://crewsportswear.com/uploads/images/', 'https://crewsportswear.com/uploads/images/'), // local
]; ];

2
resources/views/sublayouts/cart.blade.php
View File

@@ -88,7 +88,7 @@
</div> </div>
<div class="col-md-8 col-md-pull-4"> <div class="col-md-8 col-md-pull-4">
<div style="border: 1px solid #e2e2e2; padding: 10px;"> <div style="border: 1px solid #e2e2e2; padding: 10px;">
<h4><img height="30px" class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store_array[0]->StoreUrl . '/' . $store_array[0]->StoreLogo }}"> {{ $store_array[0]->StoreName }}</h4> <h4><img height="30px" class="store-logo" src="{{ config('site_config.uploads') . 'teamstore/'. $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}"> {{ $store_array[0]->StoreName }}</h4>
</div> </div>
@foreach($item_group as $item) @foreach($item_group as $item)
@if($item->VoucherId == null) @if($item->VoucherId == null)