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

Base sync and webfont fixes

This commit is contained in:
Prashant Singh 2019-08-24 16:09:22 +05:30
parent de1ccc7c0b 6169d7cc8d
commit 8994cd0426
48 changed files with 290 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

6
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{ {
"/js/admin.js": "/js/admin.js?id=7f0b8f49bcf11cef838f", "/js/admin.js": "/js/admin.js?id=d4f31671591cde63824d",
"/css/admin.css": "/css/admin.css?id=96d341f257529071e8e7" "/css/admin.css": "/css/admin.css?id=e9178754dd7096a8f7a0"
} }

4
packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
View File

@ -19,7 +19,7 @@ class OrderInvoicesDataGrid extends DataGrid
public function prepareQueryBuilder() public function prepareQueryBuilder()
{ {
$queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'grand_total', 'created_at'); $queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'base_grand_total', 'created_at');
$this->setQueryBuilder($queryBuilder); $this->setQueryBuilder($queryBuilder);
} }
@ -45,7 +45,7 @@ class OrderInvoicesDataGrid extends DataGrid
]); ]);
$this->addColumn([ $this->addColumn([
'index' => 'grand_total', 'index' => 'base_grand_total',
'label' => trans('admin::app.datagrid.grand-total'), 'label' => trans('admin::app.datagrid.grand-total'),
'type' => 'price', 'type' => 'price',
'searchable' => true, 'searchable' => true,

81
packages/Webkul/Admin/src/Resources/assets/sass/app.scss vendored
View File

@ -27,7 +27,7 @@ body {
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 10px; border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
} }
.navbar-top { .navbar-top {
@ -211,8 +211,12 @@ body {
.page-header { .page-header {
display: inline-block; display: inline-block;
margin-bottom: 20px;
width: 100%; width: 100%;
padding: 15px 0px 15px 0px;
position: sticky;
top: 60px;
background-color: #ffffff;
z-index: 3;
.page-title { .page-title {
float: left; float: left;
@ -274,7 +278,7 @@ body {
.control { .control {
background: #fff; background: #fff;
border: 2px solid #C7C7C7; border: 2px solid #c7c7c7;
@include border-radius(3px); @include border-radius(3px);
width: 150px; width: 150px;
height: 36px; height: 36px;
@ -285,7 +289,7 @@ body {
font-size: 15px; font-size: 15px;
&:focus { &:focus {
border-color: #0041FF; border-color: #0041ff;
} }
} }
@ -315,7 +319,7 @@ body {
.locale { .locale {
float: right; float: right;
color: #8E8E8E; color: #8e8e8e;
} }
} }
@ -325,10 +329,8 @@ body {
} }
} }
// admin dashboard css // admin dashboard css
.dashboard { .dashboard {
.page-header { .page-header {
margin-bottom: 0 !important; margin-bottom: 0 !important;
padding-bottom: 15px; padding-bottom: 15px;
@ -341,16 +343,16 @@ body {
.card { .card {
height: 445px; height: 445px;
background: #FFFFFF; background: #ffffff;
border: 1px solid #E7E7E7; border: 1px solid #e7e7e7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); box-shadow: 0 5px 10px 2px rgba(0, 0, 0, 0.08);
border-radius: 2px; border-radius: 2px;
padding: 20px 0px 0px 20px; padding: 20px 0px 0px 20px;
overflow: auto; overflow: auto;
.card-title { .card-title {
font-size: 14px; font-size: 14px;
color: #A2A2A2; color: #a2a2a2;
letter-spacing: -0.26px; letter-spacing: -0.26px;
text-transform: uppercase; text-transform: uppercase;
} }
@ -378,7 +380,7 @@ body {
margin-right: 15px; margin-right: 15px;
&.product { &.product {
background: #F2F2F2; background: #f2f2f2;
} }
img { img {
@ -390,11 +392,11 @@ body {
margin-top: 10px; margin-top: 10px;
.name { .name {
color: #0041FF; color: #0041ff;
} }
.info { .info {
color: #3A3A3A; color: #3a3a3a;
margin-top: 5px; margin-top: 5px;
} }
} }
@ -417,7 +419,7 @@ body {
p { p {
margin: 0; margin: 0;
color: #A2A2A2; color: #a2a2a2;
} }
} }
} }
@ -432,28 +434,27 @@ body {
.dashboard-card { .dashboard-card {
height: 100px; height: 100px;
background: #FFFFFF; background: #ffffff;
border: 1px solid #E7E7E7; border: 1px solid #e7e7e7;
box-shadow: 0 5px 10px 2px rgba(0,0,0,0.08); box-shadow: 0 5px 10px 2px rgba(0, 0, 0, 0.08);
border-radius: 5px; border-radius: 5px;
position: relative; position: relative;
padding: 15px; padding: 15px;
.title { .title {
font-size: 14px; font-size: 14px;
color: #A2A2A2; color: #a2a2a2;
text-transform: uppercase; text-transform: uppercase;
} }
.data { .data {
padding-top: 13px; padding-top: 13px;
font-size: 32px; font-size: 32px;
color: #0041FF; color: #0041ff;
.progress { .progress {
font-size: 14px; font-size: 14px;
color: #8E8E8E; color: #8e8e8e;
float: right; float: right;
margin-top: -2px; margin-top: -2px;
@ -503,7 +504,7 @@ body {
.secton-title { .secton-title {
font-size: 18px; font-size: 18px;
color: #8E8E8E; color: #8e8e8e;
padding: 15px 0; padding: 15px 0;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
} }
@ -553,7 +554,6 @@ body {
float: right; float: right;
tr { tr {
td { td {
padding: 5px 8px; padding: 5px 8px;
} }
@ -584,7 +584,8 @@ body {
.export-import { .export-import {
cursor: pointer; cursor: pointer;
.export-icon, .import-icon { .export-icon,
.import-icon {
position: relative; position: relative;
top: 10px; top: 10px;
} }
@ -619,7 +620,8 @@ body {
padding-top: 15px; padding-top: 15px;
border-top: 1px solid rgba(162, 162, 162, 0.2); border-top: 1px solid rgba(162, 162, 162, 0.2);
.close-icon, .open-icon { .close-icon,
.open-icon {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
left: 45%; left: 45%;
@ -762,7 +764,7 @@ body {
// ui // ui
.grid-container { .grid-container {
.filter-row-one .search-filter { .filter-row-one .search-filter {
border: 2px solid #C7C7C7; border: 2px solid #c7c7c7;
border-radius: 2px; border-radius: 2px;
.control { .control {
@ -774,13 +776,14 @@ body {
border: none; border: none;
padding-top: 2px; padding-top: 2px;
padding-right: 5px; padding-right: 5px;
border-right: 2px solid #C7C7C7; border-right: 2px solid #c7c7c7;
border-radius: 0px; border-radius: 0px;
} }
} }
.filter-row-two .filter-tag { .filter-row-two .filter-tag {
.wrapper, .icon.cross-icon { .wrapper,
.icon.cross-icon {
margin-right: 10px; margin-right: 10px;
margin-left: 0px; margin-left: 0px;
} }
@ -792,8 +795,15 @@ body {
} }
} }
.grid-container .filter-wrapper .filter-row-one .dropdown-filters .more-filters .dropdown-toggle .dropdown-header span { .grid-container
padding-right: 5px; .filter-wrapper
.filter-row-one
.dropdown-filters
.more-filters
.dropdown-toggle
.dropdown-header
span {
padding-right: 5px;
} }
.grid-container .table tbody td.action a:first-child { .grid-container .table tbody td.action a:first-child {
@ -830,13 +840,14 @@ body {
.tree-container .tree-item { .tree-container .tree-item {
padding-right: 30px; padding-right: 30px;
.expand-icon ,.folder-icon { .expand-icon,
.folder-icon {
margin-left: 10px; margin-left: 10px;
margin-right: 0px; margin-right: 0px;
} }
} }
.tree-container >.tree-item { .tree-container > .tree-item {
padding-right: 0px; padding-right: 0px;
} }
@ -855,7 +866,7 @@ body {
.control-group label.required::before { .control-group label.required::before {
content: "*"; content: "*";
color: #FC6868; color: #fc6868;
font-weight: 700; font-weight: 700;
} }
@ -898,4 +909,4 @@ body {
.pagination { .pagination {
margin-top: 30px; margin-top: 30px;
} }

2
packages/Webkul/Admin/src/Resources/views/account/edit.blade.php
View File

@ -14,7 +14,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submi t" class="btn btn-lg btn-primary"> <button type="submi t" class="btn btn-lg btn-primary">
{{ __('admin::app.account.save-btn-title') }} {{ __('admin::app.account.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.attributes.save-btn-title') }} {{ __('admin::app.catalog.attributes.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.attributes.save-btn-title') }} {{ __('admin::app.catalog.attributes.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
View File

@ -18,7 +18,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.categories.save-btn-title') }} {{ __('admin::app.catalog.categories.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/families/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.families.save-btn-title') }} {{ __('admin::app.catalog.families.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.families.save-btn-title') }} {{ __('admin::app.catalog.families.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/products/create.blade.php
View File

@ -32,7 +32,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.products.save-btn-title') }} {{ __('admin::app.catalog.products.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
View File

@ -47,7 +47,7 @@
</div> </div>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.catalog.products.save-btn-title') }} {{ __('admin::app.catalog.products.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.cms.pages.create-btn-title') }} {{ __('admin::app.cms.pages.create-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button id="preview" class="btn btn-lg btn-primary"> <button id="preview" class="btn btn-lg btn-primary">
{{ __('admin::app.cms.pages.preview') }} {{ __('admin::app.cms.pages.preview') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/customers/create.blade.php
View File

@ -19,7 +19,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.customers.customers.save-btn-title') }} {{ __('admin::app.customers.customers.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
View File

@ -19,7 +19,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.customers.customers.save-btn-title') }} {{ __('admin::app.customers.customers.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save-btn-title') }} {{ __('admin::app.promotion.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save') }} {{ __('admin::app.promotion.save') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/create.blade.php
View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.save-btn-title') }} {{ __('admin::app.promotion.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/promotions/catalog-rule/edit.blade.php
View File

@ -24,7 +24,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.promotion.edit-btn-title') }} {{ __('admin::app.promotion.edit-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
View File

@ -18,7 +18,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.invoices.save-btn-title') }} {{ __('admin::app.sales.invoices.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
View File

@ -18,7 +18,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.shipments.save-btn-title') }} {{ __('admin::app.sales.shipments.save-btn-title') }}
</button> </button>

6
packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.channels.save-btn-title') }} {{ __('admin::app.settings.channels.save-btn-title') }}
</button> </button>
@ -28,6 +28,8 @@
<div class="form-container"> <div class="form-container">
@csrf() @csrf()
{!! view_render_event('bagisto.admin.settings.channel.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true">
<div slot="body"> <div slot="body">
@ -197,6 +199,8 @@
</div> </div>
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.channel.create.after') !!}
</div> </div>
</div> </div>
</form> </form>

6
packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.channels.save-btn-title') }} {{ __('admin::app.settings.channels.save-btn-title') }}
</button> </button>
@ -29,6 +29,8 @@
@csrf() @csrf()
<input name="_method" type="hidden" value="PUT"> <input name="_method" type="hidden" value="PUT">
{!! view_render_event('bagisto.admin.settings.channel.edit.before') !!}
<accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.channels.general') }}'" :active="true">
<div slot="body"> <div slot="body">
@ -212,6 +214,8 @@
</div> </div>
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.channel.edit.after') !!}
</div> </div>
</div> </div>
</form> </form>

7
packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.currencies.save-btn-title') }} {{ __('admin::app.settings.currencies.save-btn-title') }}
</button> </button>
@ -28,8 +28,11 @@
<div class="form-container"> <div class="form-container">
@csrf() @csrf()
{!! view_render_event('bagisto.admin.settings.currencies.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.currencies.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.currencies.general') }}'" :active="true">
<div slot="body"> <div slot="body">
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']"> <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
<label for="code" class="required">{{ __('admin::app.settings.currencies.code') }}</label> <label for="code" class="required">{{ __('admin::app.settings.currencies.code') }}</label>
<input v-validate="'required|min:3|max:3'" class="control" id="code" name="code" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" style="text-transform:uppercase" v-code/> <input v-validate="'required|min:3|max:3'" class="control" id="code" name="code" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.settings.currencies.code') }}&quot;" style="text-transform:uppercase" v-code/>
@ -41,9 +44,11 @@
<input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') }}"/> <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') }}"/>
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span> <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
</div> </div>
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.currencies.create.after') !!}
</div> </div>
</div> </div>
</form> </form>

6
packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.currencies.save-btn-title') }} {{ __('admin::app.settings.currencies.save-btn-title') }}
</button> </button>
@ -29,6 +29,8 @@
@csrf() @csrf()
<input name="_method" type="hidden" value="PUT"> <input name="_method" type="hidden" value="PUT">
{!! view_render_event('bagisto.admin.settings.currencies.edit.before') !!}
<accordian :title="'{{ __('admin::app.settings.currencies.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.currencies.general') }}'" :active="true">
<div slot="body"> <div slot="body">
@ -44,9 +46,11 @@
<input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') ?: $currency->name }}"/> <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.settings.currencies.name') }}&quot;" value="{{ old('name') ?: $currency->name }}"/>
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span> <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
</div> </div>
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.currencies.edit.after') !!}
</div> </div>
</div> </div>
</form> </form>

6
packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.exchange_rates.save-btn-title') }} {{ __('admin::app.settings.exchange_rates.save-btn-title') }}
</button> </button>
@ -46,6 +46,8 @@
<tbody> <tbody>
<tr> <tr>
{!! view_render_event('bagisto.admin.settings.exchangerate.create.before') !!}
<td> <td>
{{ core()->getBaseCurrencyCode() }} {{ core()->getBaseCurrencyCode() }}
</td> </td>
@ -69,6 +71,8 @@
<span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span> <span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span>
</div> </div>
</td> </td>
{!! view_render_event('bagisto.admin.settings.exchangerate.create.after') !!}
</tr> </tr>
</tbody> </tbody>
</table> </table>

6
packages/Webkul/Admin/src/Resources/views/settings/exchange_rates/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.exchange_rates.save-btn-title') }} {{ __('admin::app.settings.exchange_rates.save-btn-title') }}
</button> </button>
@ -47,6 +47,8 @@
<tbody> <tbody>
<tr> <tr>
{!! view_render_event('bagisto.admin.settings.exchangerate.edit.before') !!}
<td> <td>
{{ core()->getBaseCurrencyCode() }} {{ core()->getBaseCurrencyCode() }}
</td> </td>
@ -70,6 +72,8 @@
<span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span> <span class="control-error" v-if="errors.has('rate')">@{{ errors.first('rate') }}</span>
</div> </div>
</td> </td>
{!! view_render_event('bagisto.admin.settings.exchangerate.edit.after') !!}
<tr> <tr>
</tbody> </tbody>
</table> </table>

5
packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.inventory_sources.save-btn-title') }} {{ __('admin::app.settings.inventory_sources.save-btn-title') }}
</button> </button>
@ -28,6 +28,8 @@
<div class="form-container"> <div class="form-container">
@csrf() @csrf()
{!! view_render_event('bagisto.admin.settings.inventory.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.inventory_sources.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.inventory_sources.general') }}'" :active="true">
<div slot="body"> <div slot="body">
@ -130,6 +132,7 @@
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.inventory.create.after') !!}
</div> </div>
</div> </div>
</form> </form>

6
packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.inventory_sources.save-btn-title') }} {{ __('admin::app.settings.inventory_sources.save-btn-title') }}
</button> </button>
@ -27,6 +27,9 @@
<div class="page-content"> <div class="page-content">
<div class="form-container"> <div class="form-container">
@csrf() @csrf()
{!! view_render_event('bagisto.admin.settings.inventory.edit.before') !!}
<input name="_method" type="hidden" value="PUT"> <input name="_method" type="hidden" value="PUT">
<accordian :title="'{{ __('admin::app.settings.inventory_sources.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.inventory_sources.general') }}'" :active="true">
@ -131,6 +134,7 @@
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.inventory.edit.after') !!}
</div> </div>
</div> </div>
</form> </form>

6
packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.locales.save-btn-title') }} {{ __('admin::app.settings.locales.save-btn-title') }}
</button> </button>
@ -28,6 +28,8 @@
<div class="form-container"> <div class="form-container">
@csrf() @csrf()
{!! view_render_event('bagisto.admin.settings.locale.create.before') !!}
<accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true">
<div slot="body"> <div slot="body">
<div class="control-group" :class="[errors.has('code') ? 'has-error' : '']"> <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
@ -50,6 +52,8 @@
</select> </select>
<span class="control-error" v-if="errors.has('direction')">@{{ errors.first('direction') }}</span> <span class="control-error" v-if="errors.has('direction')">@{{ errors.first('direction') }}</span>
</div> </div>
{!! view_render_event('bagisto.admin.settings.locale.create.after') !!}
</div> </div>
</accordian> </accordian>

7
packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.locales.save-btn-title') }} {{ __('admin::app.settings.locales.save-btn-title') }}
</button> </button>
@ -27,6 +27,9 @@
<div class="page-content"> <div class="page-content">
<div class="form-container"> <div class="form-container">
@csrf() @csrf()
{!! view_render_event('bagisto.admin.settings.locale.edit.before') !!}
<input name="_method" type="hidden" value="PUT"> <input name="_method" type="hidden" value="PUT">
<accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true"> <accordian :title="'{{ __('admin::app.settings.locales.general') }}'" :active="true">
@ -53,9 +56,11 @@
</select> </select>
<span class="control-error" v-if="errors.has('direction')">@{{ errors.first('direction') }}</span> <span class="control-error" v-if="errors.has('direction')">@{{ errors.first('direction') }}</span>
</div> </div>
</div> </div>
</accordian> </accordian>
{!! view_render_event('bagisto.admin.settings.locale.edit.after') !!}
</div> </div>
</div> </div>
</form> </form>

2
packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.sliders.save-btn-title') }} {{ __('admin::app.settings.sliders.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.sliders.save-btn-title') }} {{ __('admin::app.settings.sliders.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/tax/tax-categories/create.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-categories.save-btn-title') }} {{ __('admin::app.settings.tax-categories.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-categories.save-btn-title') }} {{ __('admin::app.settings.tax-categories.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-rates.save-btn-title') }} {{ __('admin::app.settings.tax-rates.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/tax/tax-rates/edit.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.settings.tax-rates.edit-title') }} {{ __('admin::app.settings.tax-rates.edit-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.roles.save-btn-title') }} {{ __('admin::app.users.roles.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php
View File

@ -17,7 +17,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.roles.save-btn-title') }} {{ __('admin::app.users.roles.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.users.save-btn-title') }} {{ __('admin::app.users.users.save-btn-title') }}
</button> </button>

2
packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
View File

@ -16,7 +16,7 @@
</h1> </h1>
</div> </div>
<div class="page-action fixed-action-slight"> <div class="page-action">
<button type="submit" class="btn btn-lg btn-primary"> <button type="submit" class="btn btn-lg btn-primary">
{{ __('admin::app.users.users.save-btn-title') }} {{ __('admin::app.users.users.save-btn-title') }}
</button> </button>

0
packages/Webkul/Custom/src/Resources/views/header.blade.php Normal file
View File

10
packages/Webkul/Discount/src/Helpers/Catalog/Apply.php
View File

@ -13,7 +13,7 @@ use Webkul\Discount\Helpers\Catalog\Sale;
* Apply - Applies catalog rule to products intended in the rules * Apply - Applies catalog rule to products intended in the rules
* *
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul * @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com) * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)
*/ */
class Apply extends Sale class Apply extends Sale
{ {
@ -119,10 +119,8 @@ class Apply extends Sale
$this->setSale($rule, $productIDs); $this->setSale($rule, $productIDs);
} }
} }
// dd($result, 'processing done');
} else { } else {
// handle the deceased rules here // handle the deceased rules here or call the declutter handler over here
// dd($this->deceased); // dd($this->deceased);
} }
} }
@ -196,6 +194,8 @@ class Apply extends Sale
$winnerRuleId = $this->breakTie($previousRuleID, $newRuleID, $product); $winnerRuleId = $this->breakTie($previousRuleID, $newRuleID, $product);
$discountAmount = $this->getDiscountAmount($product, $rule);
$data = [ $data = [
'catalog_rule_id' => $rule->id, 'catalog_rule_id' => $rule->id,
'starts_from' => $rule->starts_from, 'starts_from' => $rule->starts_from,
@ -204,7 +204,7 @@ class Apply extends Sale
'channel_id' => $channelId, 'channel_id' => $channelId,
'product_id' => $productID, 'product_id' => $productID,
'action_code' => $rule->action_code, 'action_code' => $rule->action_code,
'action_amount' => $discountPrice 'action_amount' => $discountAmount
]; ];
if ($rule->id == $winnerRuleId) { if ($rule->id == $winnerRuleId) {

2
packages/Webkul/Webfont/src/Http/Controllers/WebfontController.php
View File

@ -35,7 +35,7 @@ class WebfontController extends Controller
$client = new GuzzleHttp\Client(); $client = new GuzzleHttp\Client();
if (core()->getConfigData('general.design.webfont.webfont')) { if (core()->getConfigData('general.design.webfont.webfont')) {
$res = $client->request('GET', 'https://www.googleapis.com/webfonts/v1/webfonts?key='.core()->getConfigData('general.design.webfont.webfont')); $res = $client->request('GET', 'https://www.googleapis.com/webfonts/v1/webfonts?key='.env('WEBFONT_API_ID'));
if ($res->getStatusCode() == 200) { if ($res->getStatusCode() == 200) {
$result = (string) $res->getBody()->getContents(); $result = (string) $res->getBody()->getContents();

12
packages/Webkul/Webfont/src/Resources/views/webfont.blade.php
View File

@ -99,5 +99,17 @@
.account-content .menu-block .menubar li.active a { .account-content .menu-block .menubar li.active a {
color: {{ $primaryColor }}; color: {{ $primaryColor }};
} }
.dashboard .dashboard-stats .dashboard-card .title {
color: {{ $primaryColor }}
}
.dashboard .dashboard-stats .dashboard-card .data {
color: {{ $secondaryColor }}
}
.dashboard .card .card-info ul li .description .name {
color: {{ $primaryColor }}
}
} }
</style> </style>

137
resources/views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php vendored Normal file
View File

@ -0,0 +1,137 @@
{!! view_render_event('bagisto.shop.layout.header.category.before') !!}
<?php
$categories = [];
foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
if ($category->slug)
array_push($categories, $category);
}
?>
<category-nav categories='@json($categories)' url="{{url()->to('/')}}"></category-nav>
{!! view_render_event('bagisto.shop.layout.header.category.after') !!}
@push('scripts')
<script type="text/x-template" id="category-nav-template">
<ul class="nav">
<category-item
v-for="(item, index) in items"
:key="index"
:url="url"
:item="item"
:parent="index">
</category-item>
</ul>
</script>
<script>
Vue.component('category-nav', {
template: '#category-nav-template',
props: {
categories: {
type: [Array, String, Object],
required: false,
default: (function () {
return [];
})
},
url: String
},
data: function(){
return {
items_count:0
};
},
computed: {
items: function() {
return JSON.parse(this.categories)
}
},
});
</script>
<script type="text/x-template" id="category-item-template">
<li>
<a :href="url+'/categories/'+this.item['translations'][0].slug">
@{{ name }}&emsp;
<i class="icon dropdown-right-icon" v-if="haveChildren && item.parent_id != null"></i>
</a>
<i :class="[show ? 'icon icon-arrow-down mt-15' : 'icon dropdown-right-icon left mt-15']"
v-if="haveChildren" @click="showOrHide"></i>
<ul v-if="haveChildren && show">
<category-item
v-for="(child, index) in item.children"
:key="index"
:url="url"
:item="child">
</category-item>
</ul>
</li>
</script>
<script>
Vue.component('category-item', {
template: '#category-item-template',
props: {
item: Object,
url: String,
},
data: function() {
return {
items_count:0,
show: false,
};
},
mounted: function() {
if(window.innerWidth > 770){
this.show = true;
}
},
computed: {
haveChildren: function() {
return this.item.children.length ? true : false;
},
name: function() {
if (this.item.translations && this.item.translations.length) {
this.item.translations.forEach(function(translation) {
if (translation.locale == document.documentElement.lang)
return translation.name;
});
}
return this.item.name;
}
},
methods: {
showOrHide: function() {
this.show = !this.show;
}
}
});
</script>
@endpush