diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php index 32b8e7d2..08a56b81 100644 --- a/resources/beike/admin/views/pages/setting.blade.php +++ b/resources/beike/admin/views/pages/setting.blade.php @@ -38,6 +38,9 @@
+ + +
@@ -87,7 +90,6 @@ -
{{ __('admin/setting.tax_address_info') }}
 diff --git a/resources/beike/shop/default/js/common.js b/resources/beike/shop/default/js/common.js index 77d3d71e..7a03cc99 100644 --- a/resources/beike/shop/default/js/common.js +++ b/resources/beike/shop/default/js/common.js @@ -32,7 +32,7 @@ export default { * @return {*} 返回Promise */ addCart({sku_id, quantity = 1, isBuyNow = false}, event) { - if (!isLogin) { + if (!config.isLogin && !config.guestCheckout) { this.openLogin() return; } @@ -52,7 +52,7 @@ export default { }, addWishlist(id, event) { - if (!isLogin) { + if (!config.isLogin && !config.guestCheckout) { this.openLogin() return; } diff --git a/resources/lang/de/admin/setting.php b/resources/lang/de/admin/setting.php index 2844bd06..f3e3fc7f 100644 --- a/resources/lang/de/admin/setting.php +++ b/resources/lang/de/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => 'Grundeinstellungen', 'store_settings' => 'Store-Einstellungen', 'picture_settings' => 'Bildeinstellungen', + 'use_queue' => 'ob die Warteschlange verwendet werden soll', + 'mail_settings' => 'Mail-Einstellungen', + 'mail_engine' => 'Mail-Engine', + 'smtp_host' => 'host', + 'smtp_username' => 'Benutzer', + 'smtp_encryption' => 'Verschlüsselungsmethode', + 'smtp_encryption_info' => 'SSL oder TLS', + 'smtp_password' => 'Passwort', + 'smtp_password_info' => 'SMTP-Passwort festlegen. Für Gmail siehe: https://security.google.com/settings/security/apppasswords', + 'smtp_port' => 'Anschluss', + 'smtp_timeout' => 'Zeitüberschreitung', + 'sendmail_path' => 'Ausführungspfad', + 'mailgun_domain' => 'Domänenname', + 'mailgun_secret' => 'Schlüssel', + 'mailgun_endpoint' => 'port', + 'mail_log' => 'Beschreibung: Die Log-Engine wird generell zu Testzwecken verwendet! Die E-Mail wird nicht tatsächlich an die Empfängeradresse gesendet, und der E-Mail-Inhalt wird in „/storage/logs/laravel.log“ in Form eines Protokolls gespeichert.', + 'guest_checkout' => 'Besucherkasse', 'theme_default' => 'Standardthema', 'theme_black' => 'schwarzes Thema', 'shipping_address' => 'Lieferadresse', diff --git a/resources/lang/en/admin/setting.php b/resources/lang/en/admin/setting.php index a2a00af0..a4be8861 100644 --- a/resources/lang/en/admin/setting.php +++ b/resources/lang/en/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => 'Basic Settings', 'store_settings' => 'Store Settings', 'picture_settings' => 'Picture Settings', + 'use_queue' => 'whether to use the queue', + 'mail_settings' => 'mail settings', + 'mail_engine' => 'mail engine', + 'smtp_host' => 'host', + 'smtp_username' => 'user', + 'smtp_encryption' => 'encryption method', + 'smtp_encryption_info' => 'SSL or TLS', + 'smtp_password' => 'password', + 'smtp_password_info' => 'Set SMTP password. For Gmail, please refer to: https://security.google.com/settings/security/apppasswords', + 'smtp_port' => 'port', + 'smtp_timeout' => 'timeout', + 'sendmail_path' => 'execution path', + 'mailgun_domain' => 'domain name', + 'mailgun_secret' => 'Key', + 'mailgun_endpoint' => 'port', + 'mail_log' => 'Description: The log engine is generally used for testing purposes! The email will not be actually sent to the recipient address, and the email content will be saved in `/storage/logs/laravel.log` in the form of a log', + 'guest_checkout' => 'visitor checkout', 'theme_default' => 'Default Theme', 'theme_black' => 'Black Theme', 'shipping_address' => 'Shipping Address', diff --git a/resources/lang/es/admin/setting.php b/resources/lang/es/admin/setting.php index ddbbc268..9f9c5c16 100644 --- a/resources/lang/es/admin/setting.php +++ b/resources/lang/es/admin/setting.php @@ -21,6 +21,24 @@ return [ 'basic_settings' => 'configuraciones básicas', 'store_settings' => 'configuración de la tienda', 'picture_settings' => 'configuraciones de imagen', + 'use_queue' => 'si usar la cola', + 'mail_settings' => 'configuraciones de correo', + 'mail_engine' => 'motor de correo', + 'smtp_host' => 'anfitrión', + 'smtp_username' => 'usuario', + 'smtp_encryption' => 'método de cifrado', + 'smtp_encryption_info' => 'SSL o TLS', + 'smtp_password' => 'contraseña', + 'smtp_password_info' => 'Establecer contraseña SMTP. Para Gmail, consulte: https://security.google.com/settings/security/apppasswords', + 'smtp_port' => 'puerto', + 'smtp_timeout' => 'tiempo de espera', + 'sendmail_path' => 'ruta de ejecución', + 'mailgun_domain' => 'nombre de dominio', + 'mailgun_secret' => 'Clave', + 'mailgun_endpoint' => 'puerto', + 'mail_log' => 'Descripción: ¡El motor de registro generalmente se usa con fines de prueba! El correo electrónico no se enviará realmente a la dirección del destinatario, y el contenido del correo electrónico se guardará en `/storage/logs/laravel.log`\' en forma de registro', + + 'guest_checkout' => 'pago de visitante', 'theme_default' => 'tema predeterminado', 'theme_black' => 'tema negro', diff --git a/resources/lang/fr/admin/setting.php b/resources/lang/fr/admin/setting.php index c79df67f..6acdd270 100644 --- a/resources/lang/fr/admin/setting.php +++ b/resources/lang/fr/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => 'paramètres de base', 'store_settings' => 'paramètres du magasin', 'picture_settings' => 'paramètres de l\'image', + 'use_queue' => 'utiliser ou non la file d\'attente', + 'mail_settings' => 'paramètres de messagerie', + 'mail_engine' => 'moteur de messagerie', + 'smtp_host' => 'hôte', + 'smtp_username' => 'utilisateur', + 'smtp_encryption' => 'méthode de cryptage', + 'smtp_encryption_info' => 'SSL ou TLS', + 'smtp_password' => 'mot de passe', + 'smtp_password_info' => 'Définir le mot de passe SMTP. Pour Gmail, veuillez vous référer à : https://security.google.com/settings/security/apppasswords', + 'smtp_port' => 'port', + 'smtp_timeout' => 'délai d\'expiration', + 'sendmail_path' => 'chemin d\'exécution', + 'mailgun_domain' => 'nom de domaine', + 'mailgun_secret' => 'Clé', + 'mailgun_endpoint' => 'port', + 'mail_log' => 'Description: Le moteur de journalisation est généralement utilisé à des fins de test! L\'e-mail ne sera pas réellement envoyé à l\'adresse du destinataire, et le contenu de l\'e-mail sera enregistré dans `/storage/logs/laravel.log`\' sous la forme d\'un journal', + 'guest_checkout' => 'paiement des visiteurs', 'theme_default' => 'thème par défaut', 'theme_black' => 'thème noir', 'shipping_address' => 'adresse de livraison', diff --git a/resources/lang/it/admin/setting.php b/resources/lang/it/admin/setting.php index 4166b037..8df41b2f 100644 --- a/resources/lang/it/admin/setting.php +++ b/resources/lang/it/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => 'impostazioni di base', 'store_settings' => 'impostazioni negozio', 'picture_settings' => 'impostazioni immagine', + 'use_queue' => 'se utilizzare la coda', + 'mail_settings' => 'impostazioni posta', + 'mail_engine' => 'motore di posta', + 'smtp_host' => 'host', + 'smtp_username' => 'utente', + 'smtp_encryption' => 'metodo di crittografia', + 'smtp_encryption_info' => 'SSL o TLS', + 'smtp_password' => 'password', + 'smtp_password_info' => 'Imposta password SMTP. Per Gmail, fare riferimento a: https://security.google.com/settings/security/apppasswords', + 'smtp_port' => 'porta', + 'smtp_timeout' => 'timeout', + 'sendmail_path' => 'percorso di esecuzione', + 'mailgun_domain' => 'nome dominio', + 'mailgun_secret' => 'Chiave', + 'mailgun_endpoint' => 'porta', + 'mail_log' => 'Descrizione: Il motore di log è generalmente utilizzato a scopo di test! L\'e-mail non verrà effettivamente inviata all\'indirizzo del destinatario e il contenuto dell\'e-mail verrà salvato in `/storage/logs/laravel.log`\' sotto forma di registro', + 'guest_checkout' => 'checkout visitatore', 'theme_default' => 'tema predefinito', 'theme_black' => 'tema nero', 'shipping_address' => 'indirizzo di spedizione', diff --git a/resources/lang/ja/admin/setting.php b/resources/lang/ja/admin/setting.php index 6352b77f..e53f7dc3 100644 --- a/resources/lang/ja/admin/setting.php +++ b/resources/lang/ja/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => '基本設定', 'store_settings' => 'ストア設定', 'picture_settings' => '画像設定', + 'use_queue' => 'キューを使用するかどうか', + 'mail_settings' => 'メール設定', + 'mail_engine' => 'メールエンジン', + 'smtp_host' => 'ホスト', + 'smtp_username' => 'ユーザー', + 'smtp_encryption' => '暗号化方式', + 'smtp_encryption_info' => 'SSL または TLS', + 'smtp_password' => 'パスワード', + 'smtp_password_info' => 'SMTP パスワードを設定します。 Gmail については、https://security.google.com/settings/security/apppasswords を参照してください'。 + 'smtp_port' => 'ポート', + 'smtp_timeout' => 'タイムアウト', + 'sendmail_path' => '実行パス', + 'mailgun_domain' => 'ドメイン名', + 'mailgun_secret' => '鍵', + 'mailgun_endpoint' => 'ポート', + 'mail_log' => '説明: ログ エンジンは通常、テスト目的で使用されます! メールは実際に受信者アドレスに送信されるわけではなく、メールの内容は「/storage/logs/laravel.log」にログとして保存されますが、', + 'guest_checkout' => '訪問者チェックアウト', 'theme_default' => 'デフォルトのテーマ', 'theme_black' => '黒のテーマ', 'shipping_address' => '配送先住所', diff --git a/resources/lang/ru/admin/setting.php b/resources/lang/ru/admin/setting.php index 1c93e84d..c26c3100 100644 --- a/resources/lang/ru/admin/setting.php +++ b/resources/lang/ru/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => 'Базовые настройки', 'store_settings' => 'Настройки магазина', 'picture_settings' => 'Настройки изображения', + 'use_queue' => 'использовать ли очередь', + 'mail_settings' => 'настройки почты', + 'mail_engine' => 'почтовый движок', + 'smtp_host' => 'хост', + 'smtp_username' => 'пользователь', + 'smtp_encryption' => 'метод шифрования', + 'smtp_encryption_info' => 'SSL или TLS', + 'smtp_password' => 'пароль', + 'smtp_password_info' => 'Установить пароль SMTP. Для Gmail см.: https://security.google.com/settings/security/apppasswords', + 'smtp_port' => 'порт', + 'smtp_timeout' => 'время ожидания', + 'sendmail_path' => 'путь выполнения', + 'mailgun_domain' => 'имя домена', + 'mailgun_secret' => 'Ключ', + 'mailgun_endpoint' => 'порт', + 'mail_log' => 'Описание: Механизм ведения журнала обычно используется в целях тестирования! На самом деле электронное письмо не будет отправлено на адрес получателя, а содержимое электронного письма будет сохранено в `/storage/logs/laravel.log` в виде журнала', + 'guest_checkout' => 'оформить заказ посетителя', 'theme_default' => 'Тема по умолчанию', 'theme_black' => 'черная тема', 'shipping_address' => 'адресс доставки', diff --git a/resources/lang/zh_cn/admin/setting.php b/resources/lang/zh_cn/admin/setting.php index 00769136..26feb6e3 100644 --- a/resources/lang/zh_cn/admin/setting.php +++ b/resources/lang/zh_cn/admin/setting.php @@ -38,6 +38,7 @@ return [ 'mailgun_endpoint' => '端口', 'mail_log' => '说明：日志引擎一般用于测试目的！邮件将不会被真实发送至收件地址，邮件内容会以日志形式保存在 `/storage/logs/laravel.log`', + 'guest_checkout' => '游客结账', 'theme_default' => '默认主题', 'theme_black' => '黑色主题', 'shipping_address' => '发货地址', diff --git a/resources/lang/zh_hk/admin/setting.php b/resources/lang/zh_hk/admin/setting.php index 31f8a252..1f97ada8 100644 --- a/resources/lang/zh_hk/admin/setting.php +++ b/resources/lang/zh_hk/admin/setting.php @@ -21,7 +21,24 @@ return [ 'basic_settings' => '基礎設置', 'store_settings' => '商店設置', 'picture_settings' => '圖片設置', + 'use_queue' => '是否使用隊列', + 'mail_settings' => '郵件設置', + 'mail_engine' => '郵件引擎', + 'smtp_host' => '主機', + 'smtp_username' => '用戶', + 'smtp_encryption' => '加密方式', + 'smtp_encryption_info' => 'SSL 或者 TLS', + 'smtp_password' => '密碼', + 'smtp_password_info' => '設置 SMTP 密碼。 Gmail 請參考：https://security.google.com/settings/security/apppasswords', + 'smtp_port' => '端口', + 'smtp_timeout' => '超時', + 'sendmail_path' => '執行路徑', + 'mailgun_domain' => '域名', + 'mailgun_secret' => '密鑰', + 'mailgun_endpoint' => '端口', + 'mail_log' => '說明：日誌引擎一般用於測試目的！郵件將不會被真實發送至收件地址，郵件內容會以日誌形式保存在 `/storage/logs/laravel.log`', + 'guest_checkout' => '遊客結賬', 'theme_default' => '默認主題', 'theme_black' => '黑色主題', 'shipping_address' => '發貨地址', diff --git a/themes/default/checkout.blade.php b/themes/default/checkout.blade.php index 13009b8e..cc0ecd78 100644 --- a/themes/default/checkout.blade.php +++ b/themes/default/checkout.blade.php @@ -287,7 +287,7 @@ addresses: @json($addresses ?? []), guest_shipping_address: @json($current['guest_shipping_address'] ?? null), guest_payment_address: @json($current['guest_payment_address'] ?? null), - isLogin: @json(current_customer(), null), + isLogin: config.isLogin, }, dialogAddress: { @@ -346,7 +346,7 @@ const type = form.id ? 'put' : 'post'; const url = `/account/addresses${type == 'put' ? '/' + form.id : ''}`; - if (!isLogin) { + if (!this.source.isLogin) { let data = {[this.dialogAddress.type]: form} if (this.source.guest_payment_address === null && this.source.guest_shipping_address === null) { diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php index acd63716..3268e780 100644 --- a/themes/default/layout/master.blade.php +++ b/themes/default/layout/master.blade.php @@ -9,13 +9,13 @@ - + - - + + @if (system_setting('base.head_code')) {!! system_setting('base.head_code') !!} @endif @@ -33,7 +33,10 @@ @endif @stack('add-scripts')