Merge branch 'master' of https://github.com/bagisto/bagisto into development

This commit is contained in:
rahulshukla-home 2020-08-11 18:59:28 +05:30
commit c39c3a0ea1
26 changed files with 437 additions and 256 deletions

View File

@ -154,7 +154,7 @@
<?php $selectedOption = old('theme') ?: $channel->theme ?>
<select class="control" id="theme" name="theme">
@foreach (themes()->all() as $theme)
@foreach (themes()->getChannelThemes() as $theme)
<option value="{{ $theme->code }}" {{ $selectedOption == $theme->code ? 'selected' : '' }}>
{{ $theme->name }}
</option>

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=d64fdfe9e3fe3e4b9ee4",
"/css/shop.css": "/css/shop.css?id=72d87fe2508fdcd9f397"
"/css/shop.css": "/css/shop.css?id=8ef1aa65dda3180b66ee"
}

View File

@ -28,7 +28,7 @@ return [
'sort' => 4,
], [
'key' => 'account.compare',
'name' => 'velocity::app.customer.compare.text',
'name' => 'shop::app.customer.compare.text',
'route' =>'velocity.customer.product.compare',
'sort' => 5,
], [

View File

@ -4286,10 +4286,6 @@ section.review {
}
}
.checkbox {
margin: 10px 0px 5px 5px;
}
.radio {
margin: 10px 0px 5px 5px;
@ -4304,11 +4300,22 @@ section.review {
}
}
.radio-container .checkmark {
top: 2px;
left: 4px;
}
.mt-5 {
margin-top: 5px;
margin-right: 28px;
}
@media only screen and (max-width: 770px) {
.checkout-process .col-main {
padding-left: 0px;
}
}
//checkout process page end here
//customer page start here

View File

@ -176,6 +176,11 @@ return [
'dashboard' => 'الملف الشخصي',
'menu' => 'القائمة',
'general' => [
'no' => 'لا',
'yes' => 'نعم',
],
'profile' => [
'index' => [
'page-title' => 'الملف الشخصي',

View File

@ -176,6 +176,11 @@ return [
'dashboard' => 'Profil bearbeiten',
'menu' => 'Menu',
'general' => [
'no' => 'Nein',
'yes' => 'Ja',
],
'profile' => [
'index' => [
'page-title' => 'Profil',

View File

@ -176,6 +176,11 @@ return [
'dashboard' => 'Edit Profile',
'menu' => 'Menu',
'general' => [
'no' => 'No',
'yes' => 'Yes',
],
'profile' => [
'index' => [
'page-title' => 'Profile',

View File

@ -173,6 +173,11 @@ return [
'dashboard' => 'Cliente - Editar perfil',
'menu' => 'Menu',
'general' => [
'no' => 'No',
'yes' => 'si',
],
'profile' => [
'index' => [
'page-title' => 'Cliente - Perfil',

View File

@ -176,6 +176,11 @@ return [
'dashboard' => 'مشتری - ویرایش نمایه',
'menu' => 'فهرست',
'general' => [
'no' => 'نه',
'yes' => 'آره',
],
'profile' => [
'index' => [
'page-title' => 'مشتری - پروفایل',

View File

@ -174,6 +174,11 @@ return [
'dashboard' => 'Modifica Profilo',
'menu' => 'Menu',
'general' => [
'no' => 'No',
'yes' => 'sì',
],
'profile' => [
'index' => [
'page-title' => 'Profilo',

View File

@ -173,6 +173,11 @@ return [
'dashboard' => 'プロフィールを編集',
'menu' => 'メニュー',
'general' => [
'no' => '番号',
'yes' => 'はい',
],
'profile' => [
'index' => [
'page-title' => 'プロフィール',

View File

@ -181,6 +181,11 @@ return [
'dashboard' => 'Edit Profile',
'menu' => 'Menu',
'general' => [
'no' => 'Nee',
'yes' => 'Ja',
],
'profile' => [
'index' => [
'page-title' => 'Profiel',

View File

@ -174,6 +174,11 @@ return [
'dashboard' => 'Edytuj profil',
'menu' => 'Menu',
'general' => [
'no' => 'Nie',
'yes' => 'tak',
],
'profile' => [
'index' => [
'page-title' => 'Profil',

View File

@ -174,6 +174,11 @@ return [
'dashboard' => 'Cliente - Perfil',
'menu' => 'Menu',
'general' => [
'no' => 'Não',
'yes' => 'sim',
],
'profile' => [
'index' => [
'page-title' => 'Cliente - Perfil',

View File

@ -173,6 +173,11 @@ return [
'dashboard' => 'Profil Düzenle',
'menu' => 'Menü',
'general' => [
'no' => 'Hayır',
'yes' => 'Evet',
],
'profile' => [
'index' => [
'page-title' => 'Profil',

View File

@ -16,13 +16,11 @@
<div class="line-one">
<label class="radio-container">
<input v-validate="'required'" type="radio" id="{{ $payment['method'] }}" name="payment[method]" value="{{ $payment['method'] }}" v-model="payment.method" @change="methodSelected()" data-vv-as="&quot;{{ __('shop::app.checkout.onepage.payment-method') }}&quot;">
<span class="checkmark"></span>
<span class="payment-method method-label">
<b>{{ $payment['method_title'] }}</b>
</span>
</label>
<span class="payment-method method-label">
<b>{{ $payment['method_title'] }}</b>
</span>
</div>
<div class="line-two mt-5">

View File

@ -3,7 +3,7 @@
@include('shop::guest.compare.compare-products')
@section('page_title')
{{ __('velocity::app.customer.compare.compare_similar_items') }}
{{ __('shop::app.customer.compare.compare_similar_items') }}
@endsection
@section('content-wrapper')

View File

@ -4,14 +4,14 @@
$locale = request()->get('locale') ?: app()->getLocale();
$attributeOptionTranslations = DB::table(DB::getTablePrefix() . 'attribute_option_translations')->where('locale', $locale)->get()->toJson();
$attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
@endphp
@push('scripts')
<script type="text/x-template" id="compare-product-template">
<section class="comparison-component">
<h1>
{{ __('velocity::app.customer.compare.compare_similar_items') }}
{{ __('shop::app.customer.compare.compare_similar_items') }}
</h1>
<button
@ -86,6 +86,41 @@
<span v-html="product.description"></span>
@break
@default
@switch ($attribute['type'])
@case('boolean')
<span
v-text="product.product['{{ $attribute['code'] }}']
? '{{ __('shop::app.customer.account.general.yes') }}'
: '{{ __('shop::app.customer.account.general.no') }}'"
></span>
@break;
@case('file')
<a v-if="product.product['{{ $attribute['code'] }}']" :href="`${baseUrl}/storage/${product.product['{{ $attribute['code'] }}']}`">
<span v-text="product.product['{{ $attribute['code'] }}'].substr(product.product['{{ $attribute['code'] }}'].lastIndexOf('/') + 1)" class="fs16"></span>
<i class='icon sort-down-icon download'></i>
</a>
<a v-else class="fs16">__</span>
@break;
@default
<span v-html="product['{{ $attribute['code'] }}'] ? product['{{ $attribute['code'] }}'] : product.product['{{ $attribute['code'] }}'] ? product.product['{{ $attribute['code'] }}'] : '__'" class="fs16"></span>
@break;
@endswitch
@break
@case('color')
<span v-html="product.color_label" class="fs16"></span>
@break
@case('size')
<span v-html="product.size_label" class="fs16"></span>
@break
@case('description')
<span v-html="product.description"></span>
@break
@default
@switch ($attribute['type'])
@case('boolean')
@ -129,7 +164,7 @@
</template>
<span v-else-if="isProductListLoaded && products.length == 0">
{{ __('velocity::app.customer.compare.empty-text') }}
{{ __('shop::app.customer.compare.empty-text') }}
</span>
</table>
@ -188,7 +223,7 @@
})
.catch(error => {
this.isProductListLoaded = true;
console.log("{{ __('velocity::app.error.something_went_wrong') }}");
console.log("{{ __('shop::app.common.error') }}");
});
} else {
this.isProductListLoaded = true;
@ -211,7 +246,7 @@
this.$root.addFlashMessages();
})
.catch(error => {
console.log("{{ __('velocity::app.error.something_went_wrong') }}");
console.log("{{ __('shop::app.common.error') }}");
});
} else {
let existingItems = this.getStorageValue('compared_product');
@ -219,17 +254,19 @@
if (productId == "all") {
updatedItems = [];
this.$set(this, 'products', []);
window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('velocity::app.customer.compare.removed-all') }}' }];
window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed-all') }}' }];
} else {
updatedItems = existingItems.filter(item => item != productId);
this.$set(this, 'products', this.products.filter(product => product.id != productId));
window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('velocity::app.customer.compare.removed') }}' }];
window.flashMessages = [{'type': 'alert-success', 'message': '{{ __('shop::app.customer.compare.removed') }}' }];
}
this.setStorageValue('compared_product', updatedItems);
this.$root.addFlashMessages();
}
this.updateCompareCount();
},
'getDynamicHTML': function (input) {
@ -311,6 +348,28 @@
}
return attributeOptions;
},
'updateCompareCount': function () {
if (this.isCustomer == "true" || this.isCustomer == true) {
this.$http.get(`${this.baseUrl}/items-count`)
.then(response => {
$('#compare-items-count').html(response.data.compareProductsCount);
})
.catch(exception => {
window.flashMessages = [{
'type': `alert-error`,
'message': "{{ __('shop::app.common.error') }}"
}];
this.$root.addFlashMessages();
});
} else {
let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
comparedItemsCount = comparedItems ? comparedItems.length : 0;
$('#compare-items-count').html(comparedItemsCount);
}
}
}
});

View File

@ -3,7 +3,7 @@
@include('shop::guest.compare.compare-products')
@section('page_title')
{{ __('velocity::app.customer.compare.compare_similar_items') }}
{{ __('shop::app.customer.compare.compare_similar_items') }}
@endsection
@section('content-wrapper')

View File

@ -55,7 +55,7 @@
{!! view_render_event('bagisto.shop.layout.header.comppare-item.before') !!}
@php
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false
$showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false
@endphp
@if ($showCompare)
@ -70,7 +70,7 @@
@endguest
style="color: #242424;"
>
<span class="name">{{ __('velocity::app.customer.compare.text') }}</span>
<span class="name">{{ __('shop::app.customer.compare.text') }}</span>
(<span id="compare-items-count"></span>)
</a>
</li>
@ -202,7 +202,7 @@
<button style="background: none; border: none; padding: 0px;">
<i class="icon icon-search"></i>
</button>
<image-search-component></image-search-component>
<input type="search" name="term" class="search">
@ -297,7 +297,7 @@
localStorage.searched_image_url = self.uploaded_image_url;
queryString = localStorage.searched_terms = analysedResult.join('_');
self.$root.hideLoader();
window.location.href = "{{ route('shop.search.index') }}" + '?term=' + queryString + '&image-search=1';
@ -336,8 +336,22 @@
toggleDropdown(e);
});
let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
$('#compare-items-count').append(comparedItems.length);
@auth('customer')
@php
$compareCount = app('Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository')
->count([
'customer_id' => auth()->guard('customer')->user()->id,
]);
@endphp
let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
$('#compare-items-count').html({{ $compareCount }});
@endauth
@guest('customer')
let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
$('#compare-items-count').html(comparedItems ? comparedItems.length : 0);
@endguest
function toggleDropdown(e) {
var currentElement = $(e.currentTarget);

View File

@ -18,7 +18,7 @@
template: '#compare-component-template',
data: function () {
data: function () {
return {
'baseUrl': "{{ url()->to('/') }}",
'customer': '{{ auth()->guard('customer')->user() ? "true" : "false" }}' == "true",
@ -37,12 +37,12 @@
'type': `alert-${response.data.status}`,
'message': response.data.message
}];
this.$root.addFlashMessages()
}).catch(error => {
window.flashMessages = [{
'type': `alert-danger`,
'message': "{{ __('velocity::app.error.something_went_wrong') }}"
'message': "{{ __('shop::app.common.error') }}"
}];
this.$root.addFlashMessages()
@ -59,14 +59,14 @@
window.flashMessages = [{
'type': `alert-success`,
'message': "{{ __('velocity::app.customer.compare.added') }}"
'message': "{{ __('shop::app.customer.compare.added') }}"
}];
this.$root.addFlashMessages()
} else {
window.flashMessages = [{
'type': `alert-success`,
'message': "{{ __('velocity::app.customer.compare.already_added') }}"
'message': "{{ __('shop::app.customer.compare.already_added') }}"
}];
this.$root.addFlashMessages()
@ -76,12 +76,14 @@
window.flashMessages = [{
'type': `alert-success`,
'message': "{{ __('velocity::app.customer.compare.added') }}"
'message': "{{ __('shop::app.customer.compare.added') }}"
}];
this.$root.addFlashMessages()
}
}
this.updateCompareCount();
},
'getStorageValue': function (key) {
@ -99,6 +101,28 @@
return true;
},
'updateCompareCount': function () {
if (this.customer == "true" || this.customer == true) {
this.$http.get(`${this.baseUrl}/items-count`)
.then(response => {
$('#compare-items-count').html(response.data.compareProductsCount);
})
.catch(exception => {
window.flashMessages = [{
'type': `alert-error`,
'message': "{{ __('shop::app.common.error') }}"
}];
this.$root.addFlashMessages();
});
} else {
let comparedItems = JSON.parse(localStorage.getItem('compared_product'));
comparedItemsCount = comparedItems ? comparedItems.length : 0;
$('#compare-items-count').html(comparedItemsCount);
}
}
}
});
</script>

View File

@ -66,6 +66,32 @@ class Themes
return $this->themes;
}
/**
* Return list of registered themes
*
* @return array
*/
public function getChannelThemes()
{
$themes = config('themes.themes', []);
$channelThemes = [];
foreach ($themes as $code => $data) {
$channelThemes[] = new Theme(
$code,
isset($data['name']) ? $data['name'] : '',
isset($data['assets_path']) ? $data['assets_path'] : '',
isset($data['views_path']) ? $data['views_path'] : ''
);
if (isset($data['parent']) && $data['parent']) {
$parentThemes[$code] = $data['parent'];
}
}
return $channelThemes;
}
/**
* Check if specified exists
*

View File

@ -93,7 +93,6 @@ class Controller extends BaseController
* @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository
* @param \Webkul\Velocity\Repositories\Product\ProductRepository $velocityProductRepository
* @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository
* @param \Webkul\Velocity\Repositories\VelocityCustomerCompareProductRepository $compareProductsRepository
*
* @return void
*/

View File

@ -1,197 +1,199 @@
<?php
return [
'admin' => [
'admin' => [
'system' => [
'velocity' => [
'general' => 'General',
'category' => 'Category',
'settings' => 'Settings',
'extension_name' => 'Velocity Theme',
'error-module-inactive' => 'Warning: Velocity theme status is inactive',
'general' => '一般的な',
'category' => 'カテゴリー',
'settings' => '設定',
'extension_name' => '速度のテーマ',
'error-module-inactive' => '警告Velocityテーマのステータスは非アクティブです',
],
'settings' => [
'channels'=> [
'subscription_bar' => 'Subscription bar content'
'channels' => [
'subscription_bar' => 'サブスクリプションバーのコンテンツ'
],
],
'general' => [
'status' => 'Status',
'active' => 'Active',
'inactive' => 'Inactive',
'general' => [
'status' => '状態',
'active' => 'アクティブ',
'inactive' => '非活性',
],
'category' => [
'all' => 'All',
'left' => 'Left',
'right' => 'Right',
'active' => 'Active',
'custom' => 'Custom',
'inactive' => 'Inactive',
'image-alignment' => 'Image Alignment',
'icon-status' => 'Category Icon Status',
'image-status' => 'Category Image Status',
'sub-category-show' => 'Show Sub Category',
'image-height' => 'Image\'s Height [in Pixel]',
'image-width' => 'Image\'s Width [in Pixel]',
'show-tooltip' => 'Show Category\'s Tooltip',
'num-sub-category' => 'Number Of Sub Category',
'all' => 'すべて',
'left' => '左',
'right' => '正しい',
'active' => 'アクティブ',
'custom' => 'カスタム',
'inactive' => '非活性',
'image-alignment' => '画像の配置',
'icon-status' => 'カテゴリアイコンステータス',
'image-status' => 'カテゴリー画像ステータス',
'sub-category-show' => 'サブカテゴリーを表示',
'image-height' => '画像の高さ(ピクセル単位)',
'image-width' => '画像の幅[ピクセル単位]',
'show-tooltip' => 'カテゴリのツールチップを表示',
'num-sub-category' => 'サブカテゴリーの数',
]
],
'layouts' => [
'velocity' => 'Velocity',
'cms-pages' => 'CMS Pages',
'meta-data' => 'Meta Data',
'category-menu' => 'Category Menu',
'header-content' => 'Header Content',
'velocity' => '速度',
'cms-pages' => 'CMSページ',
'meta-data' => 'メタデータ',
'category-menu' => 'カテゴリーメニュー',
'header-content' => 'ヘッダーコンテンツ',
],
'contents' => [
'self' => 'Self',
'active' => 'Active',
'new-tab' => 'New Tab',
'inactive' => 'Inactive',
'title' => 'Content List',
'select' => '-- Select --',
'add-title' => 'Add Content',
'btn-add-content' => 'Add Content',
'save-btn-title' => 'Save Content',
'autocomplete' => '[Autocomplete]',
'no-result-found' => 'No record found.',
'search-hint' => 'Search product here...',
'mass-delete-success' => 'Selected content deleted successfully.',
'tab' => [
'page' => 'Page Setting',
'content' => 'Content Setting',
'meta_content' => 'Meta Data',
'self' => '自己',
'active' => 'アクティブ',
'new-tab' => '新しいタブ',
'inactive' => '非活性',
'title' => 'コンテンツリスト',
'select' => '- 選択する -',
'add-title' => 'コンテンツを追加',
'btn-add-content' => 'コンテンツを追加',
'save-btn-title' => 'コンテンツを保存',
'autocomplete' => '[オートコンプリート]',
'no-result-found' => 'レコードが見つかりません。',
'search-hint' => 'ここで製品を検索...',
'mass-delete-success' => '選択したコンテンツは正常に削除されました。',
'tab' => [
'page' => 'ページ設定',
'content' => 'コンテンツ設定',
'meta_content' => 'メタデータ',
],
'page' => [
'title' => 'Title',
'status' => 'Status',
'position' => 'Position',
'page' => [
'title' => '題名',
'status' => '状態',
'position' => 'ポジション',
],
'content' => [
'content-type' => 'Content Type',
'custom-title' => 'Custom Title',
'category-slug' => 'Category Slug',
'link-target' => 'Page Link Target',
'custom-product' => 'Store Products',
'custom-heading' => 'Custom Heading',
'catalog-type' => 'Product Catalog Type',
'static-description' => 'Content Description',
'page-link' => 'Page Link [e.g. http://example.com/../../]',
'content' => [
'content-type' => 'コンテンツタイプ',
'custom-title' => 'カスタムタイトル',
'category-slug' => 'カテゴリースラッグ',
'link-target' => 'ページリンクターゲット',
'custom-product' => 'ストア製品',
'custom-heading' => 'カスタム見出し',
'catalog-type' => '製品カタログのタイプ',
'static-description' => 'コンテンツの説明',
'page-link' => 'ページリンク[例: http://example.com/../../]',
],
'datagrid' => [
'id' => 'Id',
'title' => 'Title',
'status' => 'Status',
'position' => 'Position',
'content-type' => 'Content Type',
'datagrid' => [
'id' => 'Id',
'title' => '題名',
'status' => '状態',
'position' => 'ポジション',
'content-type' => 'コンテンツタイプ',
]
],
'meta-data' => [
'footer' => 'Footer',
'title' => 'Velocity meta data',
'activate-slider' => 'Activate Slider',
'home-page-content' => 'Home Page Content',
'footer-left-content' => 'Footer Left Content',
'subscription-content' => 'Subscription bar Content',
'sidebar-categories' => 'Sidebar Categories',
'header_content_count' => 'Header Content Count',
'footer-left-raw-content' => '<p>We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.</p>',
'slider-path' => 'Slider Path',
'category-logo' => 'Category logo',
'product-policy' => 'Product Policy',
'update-meta-data' => 'Update Meta Data',
'product-view-image' => 'Product View Image',
'advertisement-two' => 'Advertisement Two Images',
'advertisement-one' => 'Advertisement One Images',
'footer-middle-content' => 'Footer Middle Content',
'advertisement-four' => 'Advertisement Four Images',
'advertisement-three' => 'Advertisement Three Images',
'images' => 'Images',
'general' => 'General',
'add-image-btn-title' => 'Add Image'
'footer' => 'フッター',
'title' => '速度メタデータ',
'activate-slider' => 'スライダーをアクティブにする',
'home-page-content' => 'ホームページコンテンツ',
'footer-left-content' => 'フッター左コンテンツ',
'subscription-content' => 'サブスクリプションバーのコンテンツ',
'sidebar-categories' => 'サイドバーのカテゴリ',
'header_content_count' => 'ヘッダーコンテンツ数',
'footer-left-raw-content' => '<p>私たちはソフトウェアを作成し、バイナリで現実世界の問題を解決するのが大好きです。私達は私達の目標に非常にコミットしています。私たちはリソースを投資して、最先端のテクノロジーの専門知識を活用し、一流のエンタープライズビジネス向けの使いやすいソフトウェアとアプリケーションを作成します。</p>',
'slider-path' => 'スライダーパス',
'category-logo' => 'カテゴリーロゴ',
'product-policy' => '製品ポリシー',
'update-meta-data' => 'メタデータを更新',
'product-view-image' => '製品ビュー画像',
'advertisement-two' => '広告2つの画像',
'advertisement-one' => '広告1つの画像',
'footer-middle-content' => 'フッターミドルコンテンツ',
'advertisement-four' => '広告4つの画像',
'advertisement-three' => '広告3つの画像',
'images' => '画像',
'general' => '一般的な',
'add-image-btn-title' => '画像を追加'
],
'category' => [
'save-btn-title' => 'Save Menu',
'title' => 'Category Menu List',
'add-title' => 'Add Menu Content',
'edit-title' => 'Edit Menu Content',
'btn-add-category' => 'Add Category Content',
'datagrid' => [
'category-id' => 'Category Id',
'category-name' => 'Category Name',
'category-icon' => 'Category Icon',
'category-status' => 'Status',
'save-btn-title' => '保存メニュー',
'title' => 'カテゴリーメニュー一覧',
'add-title' => 'メニューコンテンツを追加',
'edit-title' => 'メニューコンテンツの編集',
'btn-add-category' => 'カテゴリコンテンツを追加',
'datagrid' => [
'category-id' => 'カテゴリID',
'category-name' => '種別名',
'category-icon' => 'カテゴリーアイコン',
'category-status' => '状態',
],
'tab' => [
'general' => 'General',
'tab' => [
'general' => '一般的な',
],
'status' => 'Status',
'active' => 'Active',
'inactive' => 'Inactive',
'select' => '-- Select --',
'icon-class' => 'Icon Class',
'select-category' => 'Choose Category',
'tooltip-content' => 'Tooltip Content',
'mass-delete-success' => 'Selected categories menu deleted successfully.',
'status' => '状態',
'active' => 'アクティブ',
'inactive' => '非活性',
'select' => '- 選択する -',
'icon-class' => 'アイコンクラス',
'select-category' => 'カテゴリーを選択',
'tooltip-content' => 'ツールチップの内容',
'mass-delete-success' => '選択したカテゴリメニューを削除しました。',
],
'general' => [
'locale_logo' => 'Locale Logo',
'locale_logo' => 'ロケールロゴ',
],
],
'home' => [
'view-all' => 'View All',
'add-to-cart' => 'Add To Cart',
'hot-categories' => 'Hot Categories',
'payment-methods' => 'Payment Methods',
'customer-reviews' => 'Customer Reviews',
'shipping-methods' => 'Shipping Methods',
'popular-categories' => 'Popular Categories',
'home' => [
'view-all' => 'すべてを見る',
'add-to-cart' => 'カートに追加',
'hot-categories' => '人気のカテゴリ',
'payment-methods' => 'お支払い方法',
'customer-reviews' => 'カスタマーレビュー',
'shipping-methods' => '輸送方法',
'popular-categories' => '人気のカテゴリー',
],
'header' => [
'cart' => 'Cart',
'cart' => 'Cart',
'guest' => 'Guest',
'logout' => 'Logout',
'title' => 'Account',
'account' => 'Account',
'profile' => 'Profile',
'wishlist' => 'Wishlist',
'all-categories' => 'All Categories',
'search-text' => 'Search products here',
'welcome-message' => 'Welcome, :customer_name',
'dropdown-text' => 'Manage Cart, Orders & Wishlist',
'header' => [
'cart' => 'カート',
'guest' => 'ゲスト',
'logout' => 'ログアウト',
'title' => 'アカウント',
'account' => 'アカウント',
'profile' => 'プロフィール',
'wishlist' => 'ウィッシュリスト',
'all-categories' => 'すべてのカテゴリ',
'search-text' => 'ここで製品を検索',
'welcome-message' => 'ようこそ、:customer_name',
'dropdown-text' => 'カート、注文、ウィッシュリストを管理する',
],
'menu-navbar' => [
'text-more' => 'More',
'text-category' => 'Shop by Category',
'menu-navbar' => [
'text-more' => 'もっと',
'text-category' => 'カテゴリーで選ぶ',
],
'minicart' => [
'cart' => 'Cart',
'view-cart' => 'View Cart',
'minicart' => [
'cart' => 'カート',
'view-cart' => 'カート',
],
'checkout' => [
'qty' => 'Qty',
'checkout' => 'Checkout',
'checkout' => [
'qty' => '数量',
'checkout' => 'チェックアウト',
'cart' => [
'view-cart' => 'View Cart',
'cart-summary' => 'Cart Summary',
'view-cart' => 'かごの中身を見る',
'cart-summary' => 'カートの概要',
],
'qty' => 'Qty',
'items' => 'Items',
'subtotal' => 'Subtotal',
'sub-total' => 'Sub Total',
'proceed' => 'Proceed to checkout',
'qty' => '数量',
'items' => 'アイテム',
'subtotal' => '小計',
'sub-total' => '小計',
'proceed' => 'チェックアウトに進む',
],
'customer' => [
'customer' => [
'compare' => [
'text' => '比較する',
'compare_similar_items' => '類似アイテムを比較する',
@ -200,85 +202,84 @@ return [
'already_added' => 'アイテムは比較リストに既に追加されています',
'removed' => '比較リストからアイテムを削除しました',
'empty-text' => "比較リストにアイテムがありません",
'product_image' => 'Product Image',
'actions' => 'Actions',
'product_image' => '商品画像',
'actions' => '行動',
],
'login-form' => [
'sign-up' => 'Sign up',
'new-customer' => 'New Customer',
'customer-login' => 'Customer Login',
'registered-user' => 'Registered User',
'your-email-address' => 'Your email address',
'form-login-text' => 'If you have an account, sign in with your email address.',
'sign-up' => 'サインアップ',
'new-customer' => '新規のお客様',
'customer-login' => 'お客様ログイン',
'registered-user' => '登録ユーザー',
'your-email-address' => 'メールアドレス',
'form-login-text' => 'アカウントをお持ちの場合は、メールアドレスでログインしてください。',
],
'signup-form' => [
'login' => 'Login',
'become-user' => 'Become User',
'user-registration' => 'User Registration',
'form-sginup-text' => 'If you are new to our store, we glad to have you as member.',
'login' => 'ログインする',
'become-user' => 'ユーザーになる',
'user-registration' => 'ユーザー登録',
'form-sginup-text' => 'あなたが私たちの店に初めている場合は、メンバーとして喜んでいます。',
],
'forget-password' => [
'login' => 'Login',
'forgot-password' => 'Forgot Password',
'recover-password' => 'Recover Password',
'recover-password-text' => 'If you forgot your password, recover it by entering your email address.',
'login' => 'ログインする',
'forgot-password' => 'パスワードをお忘れですか',
'recover-password' => 'パスワードを回復',
'recover-password-text' => 'パスワードを忘れた場合は、メールアドレスを入力してパスワードを回復してください。',
]
],
'error' => [
'go-to-home' => 'Go to home',
'page-lost-short' => 'Page lost content',
'something_went_wrong' => 'something went wrong',
'page-lost-description' => "The page you're looking for isn't available. Try to search again or use the Go Back button below.",
'error' => [
'go-to-home' => '家に帰る',
'page-lost-short' => 'ページが失われたコンテンツ',
'something_went_wrong' => '問題が発生しました',
'page-lost-description' => "お探しのページはご利用いただけません。もう一度検索するか、下の[戻る]ボタンを使用してください。",
],
'products' => [
'text' => 'Products',
'details' => 'Details',
'reviews-title' => 'Reviews',
'reviewed' => 'Reviewed',
'review-by' => 'Review by',
'quick-view' => 'Quick View',
'not-available' => 'Not Available',
'submit-review' => 'Submit Review',
'ratings' => ':totalRatings Ratings',
'reviews-count' => ':totalReviews Reviews',
'customer-rating' => 'Customer Rating',
'more-infomation' => 'More Information',
'view-all-reviews' => 'View All Reviews',
'write-your-review' => 'Write Your Review',
'short-description' => 'Short Descriptions',
'recently-viewed' => 'Recently Viewed Products',
'be-first-review' => 'Be the first to write a review',
'products' => [
'text' => '製品',
'details' => '細部',
'reviews-title' => 'レビュー',
'reviewed' => '審査',
'review-by' => 'によるレビュー',
'quick-view' => 'クイックビュー',
'not-available' => '利用不可',
'submit-review' => 'レビュー送信',
'ratings' => ':totalRatings 評価',
'reviews-count' => ':totalReviews レビュー',
'customer-rating' => 'お客様の評価',
'more-infomation' => '詳しくは',
'view-all-reviews' => 'すべてのレビューを表示',
'write-your-review' => 'レビューを書く',
'short-description' => '短い説明',
'recently-viewed' => '最近見た製品',
'be-first-review' => '最初のレビューを書く',
],
'shop' => [
'shop' => [
'gender' => [
'male' => 'Male',
'other' => 'Other',
'female' => 'Female',
'male' => '男性',
'other' => 'その他の',
'female' => '女性',
],
'general' => [
'no' => 'No',
'yes' => 'Yes',
'view' => 'View',
'filter' => 'Filter',
'orders' => 'Orders',
'update' => 'Update',
'reviews' => 'Reviews',
'currencies' => 'Currencies',
'addresses' => 'Addresses',
'top-brands' => 'Top Brands',
'new-password' => 'New password',
'downloadables' => 'Downloadable Products',
'confirm-new-password' => 'Confirm new password',
'enter-current-password' => 'Enter your current password',
'no' => '番号',
'yes' => 'はい',
'view' => '見る',
'filter' => 'フィルタ',
'orders' => '注文',
'update' => '更新',
'reviews' => 'レビュー',
'currencies' => '通貨',
'addresses' => '住所',
'top-brands' => 'トップブランド',
'new-password' => '新しいパスワード',
'downloadables' => 'ダウンロード可能な製品',
'confirm-new-password' => '新しいパスワードを確認',
'enter-current-password' => '現在のパスワードを入力してください',
'alert' => [
'info' => 'Info',
'error' => 'Error',
'success' => 'Success',
'warning' => 'Warning',
'info' => '情報',
'error' => 'エラー',
'success' => '成功',
'warning' => '警告',
],
],
'wishlist' => [
@ -287,13 +288,11 @@ return [
]
],
'responsive' => [
'responsive' => [
'header' => [
'done' => 'Done',
'languages' => 'Languages',
'greeting' => 'Welcome, :customer !',
'done' => 'できた',
'languages' => '言語',
'greeting' => 'ようこそ、:customer !',
]
],
]
?>
];

View File

@ -4,7 +4,7 @@
$locale = request()->get('locale') ?: app()->getLocale();
$attributeOptionTranslations = DB::table(DB::getTablePrefix() . 'attribute_option_translations')->where('locale', $locale)->get()->toJson();
$attributeOptionTranslations = DB::table('attribute_option_translations')->where('locale', $locale)->get()->toJson();
@endphp
@push('css')