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

Merge pull request #76 from bagisto/prashant 

Prashant
This commit is contained in:
JItendra Singh 2018-10-25 15:34:58 +05:30 committed by GitHub
parent 710b3cb95d dc939d4ff2
commit 5bd2b66f9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 426 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
View File

@ -80,10 +80,6 @@ class CategoryDataGrid
'type' => 'number',
'label' => 'Category ID',
'sortable' => true,
'filter' => [
'function' => 'where',
'condition' => ['cta.locale', app()->getLocale()]
],
], [
'name' => 'ct.name',
'alias' => 'cat_name',
@ -114,6 +110,16 @@ class CategoryDataGrid
else
return "True";
},
], [
'name' => 'cta.locale',
'alias' => 'cat_locale',
'type' => 'string',
'label' => 'Locale',
'sortable' => true,
'filter' => [
'function' => 'where',
'condition' => ['cta.locale', app()->getLocale()]
],
]
],

29
packages/Webkul/Checkout/src/Cart.php
View File

@ -123,6 +123,17 @@ class Cart {
$child = $childData = null;
if($product->type == 'configurable') {
$child = $this->product->findOneByField('id', $data['selected_configurable_option']);
$productAddtionalData = $this->getProductAttributeOptionDetails($child);
unset($productAddtionalData['html']);
$additional = [
'request' => $data,
'variant_id' => $data['selected_configurable_option'],
'attributes' => $productAddtionalData
];
$childData = [
'product_id' => $data['selected_configurable_option'],
'sku' => $child->sku,
@ -145,7 +156,8 @@ class Cart {
'base_total' => $price * $data['quantity'],
'weight' => $weight = ($product->type == 'configurable' ? $child->weight : $product->weight),
'total_weight' => $weight * $data['quantity'],
'base_total_weight' => $weight * $data['quantity']
'base_total_weight' => $weight * $data['quantity'],
'additional' => json_encode($additional)
];
return ['parent' => $parentData, 'child' => $childData];
@ -655,7 +667,7 @@ class Cart {
}
/**
* Returns cart
* Returns the items details of the configurable and simple products
*
* @return Mixed
*/
@ -1127,6 +1139,16 @@ class Cart {
$price = ($product->type == 'configurable' ? $child->price : $product->price);
$productAddtionalData = $this->getProductAttributeOptionDetails($child);
unset($productAddtionalData['html']);
$additional = [
'request' => $data,
'variant_id' => $data['selected_configurable_option'],
'attributes' => $productAddtionalData
];
$parentData = [
'sku' => $product->sku,
'product_id' => $productId,
@ -1139,7 +1161,8 @@ class Cart {
'base_total' => $price,
'weight' => $weight = ($product->type == 'configurable' ? $child->weight : $product->weight),
'total_weight' => $weight,
'base_total_weight' => $weight
'base_total_weight' => $weight,
'additional' => json_encode($additonal)
];
return ['parent' => $parentData, 'child' => $childData];

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

@ -1,8 +1,255 @@
@import "variables";
@import "icons";
@import "mixins";
@import "components";
@import "override";
//override UA
body {
margin: 0;
padding: 0;
font-weight: 500;
max-width: 100%;
width: auto;
color: $font-color;
font-size: 16px;
}
* {
font-family: "Montserrat", sans-serif;
}
*::-webkit-input-placeholder {
font-family: "Montserrat", sans-serif;
}
*::-webkit-input-placeholder {
font-family: "Montserrat", sans-serif;
}
.btn.btn-primary{
border-radius: 0px;
}
//margin bottom classes
.mb-10 {
margin-bottom: 10px;
}
.mb-15 {
margin-bottom: 15px;
}
.mb-20 {
margin-bottom: 20px;
}
.mb-25 {
margin-bottom: 25px;
}
.mb-30 {
margin-bottom: 30px;
}
.mb-35 {
margin-bottom: 35px;
}
.mb-40 {
margin-bottom: 40px;
}
.mb-45 {
margin-bottom: 45px;
}
.mb-50 {
margin-bottom: 50px;
}
.mb-60 {
margin-bottom: 60px;
}
.mb-70 {
margin-bottom: 70px;
}
.mb-80 {
margin-bottom: 80px;
}
.mb-90 {
margin-bottom: 90px;
}
//margin-top
.mt-5 {
margin-top: 5px;
}
.mt-10 {
margin-top: 10px;
}
.mt-15 {
margin-top: 15px;
}
.mt-20 {
margin-top: 20px;
}
.mt-25 {
margin-top: 25px;
}
.mt-30 {
margin-top: 30px;
}
.mt-35 {
margin-top: 35px;
}
.mt-40 {
margin-top: 40px;
}
.mt-45 {
margin-top: 45px;
}
.mt-50 {
margin-top: 50px;
}
.mt-60 {
margin-top: 60px;
}
.mt-70 {
margin-top: 70px;
}
.mt-80 {
margin-top: 80px;
}
.mt-90 {
margin-top: 90px;
}
//components
//wishlist icon hover properties
.add-to-wishlist {
.wishlist-icon {
&:hover {
background-image: url('../images/wishadd.svg');
}
}
}
//product page price styles
.product-price {
margin-bottom: 14px;
width: 100%;
font-weight: 600;
.price-label {
font-size: 14px;
font-weight: 400;
}
.regular-price {
color: #A5A5A5;
text-decoration: line-through;
margin-right: 10px;
}
.special-price {
color: #FF6472;
}
}
//horizontal rule
.horizontal-rule {
width: 100%;
height: 1px;
background: $border-color;
}
//Customer account section header
.account-head {
.account-heading {
font-size: 28px;
color: $font-color;
text-transform: capitalize;
text-align: left;
}
.account-action {
font-size: 17px;
margin-top: 1%;
color: $brand-color;
float: right;
}
.horizontal-rule {
margin-top: 1.1%;
width: 100%;
height: 1px;
vertical-align: middle;
background: $border-color;
}
}
//denotes the item card that are used in account pages
.account-item-card {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
width: 100%;
height: 125px;
.media-info {
display: flex;
flex-direction: row;
.media {
height: 125px;
width: 125px;
}
.info {
display: block;
margin-left: 20px;
}
}
.operations {
height: 120px;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
a {
width: 100%;
span {
float: right;
}
}
}
}
//Account items list
.account-items-list {
display: block;
width: 100%;
}
//main store front layouting
.main-container-wrapper {
@ -101,6 +348,7 @@
.addtocart {
margin-right: 10px;
text-transform: uppercase;
text-align: left;
}
.add-to-wishlist {

110
packages/Webkul/Shop/src/Resources/assets/sass/components.scss vendored
View File

@ -1,110 +0,0 @@
//wishlist icon hover properties
.add-to-wishlist {
.wishlist-icon {
&:hover {
background-image: url('../images/wishadd.svg');
}
}
}
//product page price styles
.product-price {
margin-bottom: 14px;
width: 100%;
font-weight: 600;
.price-label {
font-size: 14px;
font-weight: 400;
}
.regular-price {
color: #A5A5A5;
text-decoration: line-through;
margin-right: 10px;
}
.special-price {
color: #FF6472;
}
}
//horizontal rule
.horizontal-rule {
width: 100%;
height: 1px;
background: $border-color;
}
//Customer account section header
.account-head {
.account-heading {
font-size: 28px;
color: $font-color;
text-transform: capitalize;
text-align: left;
}
.account-action {
font-size: 17px;
margin-top: 1%;
color: $brand-color;
float: right;
}
.horizontal-rule {
margin-top: 1.1%;
width: 100%;
height: 1px;
vertical-align: middle;
background: $border-color;
}
}
//denotes the item card that are used in account pages
.account-item-card {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
width: 100%;
height: 125px;
.media-info {
display: flex;
flex-direction: row;
.media {
height: 125px;
width: 125px;
}
.info {
display: block;
margin-left: 20px;
}
}
.operations {
height: 120px;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
a {
width: 100%;
span {
float: right;
}
}
}
}
//Account items list
.account-items-list {
display: block;
width: 100%;
}

128
packages/Webkul/Shop/src/Resources/assets/sass/override.scss vendored
View File

@ -1,128 +0,0 @@
body {
margin: 0;
padding: 0;
font-weight: 500;
max-width: 100%;
width: auto;
color: $font-color;
font-size: 16px;
}
* {
font-family: "Montserrat", sans-serif;
}
.btn.btn-primary{
border-radius: 0px;
}
//margin bottom classes
.mb-10 {
margin-bottom: 10px;
}
.mb-15 {
margin-bottom: 15px;
}
.mb-20 {
margin-bottom: 20px;
}
.mb-25 {
margin-bottom: 25px;
}
.mb-30 {
margin-bottom: 30px;
}
.mb-35 {
margin-bottom: 35px;
}
.mb-40 {
margin-bottom: 40px;
}
.mb-45 {
margin-bottom: 45px;
}
.mb-50 {
margin-bottom: 50px;
}
.mb-60 {
margin-bottom: 60px;
}
.mb-70 {
margin-bottom: 70px;
}
.mb-80 {
margin-bottom: 80px;
}
.mb-90 {
margin-bottom: 90px;
}
//margin-top
.mt-5 {
margin-top: 5px;
}
.mt-10 {
margin-top: 10px;
}
.mt-15 {
margin-top: 15px;
}
.mt-20 {
margin-top: 20px;
}
.mt-25 {
margin-top: 25px;
}
.mt-30 {
margin-top: 30px;
}
.mt-35 {
margin-top: 35px;
}
.mt-40 {
margin-top: 40px;
}
.mt-45 {
margin-top: 45px;
}
.mt-50 {
margin-top: 50px;
}
.mt-60 {
margin-top: 60px;
}
.mt-70 {
margin-top: 70px;
}
.mt-80 {
margin-top: 80px;
}
.mt-90 {
margin-top: 90px;
}

2
packages/Webkul/Ui/src/DataGrid/DataGrid.php
View File

@ -774,7 +774,7 @@ class DataGrid
$this->results = $this->query->get();
$this->results = $this->query->paginate($this->perpage)->appends(request()->except('page'));
$this->results = $this->query->distinct()->paginate($this->perpage)->appends(request()->except('page'));
return $this->results;

261
public/themes/default/assets/css/shop.css vendored
View File

@ -133,6 +133,140 @@
height: 32px;
}
body {
margin: 0;
padding: 0;
font-weight: 500;
max-width: 100%;
width: auto;
color: #242424;
font-size: 16px;
}
* {
font-family: "Montserrat", sans-serif;
}
*::-webkit-input-placeholder {
font-family: "Montserrat", sans-serif;
}
*::-webkit-input-placeholder {
font-family: "Montserrat", sans-serif;
}
.btn.btn-primary {
border-radius: 0px;
}
.mb-10 {
margin-bottom: 10px;
}
.mb-15 {
margin-bottom: 15px;
}
.mb-20 {
margin-bottom: 20px;
}
.mb-25 {
margin-bottom: 25px;
}
.mb-30 {
margin-bottom: 30px;
}
.mb-35 {
margin-bottom: 35px;
}
.mb-40 {
margin-bottom: 40px;
}
.mb-45 {
margin-bottom: 45px;
}
.mb-50 {
margin-bottom: 50px;
}
.mb-60 {
margin-bottom: 60px;
}
.mb-70 {
margin-bottom: 70px;
}
.mb-80 {
margin-bottom: 80px;
}
.mb-90 {
margin-bottom: 90px;
}
.mt-5 {
margin-top: 5px;
}
.mt-10 {
margin-top: 10px;
}
.mt-15 {
margin-top: 15px;
}
.mt-20 {
margin-top: 20px;
}
.mt-25 {
margin-top: 25px;
}
.mt-30 {
margin-top: 30px;
}
.mt-35 {
margin-top: 35px;
}
.mt-40 {
margin-top: 40px;
}
.mt-45 {
margin-top: 45px;
}
.mt-50 {
margin-top: 50px;
}
.mt-60 {
margin-top: 60px;
}
.mt-70 {
margin-top: 70px;
}
.mt-80 {
margin-top: 80px;
}
.mt-90 {
margin-top: 90px;
}
.add-to-wishlist .wishlist-icon:hover {
background-image: url("../images/wishadd.svg");
}
@ -254,132 +388,6 @@
width: 100%;
}
body {
margin: 0;
padding: 0;
font-weight: 500;
max-width: 100%;
width: auto;
color: #242424;
font-size: 16px;
}
* {
font-family: "Montserrat", sans-serif;
}
.btn.btn-primary {
border-radius: 0px;
}
.mb-10 {
margin-bottom: 10px;
}
.mb-15 {
margin-bottom: 15px;
}
.mb-20 {
margin-bottom: 20px;
}
.mb-25 {
margin-bottom: 25px;
}
.mb-30 {
margin-bottom: 30px;
}
.mb-35 {
margin-bottom: 35px;
}
.mb-40 {
margin-bottom: 40px;
}
.mb-45 {
margin-bottom: 45px;
}
.mb-50 {
margin-bottom: 50px;
}
.mb-60 {
margin-bottom: 60px;
}
.mb-70 {
margin-bottom: 70px;
}
.mb-80 {
margin-bottom: 80px;
}
.mb-90 {
margin-bottom: 90px;
}
.mt-5 {
margin-top: 5px;
}
.mt-10 {
margin-top: 10px;
}
.mt-15 {
margin-top: 15px;
}
.mt-20 {
margin-top: 20px;
}
.mt-25 {
margin-top: 25px;
}
.mt-30 {
margin-top: 30px;
}
.mt-35 {
margin-top: 35px;
}
.mt-40 {
margin-top: 40px;
}
.mt-45 {
margin-top: 45px;
}
.mt-50 {
margin-top: 50px;
}
.mt-60 {
margin-top: 60px;
}
.mt-70 {
margin-top: 70px;
}
.mt-80 {
margin-top: 80px;
}
.mt-90 {
margin-top: 90px;
}
.main-container-wrapper {
max-width: 1300px;
width: auto;
@ -484,6 +492,7 @@ body {
.main-container-wrapper .product-card .cart-wish-wrap .addtocart {
margin-right: 10px;
text-transform: uppercase;
text-align: left;
}
.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist {

4
public/themes/default/assets/js/shop.js vendored
View File

File diff suppressed because one or more lines are too long