merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1318 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-08-20 12:07:58 +05:30 committed by GitHub
parent e5b904741c 0ea994502d
commit fbf5da570e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Core/src/Http/Controllers/SliderController.php
View File

@ -9,8 +9,8 @@ use Webkul\Core\Repositories\SliderRepository as Slider;
/**
* Slider controller for managing the slider controls.
*
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class SliderController extends Controller
{

2
packages/Webkul/Discount/src/Helpers/Catalog/Sale.php
View File

@ -3,7 +3,7 @@
namespace Webkul\Discount\Helpers\Catalog;
use Webkul\Discount\Repositories\CatalogRepository as CatalogRule;
use Webkul\Discount\Helpers\Catalog\ConvertXToProductId;
use Carbon\Carbon;
/**
* Sale - Abstract class designed to initiate the application of Catalog Rules

4
packages/Webkul/Discount/src/Http/Controllers/CatalogRuleController.php
View File

@ -358,6 +358,10 @@ class CatalogRuleController extends Controller
public function applyRules()
{
$this->sale->apply();
session()->flash('success', 'Rules processing done');
return redirect()->route('admin.catalog-rule.index');
}
/**

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=ad1039174ce2c81c8805",
"/css/shop.css": "/css/shop.css?id=e60a80df9a36aa0e44dc"
"/css/shop.css": "/css/shop.css?id=0647d577bed15c4b141e"
}

5
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -22,7 +22,7 @@ body {
font-family: $font-montserrat;
}
*::-webkit-input-placeholder {
*::-moz-input-placeholder {
font-family: $font-montserrat;
}
@ -425,9 +425,8 @@ input {
-webkit-box-shadow: 0px 2px 16px 4px rgba(40, 44, 63, 0.07);
-moz-box-shadow: 0px 2px 16px 4px rgba(40, 44, 63, 0.07);
box-shadow: 0px 2px 16px 4px rgba(40, 44, 63, 0.07);
padding: 10px;
transition: .3s;
outline: 1px solid $outline-hvr;
// outline: 1px solid $outline-hvr;
}
@media only screen and (max-width: 580px) {