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

Resolved the issue #517 and removed the intented url from admin as admin don't require

This commit is contained in:
Prashant Singh 2019-02-14 17:54:46 +05:30
parent 3d917fa512
commit 718a5eaa20
15 changed files with 229 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -31,7 +31,6 @@
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phploc/phploc": "^5.0@dev",
"phpunit/phpunit": "^7.0"
},
"replace": {

1
packages/Webkul/Customer/src/Http/Controllers/SessionController.php
View File

@ -41,7 +41,6 @@ class SessionController extends Controller
if (auth()->guard('customer')->check()) {
return redirect()->route('customer.session.index');
} else {
session()->put('url.intended', url()->previous());
return view($this->_config['view']);
}
}

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=0076f480705e7ce1f8e0",
"/css/shop.css": "/css/shop.css?id=23e535f35bb6c1e6b9d2"
"/css/shop.css": "/css/shop.css?id=1c431c316ccb78d925aa"
}

4
packages/Webkul/Shop/src/Resources/assets/sass/_animations.scss vendored Normal file
View File

@ -0,0 +1,4 @@
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}

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

@ -1,6 +1,7 @@
@import "variables";
@import "icons";
@import "mixins";
@import "animations";
//override UA
body {
@ -214,6 +215,52 @@ input {
display: block;
}
//CSS for loader
.cp-spinner {
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
}
//Spinner style
.cp-round:before {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px #bababa;
border-right: solid 6px #bababa;
border-bottom: solid 6px #bababa;
border-left: solid 6px #bababa;
position: absolute;
top: 0;
left: 0;
}
.cp-round:after {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px $brand-color;
border-right: solid 6px transparent;
border-bottom: solid 6px transparent;
border-left: solid 6px transparent;
position: absolute;
top: 0;
left: 0;
animation: spin 1s ease-in-out infinite;
}
.pull-right {
float:right;
}
//wishlist icon hover properties
.add-to-wishlist {
.wishlist-icon {
@ -2508,8 +2555,8 @@ section.cart {
}
}
}
// checkout responsive end here
// checkout responsive
.attached-products-wrapper {
margin-bottom: 80px;
@ -2924,6 +2971,8 @@ section.review {
margin-top: 1.4%;
table {
width: 100%;
tbody {
tr {
height: 45px;

18
packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php
View File

@ -15,10 +15,10 @@
{{ $billingAddress->name }}</br>
{{ $billingAddress->address1 }}, {{ $billingAddress->address2 ? $billingAddress->address2 . ',' : '' }} {{ $billingAddress->state }}</br>
{{ country()->name($billingAddress->country) }} {{ $billingAddress->postcode }}</br>
<span class="horizontal-rule"></span>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
{{ __('shop::app.checkout.onepage.contact') }} : {{ $billingAddress->phone }}
</div>
</div>
@endif
@ -33,10 +33,10 @@
{{ $shippingAddress->name }}</br>
{{ $shippingAddress->address1 }}, {{ $shippingAddress->address2 ? $shippingAddress->address2 . ',' : '' }} , {{ $shippingAddress->state }}</br>
{{ country()->name($shippingAddress->country) }} {{ $shippingAddress->postcode }}</br>
<span class="horizontal-rule"></span>
{{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
{{ __('shop::app.checkout.onepage.contact') }} : {{ $shippingAddress->phone }}
</div>
</div>
@endif
@ -48,8 +48,8 @@
<div class="cart-item-list">
@foreach ($cart->items as $item)
<?php
$product = $item->product;
<?php
$product = $item->product;
$productBaseImage = $productImageHelper->getProductBaseImage($product);
?>
@ -104,7 +104,7 @@
<div class="summary" >
{{ Cart::getProductAttributeOptionDetails($item->child->product)['html'] }}
</div>
{!! view_render_event('bagisto.shop.checkout.options.after', ['item' => $item]) !!}
@ -119,7 +119,7 @@
<div class="order-description">
<div class="pull-left" style="width: 50%;float: left;">
<div class="shipping">
<div class="decorator">
<i class="icon shipping-icon"></i>
@ -146,7 +146,7 @@
</div>
<div class="pull-right" style="width: 50%;float: left;">
<div class="pull-right" style="width: 50%; float: left;">
@include('shop::checkout.total.summary', ['cart' => $cart])

4
packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
View File

@ -24,7 +24,7 @@
<div class="account-items-list">
<div class="table">
<div class="account-table-content">
<table>
<thead>
<tr>
@ -74,7 +74,7 @@
@if (! $orders->count())
<tr>
<td class="empty" colspan="4">{{ __('admin::app.common.no-result-found') }}</td>
<td class="empty" colspan="10" style="text-align: center;">{{ __('admin::app.common.no-result-found') }}</td>
<tr>
@endif
</tbody>

2
packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
View File

@ -30,7 +30,7 @@
</head>
<body @if (app()->getLocale() == 'ar') class="rtl" @endif>
<body @if (app()->getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;">
{!! view_render_event('bagisto.shop.layout.body.before') !!}

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=d984bc35663c0fd9cf3f",
"/css/ui.css": "/css/ui.css?id=a23b9ab1a10ea5390247"
"/css/ui.css": "/css/ui.css?id=907ba1f195230c84e711"
}

179
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -45,31 +45,6 @@ h2 {
color: $font-color;
}
//tool tip
.tooltip {
position: relative;
border-bottom: 1px solid black;
}
.tooltip .tooltiptext {
visibility: hidden;
width: 120px;
background-color: black;
color: #fff;
text-align: center;
border-radius: 6px;
padding: 5px 0;
/* Position the tooltip */
position: absolute;
z-index: 1;
}
.tooltip:hover .tooltiptext {
visibility: visible;
}
//tooltip ends here
.hide {
display: none !important;
}
@ -129,9 +104,36 @@ h2 {
}
}
.dropdown-btn {
min-width: 150px;
text-align: left;
background: #ffffff;
border: 2px solid $control-border-color;
@include border-radius(3px);
font-size: 14px;
padding: 8px 35px 8px 10px;
cursor: pointer;
position: relative;
&:hover,
&:active,
&:focus {
opacity: 0.75;
border: 2px solid $control-border-color;
}
.icon {
position: absolute;
right: 10px;
top: 50%;
margin-top: -4px;
}
}
.dropdown-open {
position: relative;
}
.dropdown-list {
width: 200px;
margin-bottom: 20px;
@ -155,12 +157,12 @@ h2 {
right: 0px;
}
&.top-left {
bottom: 42px;
left: 0px;
bottom: 0px;
left: 42px;
}
&.top-right {
bottom: 42px;
right: 0px;
bottom: 0px;
right: 42px;
}
.search-box {
@ -188,7 +190,6 @@ h2 {
.dropdown-container {
padding: 20px;
overflow-y: auto;
max-height: 280px;
label {
font-size: 15px;
@ -206,9 +207,6 @@ h2 {
li {
padding: 5px 0px;
// &:hover {
// color: $brand-color;
// }
a:link,
a:active,
@ -244,10 +242,8 @@ h2 {
.table {
width: 100%;
overflow-x: auto;
table {
width: 100%;
border-collapse: collapse;
text-align: left;
@ -275,13 +271,6 @@ h2 {
&.empty {
text-align: center;
}
tr {
td {
// border: 1px solid red;
}
}
}
tbody tr:last-child td {
@ -301,58 +290,6 @@ h2 {
}
}
@media only screen and (max-width: 770px) {
.table {
table thead {
display: none;
}
table tbody {
tr td:before {
content: attr(data-value);
font-size: 15px;
font-weight: 600;
margin-right: 20px;
}
td {
border-bottom: none;
display: block;
}
tr {
border: 1px solid $control-border-color;
}
}
}
}
.dropdown-btn {
min-width: 150px;
text-align: left;
background: #ffffff;
border: 2px solid $control-border-color;
@include border-radius(3px);
font-size: 14px;
padding: 8px 35px 8px 10px;
cursor: pointer;
position: relative;
&:hover,
&:active,
&:focus {
opacity: 0.75;
border: 2px solid $control-border-color;
}
.icon {
position: absolute;
right: 10px;
top: 50%;
margin-top: -4px;
}
}
.pagination {
.page-item {
background: #ffffff;
@ -814,8 +751,8 @@ modal {
}
}
// responsive css for model
@media only screen and (max-width: 770px){
// responsive css for modal
@media only screen and (max-width: 770px) {
.modal-container {
max-width: 80%;
left: 10%;
@ -886,6 +823,7 @@ modal {
}
}
//Image wrapper
.image-wrapper {
margin-bottom: 20px;
margin-top: 10px;
@ -936,53 +874,4 @@ modal {
background-image: none;
}
}
}
//css for loader
.cp-spinner {
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
}
.cp-round:before {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px #bababa;
border-right: solid 6px #bababa;
border-bottom: solid 6px #bababa;
border-left: solid 6px #bababa;
position: absolute;
top: 0;
left: 0;
}
.cp-round:after {
border-radius: 50%;
content: " ";
width: 48px;
height: 48px;
display: inline-block;
box-sizing: border-box;
border-top: solid 6px $brand-color;
border-right: solid 6px transparent;
border-bottom: solid 6px transparent;
border-left: solid 6px transparent;
position: absolute;
top: 0;
left: 0;
animation: spin 1s ease-in-out infinite;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.pull-right {
float:right;
}

44
packages/Webkul/Ui/src/Resources/assets/sass/components.scss vendored
View File

@ -1,45 +1,36 @@
.grid-container {
display: block;
width: 100%;
height: 100%;
}
.filter-row-one {
display: flex;
display: inline-flex;
width: 100%;
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
}
.filter-row-two {
display: flex;
width: 100%;
flex-direction: row;
justify-content: flex-start;
align-items: center;
display: inline-flex;
align-items: flex-start;
flex-wrap: wrap;
margin-bottom: 10px;
}
.search-filter {
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-start;
display: inline-flex;
.control {
background: #ffffff;
font-size: 15px;
border: 2px solid $control-border-color;
border-right: none;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
border-radius: 3px;
height: 36px;
width: 360px;
width: 280px;
padding-left: 10px;
font-size: 15px;
color: #8E8E8E;
}
.contorl:focus {
@ -67,7 +58,7 @@
justify-content: space-between;
align-items: center;
height: 36px;
width: 202px;
width: 200px;
border: 2px solid $control-border-color;
border-radius: 3px;
color: #8E8E8E;
@ -78,6 +69,25 @@
}
}
.dropdown-list.dropdown-container {
padding: 5px;
width: 100%;
ul {
li {
.control-group {
padding: 15px;
}
}
}
.apply-filter {
padding: 10px;
width: 80%;
margin-left: 10%;
}
}
.filter-tag {
display: flex;
flex-direction: row;

199
packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
View File

@ -7,7 +7,6 @@
@push('scripts')
<script type="text/x-template" id="datagrid-filters">
{{-- start filter here --}}
<div class="grid-container">
<div class="filter-row-one" id="datagrid-filters">
<div class="search-filter">
@ -19,118 +18,114 @@
</div>
<div class="dropdown-filters">
<div class="more-filters">
<div class="dropdown-toggle">
<div class="dropdown-header">
<span class="name">Filter</span>
<i class="icon arrow-down-icon active"></i>
</div>
<div class="dropdown-toggle">
<div class="dropdown-header">
<span class="name">Filter</span>
<i class="icon arrow-down-icon active"></i>
</div>
</div>
<div class="dropdown-list bottom-right" style="display: none;">
<div class="dropdown-container">
<ul>
<li class="filter-column-dropdown">
<div class="control-group">
<select class="filter-column-select control" v-model="filterColumn" v-on:click="getColumnOrAlias(filterColumn)">
<option selected disabled>Select Column</option>
@foreach($results['columns'] as $column)
<option value="{{ $column['index'] }}">
{{ $column['label'] }}
</option>
@endforeach
</select>
</div>
</li>
<div class="dropdown-list dropdown-container" style="display: none;">
<ul>
<li>
<div class="control-group">
<select class="filter-column-select control" v-model="filterColumn" v-on:click="getColumnOrAlias(filterColumn)">
<option selected disabled>Select Column</option>
@foreach($results['columns'] as $column)
<option value="{{ $column['index'] }}">
{{ $column['label'] }}
</option>
@endforeach
</select>
</div>
</li>
{{-- suitable for string columns --}}
<li class="filter-condition-dropdown-string" v-if='stringConditionSelect'>
<div class="control-group">
<select class="control" v-model="stringCondition">
<option selected disabled>Select Condition</option>
<option value="like">Contains</option>
<option value="nlike">Does not contains</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is not equal to</option>
</select>
</div>
</li>
{{-- suitable for string columns --}}
<li v-if='stringConditionSelect'>
<div class="control-group">
<select class="control" v-model="stringCondition">
<option selected disabled>Select Condition</option>
<option value="like">Contains</option>
<option value="nlike">Does not contains</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is not equal to</option>
</select>
</div>
</li>
{{-- Response fields based on the type of columns to be filtered --}}
<li class="filter-condition-dropdown-string" v-if='stringCondition != null'>
<div class="control-group">
<input type="text" class="control response-string" placeholder="String Value here" v-model="stringValue" />
</div>
</li>
{{-- Response fields based on the type of columns to be filtered --}}
<li v-if='stringCondition != null'>
<div class="control-group">
<input type="text" class="control response-string" placeholder="String Value here" v-model="stringValue" />
</div>
</li>
{{-- suitable for numeric columns --}}
<li class="filter-condition-dropdown-number" v-if='numberConditionSelect'>
<div class="control-group">
<select class="control" v-model="numberCondition">
<option selected disabled>Select Condition</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is not equal to</option>
<option value="gt">Greater than</option>
<option value="lt">Less than</option>
<option value="gte">Greater than equals to</option>
<option value="lte">Less than equals to</option>
</select>
</div>
</li>
{{-- suitable for numeric columns --}}
<li v-if='numberConditionSelect'>
<div class="control-group">
<select class="control" v-model="numberCondition">
<option selected disabled>Select Condition</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is not equal to</option>
<option value="gt">Greater than</option>
<option value="lt">Less than</option>
<option value="gte">Greater than equals to</option>
<option value="lte">Less than equals to</option>
</select>
</div>
</li>
<li class="filter-response-number" v-if='numberCondition != null'>
<div class="control-group">
<input type="number" class="control response-number" placeholder="Numeric Value here" v-model="numberValue"/>
</div>
</li>
<li v-if='numberCondition != null'>
<div class="control-group">
<input type="number" class="control response-number" placeholder="Numeric Value here" v-model="numberValue"/>
</div>
</li>
{{-- suitable for boolean columns --}}
<li class="filter-condition-dropdown-boolean" v-if='booleanConditionSelect'>
<div class="control-group">
<select class="control" v-model="booleanCondition">
<option selected disabled>Select Condition</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is no equal to</option>
</select>
</div>
</li>
{{-- suitable for boolean columns --}}
<li v-if='booleanConditionSelect'>
<div class="control-group">
<select class="control" v-model="booleanCondition">
<option selected disabled>Select Condition</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is no equal to</option>
</select>
</div>
</li>
<li class="filter-condition-dropdown-boolean" v-if='booleanCondition != null'>
<div class="control-group">
<select class="control" v-model="booleanValue">
<option selected disabled>Select Value</option>
<option value="1">True / Active</option>
<option value="0">False / Inactive</option>
</select>
</div>
</li>
<li v-if='booleanCondition != null'>
<div class="control-group">
<select class="control" v-model="booleanValue">
<option selected disabled>Select Value</option>
<option value="1">True / Active</option>
<option value="0">False / Inactive</option>
</select>
</div>
</li>
{{-- suitable for date/time columns --}}
<li class="filter-condition-dropdown-datetime" v-if='datetimeConditionSelect'>
<div class="control-group">
<select class="control" v-model="datetimeCondition">
<option selected disabled>Select Condition</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is not equal to</option>
<option value="gt">Greater than</option>
<option value="lt">Less than</option>
<option value="gte">Greater than equals to</option>
<option value="lte">Less than equals to</option>
{{-- <option value="btw">Is Between</option> --}}
</select>
</div>
</li>
{{-- suitable for date/time columns --}}
<li v-if='datetimeConditionSelect'>
<div class="control-group">
<select class="control" v-model="datetimeCondition">
<option selected disabled>Select Condition</option>
<option value="eq">Is equal to</option>
<option value="neqs">Is not equal to</option>
<option value="gt">Greater than</option>
<option value="lt">Less than</option>
<option value="gte">Greater than equals to</option>
<option value="lte">Less than equals to</option>
{{-- <option value="btw">Is Between</option> --}}
</select>
</div>
</li>
<li class="filter-condition-dropdown-boolean" v-if='datetimeCondition != null'>
<div class="control-group">
<input class="control" v-model="datetimeValue" type="date">
</div>
</li>
<li v-if='datetimeCondition != null'>
<div class="control-group">
<input class="control" v-model="datetimeValue" type="date">
</div>
</li>
<button class="btn btn-sm btn-primary apply-filter" v-on:click="getResponse">Apply</button>
</ul>
</div>
</div>
<button class="btn btn-sm btn-primary apply-filter" v-on:click="getResponse">Apply</button>
</ul>
</div>
</div>
</div>

2
packages/Webkul/User/src/Http/Controllers/SessionController.php
View File

@ -74,7 +74,7 @@ class SessionController extends Controller
if (! auth()->guard('admin')->attempt(request(['email', 'password']), $remember)) {
session()->flash('error', trans('admin::app.users.users.login-error'));
return back();
return redirect()->route('admin.session.create');
}
if (auth()->guard('admin')->user()->status == 0) {