diff --git a/.htaccess b/.htaccess index 895b6d0..56a5195 100644 --- a/.htaccess +++ b/.htaccess @@ -2,14 +2,13 @@ Options -MultiViews - RewriteEngine On - # Redirect Trailing Slashes... RewriteRule ^(.*)/$public /$1 [L,R=301] - + RewriteCond %{SERVER_PORT} 80 + RewriteRule ^(.*)$ https://www.crewsportswear.com/beta/$1 [R,L] # Handle Front Controller... RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ index.php [L] + RewriteRule ^ index.php [L] diff --git a/app/Http/Controllers/paypal/PaypalController.php b/app/Http/Controllers/paypal/PaypalController.php index 8e6fb61..90d9d09 100644 --- a/app/Http/Controllers/paypal/PaypalController.php +++ b/app/Http/Controllers/paypal/PaypalController.php @@ -27,24 +27,24 @@ class PaypalController extends Controller { config('services.paypal.secret')); - $this->_apiContext->setConfig(array( + /* $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', - // 'http.ConnectionTimeOut' => 30, - // 'log.LogEnabled' => true, - // 'log.FileName' => storage_path('logs/paypal.log'), - // 'log.LogLevel' => 'FINE' - // )); + $this->_apiContext->setConfig(array( + 'mode' => 'live', + 'service.EndPoint' => 'https://api.paypal.com', + 'http.ConnectionTimeOut' => 30, + 'log.LogEnabled' => true, + 'log.FileName' => storage_path('logs/paypal.log'), + 'log.LogLevel' => 'FINE' + )); } diff --git a/composer.lock b/composer.lock index 3d5a15d..b566455 100644 --- a/composer.lock +++ b/composer.lock @@ -909,33 +909,28 @@ }, { "name": "league/flysystem-sftp", - "version": "1.0.14", + "version": "1.0.22", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-sftp.git", - "reference": "f28d742a3e81258417293fd9a179a350154ab8f7" + "reference": "cab59dd2277e02fe46f5f23195672a02ed49774d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/f28d742a3e81258417293fd9a179a350154ab8f7", - "reference": "f28d742a3e81258417293fd9a179a350154ab8f7", + "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/cab59dd2277e02fe46f5f23195672a02ed49774d", + "reference": "cab59dd2277e02fe46f5f23195672a02ed49774d", "shasum": "" }, "require": { "league/flysystem": "~1.0", - "php": ">=5.4.0", + "php": ">=5.6.0", "phpseclib/phpseclib": "~2.0" }, "require-dev": { "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^5.7.25" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "League\\Flysystem\\Sftp\\": "src/" @@ -952,7 +947,7 @@ } ], "description": "Flysystem adapter for SFTP", - "time": "2017-07-11T12:29:45+00:00" + "time": "2019-10-16T20:05:49+00:00" }, { "name": "monolog/monolog", @@ -2786,22 +2781,22 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.2.2", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157" + "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/4aada1f93c72c35e22fb1383b47fee43b8f1d157", - "reference": "4aada1f93c72c35e22fb1383b47fee43b8f1d157", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", + "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.3.0", + "php": "^5.6 || ^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "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.", - "time": "2017-08-08T06:39:58+00:00" + "time": "2017-11-10T14:09:06+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.3.0", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fb3933512008d8162b3cdf9e18dba9309b7c3773", - "reference": "fb3933512008d8162b3cdf9e18dba9309b7c3773", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { @@ -2874,7 +2869,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-06-03T08:32:36+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/php-diff", diff --git a/config/filesystems.php b/config/filesystems.php index 5068fd8..a5443cb 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -84,7 +84,7 @@ return [ 'uploads' => [ 'driver' => 'local', - 'root' => 'C:\\wamp\\www\\uploads\\images\\', + 'root' => '/var/www/html/uploads/images', ], ], diff --git a/config/services.php b/config/services.php index a3c23a4..eb474bc 100644 --- a/config/services.php +++ b/config/services.php @@ -35,15 +35,15 @@ return [ ], // sandbox - 'paypal' => [ + /* 'paypal' => [ 'client_id' => 'AQuz-HKzQiL7FygkG8skSekaWf-RP6Rgj4f1XeX1Ghp86bUFj7tQXVT1xbpluu5_WCGRbQpOVGtlJKVB', 'secret' => 'EJAMKxQsl-mFkL_4J_90cvTamYfcsgswqgIxz9wQPiRAwJ6sy_wNsttMlmrXIpxI96JpYzdMXkLCHAPz' - ], + ], */ // live - // 'paypal' => [ - // 'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq', - // 'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_' - // ], + 'paypal' => [ + 'client_id' => 'AUqBUFW5lfyYmrlBtFZA3RNw45sttM3ltbvS_d4qCVBMrkcMG9rEeivGvtNFSy8XTiEp50YyQ6khKxbq', + 'secret' => 'ELlnuiupoFKwGUSc2g5j-sD1EmsvKpdhth1gFV7njpfvyNtKsK8WwIKUMOS0ehJcRatV865eMhfgsnd_' + ], ]; diff --git a/config/site_config.php b/config/site_config.php index 6fa0393..aa140d9 100644 --- a/config/site_config.php +++ b/config/site_config.php @@ -16,7 +16,8 @@ return [ // 'company_name' => env('COMPANY_NAME','Acme Inc'), // 'company_email' => env('COMPANY_email','contact@acme.inc'), - 'prod_private_server_ip' => env('http://localhost', 'http://localhost'), - 'uploads' => env('http://localhost/uploads/images/', 'http://localhost/uploads/images/'), // local + 'prod_private_server_ip' => env('https://crewsportswear.app', 'https://crewsportswear.app'), + 'uploads' => env('https://crewsportswear.com/uploads/images/', 'https://crewsportswear.com/uploads/images/'), // local + ]; \ No newline at end of file diff --git a/resources/views/sublayouts/cart.blade.php b/resources/views/sublayouts/cart.blade.php index 770f7be..7e4c23b 100644 --- a/resources/views/sublayouts/cart.blade.php +++ b/resources/views/sublayouts/cart.blade.php @@ -88,7 +88,7 @@
-

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

+

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

@foreach($item_group as $item) @if($item->VoucherId == null)