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

Merge https://github.com/bagisto/bagisto

This commit is contained in:
Aayush Bhatt 2020-02-06 20:22:38 +05:30
parent d9f2f1ab3d d6d3462476
commit 3b74ee4129
21 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Shop/src/Http/Controllers/CartController.php
View File

@ -4,6 +4,7 @@ namespace Webkul\Shop\Http\Controllers;
use Webkul\Customer\Repositories\WishlistRepository;
use Webkul\Product\Repositories\ProductRepository;
use Webkul\Checkout\Contracts\Cart as CartModel;
use Cart;
/**
@ -78,7 +79,7 @@ class CartController extends Controller
return redirect()->back();
}
if ($result instanceof Cart) {
if ($result instanceof CartModel) {
session()->flash('success', trans('shop::app.checkout.cart.item.success'));
if ($customer = auth()->guard('customer')->user())

21
packages/Webkul/Ui/src/Resources/lang/ar/app.php
View File

@ -11,11 +11,30 @@ return [
'edit' => 'هل تريد حقا تحرير هذا :resource?',
],
'zero-index' => 'Index columns can have values greater than zero only',
'no-records' => 'لا توجد سجلات',
'filter-fields-missing' => 'بعض الحقل المطلوب هو لاغ ، رجاء تفقد عمود ، حالة و قيمة صحيح',
'click_on_action' => 'هل تريد حقا أن تؤدي هذا العمل؟',
'search' => 'Search Here...',
'filter' => 'Filter',
'column' => 'Select Column',
'condition' => 'Select Condition',
'contains' => 'Contains',
'ncontains' => 'Does not contains',
'equals' => 'Is Equals to',
'nequals' => 'Is Not equals to',
'greater' => 'Greater than',
'less' => 'Less than',
'greatere' => 'Greater than equals to',
'lesse' => 'Less than equals to',
'value' => 'Select Value',
'true' => 'True / Active',
'false' => 'False / Inactive',
'between' => 'Is between',
'apply' => 'Apply',
'items-per-page' => 'Items Per Page',
'value-here' => 'Value here',
'numeric-value-here' => 'Numeric Value here'
'numeric-value-here' => 'Numeric Value here',
'submit' => 'Submit'
]
];

7
packages/Webkul/Ui/src/Resources/lang/en/app.php
View File

@ -1,9 +1,5 @@
<?php
return [
'one-col' => '<div class="mt-10">Use class: <b>"static-container one-column"</b> for one column layout.</div>',
'two-col' => '<div class="mt-10">Use class: <b>"static-container two-column"</b> for two column layout.</div>',
'three-col' => '<div class="mt-10">Use class: <b>"static-container three-column"</b> for three column layout.</div>',
'helper-classes' => 'Helper Classes',
'datagrid' => [
'actions' => 'Actions',
'id' => 'Index columns have value greater than zero only',
@ -38,6 +34,7 @@ return [
'apply' => 'Apply',
'items-per-page' => 'Items Per Page',
'value-here' => 'Value here',
'numeric-value-here' => 'Numeric Value here'
'numeric-value-here' => 'Numeric Value here',
'submit' => 'Submit'
]
];

3
packages/Webkul/Ui/src/Resources/lang/fa/app.php
View File

@ -34,6 +34,7 @@ return [
'apply' => 'درخواست',
'items-per-page' => 'Items Per Page',
'value-here' => 'Value here',
'numeric-value-here' => 'Numeric Value here'
'numeric-value-here' => 'Numeric Value here',
'submit' => 'Submit'
]
];

3
packages/Webkul/Ui/src/Resources/lang/pt_BR/app.php
View File

@ -34,6 +34,7 @@ return [
'apply' => 'Aplicar',
'items-per-page' => 'Items Per Page',
'value-here' => 'Value here',
'numeric-value-here' => 'Numeric Value here'
'numeric-value-here' => 'Numeric Value here',
'submit' => 'Submit'
]
];

4
packages/Webkul/Ui/src/Resources/views/datagrid/partials/mass-action-header.blade.php
View File

@ -25,7 +25,9 @@
</select>
</div>
<input type="submit" class="btn btn-sm btn-primary" style="margin-left: 10px;">
<button type="submit" class="btn btn-sm btn-primary" style="margin-left: 10px;">
{{ __('ui::app.datagrid.submit') }}
</button>
</form>
</div>
</th>

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=26b9c7e1abf32569c51e",
"/css/velocity.css": "/css/velocity.css?id=18c9b7b602edc61d6432",
"/js/velocity.js": "/js/velocity.js?id=65a146da75db9d89424d",
"/css/velocity.css": "/css/velocity.css?id=0a048b9cd108c9456da1",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7"
}

6
packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php
View File

@ -84,12 +84,14 @@ class ContentDataGrid extends DataGrid
'searchable' => true,
'filterable' => true,
'wrapper' => function($value) {
if ($value->content_type == 'link')
if ($value->content_type == 'category')
return 'Category Slug';
else if ($value->content_type == 'link')
return 'Link';
else if ($value->content_type == 'product')
return 'Product';
else if ($value->content_type == 'static')
return 'Static';
return 'Static';
}
]);
}

4
packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php
View File

@ -26,9 +26,5 @@ class VelocityMetaDataSeeder extends Seeder
'product_policy' => '<div class="row col-12 remove-padding-margin"><div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-van-ship fs40"></i></div> <div class="right"><span class="font-setting fs20">Free Shipping on Order $20 or More</span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Replace &amp; Return Available </span></div></div></div></div> <div class="col-lg-4 col-sm-12 product-policy-wrapper"><div class="card"><div class="policy"><div class="left"><i class="rango-exchnage fs40"></i></div> <div class="right"><span class="font-setting fs20">Product Exchange and EMI Available </span></div></div></div></div></div>',
]);
DB::table('locales')->where('code', 'en')->update([
'locale_image' => '/themes/velocity/assets/images/flags/en.png'
]);
}
}

2
packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
View File

@ -9,7 +9,7 @@ use Webkul\Product\Repositories\ProductRepository;
use Webkul\Velocity\Repositories\Product\ProductRepository as VelocityProductRepository;
/**
* Search controller
* Shop controller
*
* @author Shubham Mehrotra <shubhammehrotra.symfony@webkul.com> @shubhwebkul
* @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com)

5
packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php
View File

@ -122,10 +122,7 @@ class ProductRepository extends Repository
$query->where('product_flat.name', 'like', '%' . urldecode($term) . '%');
if ($categoryId && $categoryId !== "") {
$query = $query
->leftJoin('products', 'product_flat.product_id', '=', 'products.id')
->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')
->where('product_categories.category_id', $categoryId);
$query = $query->where('product_categories.category_id', $categoryId);
}
if (isset($params['sort'])) {

2
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -175,7 +175,7 @@ $(document).ready(function () {
},
mounted: function () {
this.addServerErrors();
// this.addServerErrors();
document.body.style.display = "block";
this.$validator.localize(document.documentElement.lang);

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -1618,10 +1618,8 @@
li {
a {
padding: 7px 0 5px 15px;
}
&:hover {
> a {
&:hover {
background: $border-light;
}
}

13
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -179,22 +179,15 @@
position: relative;
.arrow {
left: 0px;
height: 100%;
z-index: 1001;
opacity: 0.50;
margin-top: 5px;
cursor: pointer;
position: absolute;
line-height: 13em;
background: $border-dark;
&.left {
left: 0px;
line-height: 13em;
}
&.right {
right: 0px;
line-height: 13rem;
}
}
.thumb-frame {

4
packages/Webkul/Velocity/src/Resources/lang/en/app.php
View File

@ -59,7 +59,7 @@ return [
'autocomplete' => '[Autocomplete]',
'search-hint' => 'Search product here...',
'no-result-found' => 'No record found.',
'mass-delete-success' => 'Success: Selected conent(s) deleted successfully.',
'mass-delete-success' => 'Selected content deleted successfully.',
'tab' => [
'page' => 'Page Setting',
'content' => 'Content Setting',
@ -131,7 +131,7 @@ return [
'status' => 'Status',
'active' => 'Active',
'inactive' => 'Inactive',
'mass-delete-success' => 'Success: Selected categories menu deleted successfully.',
'mass-delete-success' => 'Selected categories menu deleted successfully.',
],
'general' => [
'locale_logo' => 'Locale Logo',

2
packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/category.blade.php
View File

@ -12,7 +12,7 @@
class="control"
name="page_link"
v-validate="'required|max:150'"
value="{{ isset($locale) ? (old($locale)['page_link'] ?: $content->translate($locale)['page_link']) : '' }}"
value="{{ isset($locale) ? (old($locale)['page_link'] ?? $content->translate($locale)['page_link']) : '' }}"
data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
<span class="control-error" v-if="errors.has('page_link')">

2
packages/Webkul/Velocity/src/Resources/views/admin/content/content-type/edit-product.blade.php
View File

@ -6,7 +6,7 @@
@push('scripts')
<script type="text/x-template" id="catalog-product-template">
<div>
<?php $catalogType = old($locale)['catalog_type'] ?: $content->translate($locale)['catalog_type']; ?>
<?php $catalogType = old($locale)['catalog_type'] ?? $content->translate($locale)['catalog_type']; ?>
<div class="control-group" :class="[errors.has('{{$locale}}[catalog_type]') ? 'has-error' : '']">
<label for="catalog_type" class="required">

12
packages/Webkul/Velocity/src/Resources/views/admin/content/edit.blade.php
View File

@ -59,7 +59,7 @@
{{ __('velocity::app.admin.contents.page.title') }}
<span class="locale">[{{ $locale }}]</span>
</label>
<input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?: $content->translate($locale)['title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
<input type="text" v-validate="'required|max:100'" class="control" id="title" name="{{$locale}}[title]" value="{{ old($locale)['title'] ?? $content->translate($locale)['title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.title') }}&quot;"/>
<span class="control-error" v-if="errors.has('{{$locale}}[title]')">@{{ errors.first('{!!$locale!!}[title]') }}</span>
</div>
@ -68,7 +68,7 @@
<label for="position" class="required">
{{ __('velocity::app.admin.contents.page.position') }}</span>
</label>
<input type="text" v-validate="'required|numeric|max:2'" class="control" id="position" name="position" value="{{ old('position') ?: $content->position }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.position') }}&quot;"/>
<input type="text" v-validate="'required|numeric|max:2'" class="control" id="position" name="position" value="{{ old('position') ?? $content->position }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.page.position') }}&quot;"/>
<span class="control-error" v-if="errors.has('position')">@{{ errors.first('position') }}</span>
</div>
@ -132,7 +132,7 @@
id="custom_title"
v-validate="'max:100'"
name="{{$locale}}[custom_title]"
value="{{ old($locale)['custom_title'] ?: $content->translate($locale)['custom_title'] }}"
value="{{ old($locale)['custom_title'] ?? ($content->translate($locale)['custom_title'] ?? '') }}"
data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-title') }}&quot;" />
<span
@ -154,7 +154,7 @@
id="custom_heading"
v-validate="'max:100'"
name="{{$locale}}[custom_heading]"
value="{{ old($locale)['custom_heading'] ?: $content->translate($locale)['custom_title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-heading') }}&quot;" />
value="{{ old($locale)['custom_heading'] ?? $content->translate($locale)['custom_title'] }}" data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.custom-heading') }}&quot;" />
<span
class="control-error"
@ -217,7 +217,7 @@
class="control"
name="{{$locale}}[page_link]"
v-validate="'required|max:150'"
value="{{ old($locale)['page_link'] ?: $content->translate($locale)['page_link'] }}"
value="{{ old($locale)['page_link'] ?? $content->translate($locale)['page_link'] }}"
data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.page-link') }}&quot;" />
<span
@ -264,7 +264,7 @@
v-validate="'required'"
name="{{$locale}}[description]"
data-vv-as="&quot;{{ __('velocity::app.admin.contents.content.static-description') }}&quot;">
{{ old($locale)['description'] ?: $content->translate($locale)['description'] }}
{{ old($locale)['description'] ?? $content->translate($locale)['description'] }}
</textarea>
<span

3
packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
View File

@ -16,13 +16,12 @@
@if (core()->getCurrentLocale()->direction == 'rtl')
<link href="{{ asset('themes/velocity/assets/css/bootstrap-flipped.css') }}" rel="stylesheet">
@endif
@if ($favicon = core()->getCurrentChannel()->favicon_url)
<link rel="icon" sizes="16x16" href="{{ $favicon }}" />
@else
<link rel="icon" sizes="16x16" href="{{ asset('themes/velocity/assets/images/favicon.png') }}" />
<link rel="icon" sizes="16x16" href="{{ asset('/themes/velocity/assets/images/static/v-icon.png') }}" />
@endif
<script