From 434d94c01d3d5cf129f302756c86610b5c966f80 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Tue, 10 Jan 2023 14:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8laravel/pint=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Kernel.php | 4 +- app/Exceptions/Handler.php | 16 +- app/Http/Kernel.php | 26 +- app/Http/Middleware/Authenticate.php | 2 +- app/Http/Middleware/CheckoutAuthenticate.php | 14 +- .../Middleware/RedirectIfAuthenticated.php | 6 +- app/Http/Middleware/SetLocaleAdmin.php | 1 + app/Http/Middleware/SetLocaleFromSession.php | 1 + app/Http/Middleware/SetLocaleInstaller.php | 7 +- app/Http/Middleware/ShareViewData.php | 18 +- app/Http/Middleware/ShopAuthenticate.php | 13 +- app/Http/Middleware/TrustProxies.php | 6 +- app/Http/Requests/ContactRequest.php | 2 +- .../Admin/Database/Seeders/ProductSeeder.php | 54 +-- .../Http/Controllers/AddressController.php | 3 +- .../Http/Controllers/AdminRoleController.php | 23 +- .../Http/Controllers/AdminUserController.php | 15 +- .../Http/Controllers/AttributeController.php | 23 +- .../Controllers/AttributeGroupController.php | 7 +- .../Http/Controllers/BrandController.php | 8 +- .../Http/Controllers/CategoryController.php | 26 +- beike/Admin/Http/Controllers/Controller.php | 30 +- .../Http/Controllers/CountryController.php | 1 - .../Http/Controllers/CurrencyController.php | 28 +- .../Http/Controllers/CustomerController.php | 28 +- .../Controllers/CustomerGroupController.php | 11 +- .../Http/Controllers/DesignController.php | 30 +- .../Controllers/DesignFooterController.php | 15 +- .../Http/Controllers/DesignMenuController.php | 9 +- .../Controllers/FileManagerController.php | 30 +- .../Http/Controllers/ForgottenController.php | 1 + .../Admin/Http/Controllers/HomeController.php | 12 +- .../Http/Controllers/LanguageController.php | 6 +- .../Http/Controllers/LoginController.php | 5 +- .../Http/Controllers/LogoutController.php | 1 + .../Http/Controllers/MarketingController.php | 28 +- .../Http/Controllers/OrderController.php | 33 +- .../Http/Controllers/PagesController.php | 36 +- .../Http/Controllers/PluginController.php | 25 +- .../Http/Controllers/ProductController.php | 55 ++- .../Http/Controllers/RegionController.php | 18 +- .../Admin/Http/Controllers/RmaController.php | 21 +- .../Http/Controllers/RmaReasonController.php | 5 +- .../Http/Controllers/SettingController.php | 23 +- .../Http/Controllers/TaxClassController.php | 15 +- .../Http/Controllers/TaxRateController.php | 13 +- .../Admin/Http/Controllers/ZoneController.php | 4 +- .../Admin/Http/Requests/AdminUserRequest.php | 2 +- beike/Admin/Http/Requests/CurrencyRequest.php | 20 +- .../Http/Requests/CustomerGroupRequest.php | 4 +- beike/Admin/Http/Requests/CustomerRequest.php | 13 +- .../Admin/Http/Requests/ForgottenRequest.php | 2 +- beike/Admin/Http/Requests/LoginRequest.php | 4 +- beike/Admin/Http/Requests/PageRequest.php | 6 +- beike/Admin/Http/Requests/ProductRequest.php | 16 +- beike/Admin/Http/Requests/RmaRequest.php | 25 +- beike/Admin/Http/Requests/TaxRateRequest.php | 8 +- .../Admin/Http/Resources/AddressResource.php | 20 +- .../Admin/Http/Resources/AdminUserDetail.php | 10 +- .../Resources/AttributeDetailResource.php | 16 +- .../Http/Resources/AttributeResource.php | 10 +- .../Http/Resources/AttributeValueResource.php | 10 +- .../Http/Resources/AutocompleteResource.php | 4 +- .../Admin/Http/Resources/CategoryResource.php | 14 +- .../Http/Resources/CustomerGroupDetail.php | 16 +- .../Admin/Http/Resources/CustomerResource.php | 20 +- beike/Admin/Http/Resources/OrderSimple.php | 12 +- beike/Admin/Http/Resources/PluginResource.php | 22 +- .../Resources/ProductAttributeResource.php | 8 +- .../Admin/Http/Resources/ProductResource.php | 18 +- beike/Admin/Http/Resources/RmaDetail.php | 30 +- .../Admin/Http/Resources/RmaHistoryDetail.php | 10 +- .../Admin/Http/Resources/RmaReasonDetail.php | 7 +- beike/Admin/Http/Resources/TaxClassDetail.php | 12 +- .../Admin/Providers/AdminServiceProvider.php | 76 ++- beike/Admin/Repositories/AdminRoleRepo.php | 9 +- beike/Admin/Repositories/AdminUserRepo.php | 26 +- .../Admin/Repositories/AttributeGroupRepo.php | 4 +- beike/Admin/Repositories/AttributeRepo.php | 15 +- beike/Admin/Repositories/DashboardRepo.php | 33 +- beike/Admin/Repositories/PageRepo.php | 22 +- beike/Admin/Repositories/PermissionRepo.php | 97 ++-- beike/Admin/Repositories/RegionRepo.php | 9 +- .../Repositories/Report/OrderReportRepo.php | 53 +- beike/Admin/Repositories/TaxClassRepo.php | 11 +- beike/Admin/Repositories/TaxRateRepo.php | 10 +- beike/Admin/Routes/admin.php | 22 - beike/Admin/Services/AddressService.php | 33 +- beike/Admin/Services/CategoryService.php | 38 +- beike/Admin/Services/CustomerGroupService.php | 25 +- beike/Admin/Services/CustomerService.php | 9 +- beike/Admin/Services/FileManagerService.php | 48 +- beike/Admin/Services/LanguageService.php | 21 +- beike/Admin/Services/MarketingService.php | 22 +- beike/Admin/Services/ProductService.php | 17 +- beike/Admin/Services/UserService.php | 10 +- beike/Admin/View/Components/Alert.php | 5 +- beike/Admin/View/Components/Filter.php | 3 +- beike/Admin/View/Components/Form/Image.php | 4 +- beike/Admin/View/Components/Form/Input.php | 21 +- .../View/Components/Form/InputLocale.php | 17 +- beike/Admin/View/Components/Form/Select.php | 15 +- .../View/Components/Form/SwitchRadio.php | 4 +- beike/Admin/View/Components/Form/Textarea.php | 12 +- beike/Admin/View/Components/Header.php | 26 +- beike/Admin/View/Components/Sidebar.php | 64 +-- beike/Admin/View/DesignBuilders/Brand.php | 2 +- beike/Admin/View/DesignBuilders/Image100.php | 2 +- beike/Admin/View/DesignBuilders/Image401.php | 2 +- beike/Admin/View/DesignBuilders/SlideShow.php | 10 +- .../Admin/View/DesignBuilders/TabProduct.php | 2 +- beike/Config/beike.php | 2 +- .../Console/Commands/GenerateDatabaseDict.php | 12 +- beike/Console/Commands/MakeRootAdminUser.php | 12 +- beike/Console/Commands/Sitemap.php | 1 - beike/Helpers.php | 102 ++-- .../Controllers/DatabaseController.php | 29 +- .../Controllers/EnvironmentController.php | 38 +- .../Installer/Controllers/FinalController.php | 14 +- .../Controllers/PermissionsController.php | 2 +- .../Controllers/RequirementsController.php | 2 +- .../Controllers/WelcomeController.php | 7 +- beike/Installer/Helpers/DatabaseManager.php | 12 +- .../Installer/Helpers/EnvironmentManager.php | 6 +- .../Installer/Helpers/FinalInstallManager.php | 6 +- .../Helpers/InstalledFileManager.php | 6 +- beike/Installer/Helpers/MigrationsHelper.php | 2 +- .../Installer/Helpers/PermissionsChecker.php | 4 +- .../Installer/Helpers/RequirementsChecker.php | 14 +- beike/Installer/Helpers/functions.php | 4 +- .../Installer/Lang/en/installer_messages.php | 169 ++++--- .../Lang/zh_cn/installer_messages.php | 113 +++-- .../Providers/InstallerServiceProvider.php | 4 +- beike/Installer/Routes/installer.php | 1 - beike/Installer/config.php | 40 +- beike/Libraries/Notification.php | 3 +- beike/Libraries/Tax.php | 64 +-- beike/Mail/CustomerForgotten.php | 5 +- beike/Mail/CustomerNewOrder.php | 3 +- beike/Mail/CustomerRegistration.php | 2 +- beike/Mail/CustomerUpdateOrder.php | 6 +- beike/Mail/UserForgotten.php | 5 +- beike/Models/Address.php | 3 +- beike/Models/AdminUser.php | 7 +- beike/Models/Attribute.php | 13 +- beike/Models/AttributeDescription.php | 4 - beike/Models/AttributeGroup.php | 9 +- beike/Models/AttributeGroupDescription.php | 3 - beike/Models/AttributeValue.php | 9 +- beike/Models/AttributeValueDescription.php | 4 - beike/Models/Brand.php | 5 +- beike/Models/Cart.php | 4 +- beike/Models/Category.php | 10 +- beike/Models/Country.php | 1 - beike/Models/Currency.php | 2 - beike/Models/Customer.php | 12 +- beike/Models/CustomerGroup.php | 2 - beike/Models/Language.php | 2 - beike/Models/Order.php | 6 +- beike/Models/OrderHistory.php | 2 +- beike/Models/OrderProduct.php | 1 - beike/Models/OrderShipment.php | 3 +- beike/Models/OrderTotal.php | 2 +- beike/Models/Page.php | 5 +- beike/Models/PageDescription.php | 2 +- beike/Models/Plugin.php | 4 +- beike/Models/Product.php | 19 +- beike/Models/ProductAttribute.php | 10 +- beike/Models/ProductCategory.php | 2 +- beike/Models/ProductRelation.php | 2 +- beike/Models/ProductSku.php | 12 +- beike/Models/Region.php | 3 +- beike/Models/Rma.php | 14 +- beike/Models/RmaHistory.php | 1 - beike/Models/RmaReason.php | 3 +- beike/Models/Setting.php | 3 +- beike/Models/VerifyCode.php | 1 - beike/Models/Zone.php | 1 - .../AdminForgottenNotification.php | 7 +- beike/Notifications/ForgottenNotification.php | 9 +- beike/Notifications/NewOrderNotification.php | 6 +- .../RegistrationNotification.php | 6 +- .../Notifications/UpdateOrderNotification.php | 9 +- beike/Plugin/Manager.php | 29 +- beike/Plugin/Plugin.php | 83 ++-- beike/Repositories/AddressRepo.php | 11 +- beike/Repositories/BrandRepo.php | 49 +- beike/Repositories/CartRepo.php | 33 +- beike/Repositories/CategoryRepo.php | 43 +- beike/Repositories/CountryRepo.php | 16 +- beike/Repositories/CurrencyRepo.php | 7 +- beike/Repositories/CustomerGroupRepo.php | 10 +- beike/Repositories/CustomerRepo.php | 26 +- beike/Repositories/FooterRepo.php | 5 +- beike/Repositories/LanguageRepo.php | 30 +- beike/Repositories/MenuRepo.php | 16 +- beike/Repositories/OrderHistoryRepo.php | 1 - beike/Repositories/OrderProductRepo.php | 17 +- beike/Repositories/OrderRepo.php | 129 +++-- beike/Repositories/OrderTotalRepo.php | 6 +- beike/Repositories/PageRepo.php | 5 +- beike/Repositories/PluginRepo.php | 45 +- beike/Repositories/ProductRepo.php | 46 +- beike/Repositories/RmaReasonRepo.php | 11 +- beike/Repositories/RmaRepo.php | 35 +- beike/Repositories/SettingRepo.php | 41 +- beike/Repositories/SystemSettingRepo.php | 1 - beike/Repositories/UserRepo.php | 5 +- beike/Repositories/VerifyCodeRepo.php | 2 +- beike/Repositories/ZoneRepo.php | 18 +- beike/Services/CurrencyService.php | 28 +- beike/Services/DesignService.php | 30 +- beike/Services/ImageService.php | 24 +- beike/Services/ShipmentService.php | 7 +- beike/Services/ShippingMethodService.php | 15 +- beike/Services/SitemapService.php | 11 +- beike/Services/StateMachineService.php | 109 +++-- .../Controllers/Account/AccountController.php | 11 +- .../Controllers/Account/AddressController.php | 12 +- .../Controllers/Account/EditController.php | 9 +- .../Account/ForgottenController.php | 1 + .../Controllers/Account/LoginController.php | 10 +- .../Controllers/Account/LogoutController.php | 3 - .../Controllers/Account/OrderController.php | 35 +- .../Account/RegisterController.php | 4 +- .../Controllers/Account/RmaController.php | 18 +- .../Account/WishlistController.php | 7 +- .../Shop/Http/Controllers/BrandController.php | 12 +- .../Shop/Http/Controllers/CartController.php | 33 +- .../Http/Controllers/CategoryController.php | 8 +- .../Http/Controllers/CheckoutController.php | 6 +- beike/Shop/Http/Controllers/Controller.php | 1 - .../Http/Controllers/CurrencyController.php | 3 +- .../Shop/Http/Controllers/FileController.php | 2 +- .../Shop/Http/Controllers/HomeController.php | 10 +- .../Http/Controllers/LanguageController.php | 1 + .../Shop/Http/Controllers/PageController.php | 3 +- .../Http/Controllers/ProductController.php | 16 +- beike/Shop/Http/Requests/AddressRequest.php | 16 +- beike/Shop/Http/Requests/CartRequest.php | 8 +- beike/Shop/Http/Requests/EditRequest.php | 4 +- beike/Shop/Http/Requests/LoginRequest.php | 4 +- beike/Shop/Http/Requests/RegisterRequest.php | 4 +- beike/Shop/Http/Requests/RmaRequest.php | 17 +- .../Resources/Account/AddressResource.php | 24 +- .../Shop/Http/Resources/Account/OrderList.php | 2 +- .../Resources/Account/RmaReasonDetail.php | 2 +- .../Http/Resources/Account/WishlistDetail.php | 16 +- beike/Shop/Http/Resources/BrandDetail.php | 10 +- beike/Shop/Http/Resources/CartDetail.php | 44 +- beike/Shop/Http/Resources/CategoryDetail.php | 5 +- .../Resources/Checkout/PaymentMethodItem.php | 9 +- .../Resources/Checkout/ShippingMethodItem.php | 9 +- .../Shop/Http/Resources/CustomerResource.php | 12 +- beike/Shop/Http/Resources/PageDetail.php | 19 +- beike/Shop/Http/Resources/ProductDetail.php | 41 +- beike/Shop/Http/Resources/ProductSimple.php | 22 +- beike/Shop/Http/Resources/RmaDetail.php | 31 +- beike/Shop/Http/Resources/SkuDetail.php | 26 +- .../Shop/Providers/PluginServiceProvider.php | 18 +- beike/Shop/Providers/ShopServiceProvider.php | 43 +- beike/Shop/Routes/shop.php | 39 +- beike/Shop/Services/AccountService.php | 16 +- beike/Shop/Services/AddressService.php | 13 +- beike/Shop/Services/CartService.php | 40 +- beike/Shop/Services/CheckoutService.php | 96 ++-- beike/Shop/Services/PaymentService.php | 19 +- beike/Shop/Services/RmaService.php | 34 +- beike/Shop/Services/TotalService.php | 25 +- .../TotalServices/OrderTotalService.php | 12 +- .../TotalServices/ShippingService.php | 25 +- .../TotalServices/SubtotalService.php | 15 +- .../Services/TotalServices/TaxService.php | 19 +- beike/Shop/View/Components/AccountSidebar.php | 3 +- beike/Shop/View/Components/Alert.php | 5 +- beike/Shop/View/Components/Breadcrumb.php | 66 ++- beike/Shop/View/Components/NoData.php | 5 +- config/app.php | 98 ++-- config/auth.php | 18 +- config/broadcasting.php | 24 +- config/cache.php | 54 +-- config/cors.php | 14 +- config/database.php | 104 ++-- config/debugbar.php | 114 ++--- config/filesystems.php | 30 +- config/hashing.php | 6 +- config/horizon.php | 58 +-- config/logging.php | 64 +-- config/mail.php | 38 +- config/permission.php | 36 +- config/queue.php | 58 +-- config/sanctum.php | 8 +- config/services.php | 10 +- config/session.php | 30 +- config/sitemap.php | 16 +- config/view.php | 2 +- index.php | 3 +- public/index.php | 12 +- resources/lang/de/address.php | 24 +- resources/lang/de/admin/admin_roles.php | 12 +- resources/lang/de/admin/attribute.php | 18 +- resources/lang/de/admin/attribute_groups.php | 2 +- resources/lang/de/admin/brand.php | 14 +- resources/lang/de/admin/builder.php | 450 ++++++++--------- resources/lang/de/admin/category.php | 16 +- resources/lang/de/admin/common.php | 110 ++--- resources/lang/de/admin/country.php | 8 +- resources/lang/de/admin/currency.php | 14 +- resources/lang/de/admin/customer.php | 48 +- resources/lang/de/admin/customer_group.php | 22 +- resources/lang/de/admin/dashboard.php | 20 +- resources/lang/de/admin/design_builder.php | 10 +- resources/lang/de/admin/file_manager.php | 46 +- resources/lang/de/admin/language.php | 14 +- resources/lang/de/admin/login.php | 2 +- resources/lang/de/admin/marketing.php | 22 +- resources/lang/de/admin/order.php | 24 +- resources/lang/de/admin/page.php | 16 +- resources/lang/de/admin/plugin.php | 32 +- resources/lang/de/admin/product.php | 61 ++- resources/lang/de/admin/region.php | 20 +- resources/lang/de/admin/rma.php | 32 +- resources/lang/de/admin/rma_reason.php | 8 +- resources/lang/de/admin/role.php | 12 +- resources/lang/de/admin/setting.php | 106 ++-- resources/lang/de/admin/tax_class.php | 18 +- resources/lang/de/admin/tax_rate.php | 26 +- resources/lang/de/admin/user.php | 16 +- resources/lang/de/admin/zone.php | 14 +- resources/lang/de/brand.php | 6 +- resources/lang/de/cart.php | 6 +- resources/lang/de/common.php | 136 +++--- resources/lang/de/currency.php | 16 +- resources/lang/de/customer.php | 8 +- resources/lang/de/customer_group.php | 2 +- resources/lang/de/mail.php | 28 +- resources/lang/de/order.php | 72 +-- resources/lang/de/page.php | 2 +- resources/lang/de/product.php | 24 +- resources/lang/de/rma.php | 34 +- resources/lang/de/shop/account.php | 212 ++++---- resources/lang/de/shop/carts.php | 52 +- resources/lang/de/shop/checkout.php | 48 +- resources/lang/de/shop/common.php | 12 +- resources/lang/de/shop/currency.php | 2 +- resources/lang/de/shop/forgotten.php | 38 +- resources/lang/de/shop/login.php | 52 +- resources/lang/de/shop/order.php | 8 +- resources/lang/de/shop/products.php | 16 +- resources/lang/de/shop/steps.php | 10 +- resources/lang/de/shop/wishlist.php | 4 +- resources/lang/en/address.php | 20 +- resources/lang/en/admin/admin_roles.php | 12 +- resources/lang/en/admin/attribute.php | 18 +- resources/lang/en/admin/attribute_groups.php | 2 +- resources/lang/en/admin/brand.php | 8 +- resources/lang/en/admin/builder.php | 450 ++++++++--------- resources/lang/en/admin/category.php | 12 +- resources/lang/en/admin/common.php | 116 ++--- resources/lang/en/admin/country.php | 4 +- resources/lang/en/admin/currency.php | 10 +- resources/lang/en/admin/customer.php | 46 +- resources/lang/en/admin/customer_group.php | 16 +- resources/lang/en/admin/dashboard.php | 18 +- resources/lang/en/admin/design_builder.php | 8 +- resources/lang/en/admin/file_manager.php | 44 +- resources/lang/en/admin/language.php | 12 +- resources/lang/en/admin/login.php | 2 +- resources/lang/en/admin/marketing.php | 40 +- resources/lang/en/admin/order.php | 22 +- resources/lang/en/admin/page.php | 10 +- resources/lang/en/admin/plugin.php | 34 +- resources/lang/en/admin/product.php | 60 +-- resources/lang/en/admin/region.php | 14 +- resources/lang/en/admin/rma.php | 28 +- resources/lang/en/admin/rma_reason.php | 10 +- resources/lang/en/admin/role.php | 12 +- resources/lang/en/admin/setting.php | 106 ++-- resources/lang/en/admin/tax_class.php | 14 +- resources/lang/en/admin/tax_rate.php | 24 +- resources/lang/en/admin/user.php | 14 +- resources/lang/en/admin/zone.php | 12 +- resources/lang/en/auth.php | 2 +- resources/lang/en/brand.php | 4 +- resources/lang/en/cart.php | 4 +- resources/lang/en/common.php | 132 ++--- resources/lang/en/currency.php | 16 +- resources/lang/en/customer.php | 10 +- resources/lang/en/customer_group.php | 2 +- resources/lang/en/mail.php | 29 +- resources/lang/en/order.php | 72 +-- resources/lang/en/page.php | 2 +- resources/lang/en/pagination.php | 2 +- resources/lang/en/passwords.php | 8 +- resources/lang/en/product.php | 24 +- resources/lang/en/rma.php | 30 +- resources/lang/en/shop/account.php | 190 ++++---- resources/lang/en/shop/carts.php | 48 +- resources/lang/en/shop/checkout.php | 48 +- resources/lang/en/shop/common.php | 10 +- resources/lang/en/shop/currency.php | 2 +- resources/lang/en/shop/forgotten.php | 36 +- resources/lang/en/shop/login.php | 50 +- resources/lang/en/shop/order.php | 6 +- resources/lang/en/shop/products.php | 14 +- resources/lang/en/shop/steps.php | 8 +- resources/lang/en/shop/wishlist.php | 2 +- resources/lang/en/validation.php | 202 ++++---- resources/lang/es/address.php | 20 +- resources/lang/es/admin/admin_roles.php | 10 +- resources/lang/es/admin/attribute.php | 18 +- resources/lang/es/admin/attribute_groups.php | 2 +- resources/lang/es/admin/brand.php | 8 +- resources/lang/es/admin/builder.php | 450 ++++++++--------- resources/lang/es/admin/category.php | 10 +- resources/lang/es/admin/common.php | 108 ++--- resources/lang/es/admin/country.php | 4 +- resources/lang/es/admin/currency.php | 8 +- resources/lang/es/admin/customer.php | 46 +- resources/lang/es/admin/customer_group.php | 16 +- resources/lang/es/admin/dashboard.php | 18 +- resources/lang/es/admin/design_builder.php | 8 +- resources/lang/es/admin/file_manager.php | 44 +- resources/lang/es/admin/language.php | 12 +- resources/lang/es/admin/login.php | 2 +- resources/lang/es/admin/marketing.php | 24 +- resources/lang/es/admin/order.php | 22 +- resources/lang/es/admin/page.php | 10 +- resources/lang/es/admin/plugin.php | 30 +- resources/lang/es/admin/product.php | 61 ++- resources/lang/es/admin/region.php | 14 +- resources/lang/es/admin/rma.php | 28 +- resources/lang/es/admin/rma_reason.php | 4 +- resources/lang/es/admin/role.php | 12 +- resources/lang/es/admin/setting.php | 106 ++-- resources/lang/es/admin/tax_class.php | 12 +- resources/lang/es/admin/tax_rate.php | 24 +- resources/lang/es/admin/user.php | 14 +- resources/lang/es/admin/zone.php | 12 +- resources/lang/es/auth.php | 2 +- resources/lang/es/brand.php | 4 +- resources/lang/es/cart.php | 4 +- resources/lang/es/common.php | 136 +++--- resources/lang/es/currency.php | 16 +- resources/lang/es/customer.php | 6 +- resources/lang/es/customer_group.php | 2 +- resources/lang/es/mail.php | 28 +- resources/lang/es/order.php | 72 +-- resources/lang/es/page.php | 2 +- resources/lang/es/product.php | 24 +- resources/lang/es/rma.php | 30 +- resources/lang/es/shop/account.php | 190 ++++---- resources/lang/es/shop/carts.php | 48 +- resources/lang/es/shop/checkout.php | 48 +- resources/lang/es/shop/common.php | 10 +- resources/lang/es/shop/currency.php | 2 +- resources/lang/es/shop/forgotten.php | 36 +- resources/lang/es/shop/login.php | 50 +- resources/lang/es/shop/order.php | 6 +- resources/lang/es/shop/products.php | 14 +- resources/lang/es/shop/steps.php | 8 +- resources/lang/es/shop/wishlist.php | 2 +- resources/lang/fr/address.php | 20 +- resources/lang/fr/admin/admin_roles.php | 12 +- resources/lang/fr/admin/attribute.php | 18 +- resources/lang/fr/admin/attribute_groups.php | 2 +- resources/lang/fr/admin/brand.php | 14 +- resources/lang/fr/admin/builder.php | 449 +++++++++-------- resources/lang/fr/admin/category.php | 16 +- resources/lang/fr/admin/common.php | 110 ++--- resources/lang/fr/admin/country.php | 8 +- resources/lang/fr/admin/currency.php | 14 +- resources/lang/fr/admin/customer.php | 48 +- resources/lang/fr/admin/customer_group.php | 22 +- resources/lang/fr/admin/dashboard.php | 20 +- resources/lang/fr/admin/design_builder.php | 10 +- resources/lang/fr/admin/file_manager.php | 44 +- resources/lang/fr/admin/language.php | 14 +- resources/lang/fr/admin/login.php | 2 +- resources/lang/fr/admin/marketing.php | 24 +- resources/lang/fr/admin/order.php | 22 +- resources/lang/fr/admin/page.php | 16 +- resources/lang/fr/admin/plugin.php | 32 +- resources/lang/fr/admin/product.php | 63 ++- resources/lang/fr/admin/region.php | 20 +- resources/lang/fr/admin/rma.php | 30 +- resources/lang/fr/admin/rma_reason.php | 4 +- resources/lang/fr/admin/role.php | 12 +- resources/lang/fr/admin/setting.php | 106 ++-- resources/lang/fr/admin/tax_class.php | 18 +- resources/lang/fr/admin/tax_rate.php | 26 +- resources/lang/fr/admin/user.php | 14 +- resources/lang/fr/admin/zone.php | 14 +- resources/lang/fr/brand.php | 4 +- resources/lang/fr/cart.php | 4 +- resources/lang/fr/common.php | 136 +++--- resources/lang/fr/currency.php | 16 +- resources/lang/fr/customer.php | 6 +- resources/lang/fr/customer_group.php | 2 +- resources/lang/fr/mail.php | 28 +- resources/lang/fr/order.php | 72 +-- resources/lang/fr/page.php | 2 +- resources/lang/fr/product.php | 24 +- resources/lang/fr/rma.php | 34 +- resources/lang/fr/shop/account.php | 190 ++++---- resources/lang/fr/shop/carts.php | 48 +- resources/lang/fr/shop/checkout.php | 48 +- resources/lang/fr/shop/common.php | 10 +- resources/lang/fr/shop/currency.php | 2 +- resources/lang/fr/shop/forgotten.php | 36 +- resources/lang/fr/shop/login.php | 50 +- resources/lang/fr/shop/order.php | 6 +- resources/lang/fr/shop/products.php | 14 +- resources/lang/fr/shop/steps.php | 8 +- resources/lang/fr/shop/wishlist.php | 2 +- resources/lang/it/address.php | 20 +- resources/lang/it/admin/admin_roles.php | 10 +- resources/lang/it/admin/attribute.php | 18 +- resources/lang/it/admin/attribute_groups.php | 2 +- resources/lang/it/admin/brand.php | 8 +- resources/lang/it/admin/builder.php | 449 +++++++++-------- resources/lang/it/admin/category.php | 10 +- resources/lang/it/admin/common.php | 108 ++--- resources/lang/it/admin/country.php | 4 +- resources/lang/it/admin/currency.php | 8 +- resources/lang/it/admin/customer.php | 46 +- resources/lang/it/admin/customer_group.php | 16 +- resources/lang/it/admin/dashboard.php | 18 +- resources/lang/it/admin/design_builder.php | 8 +- resources/lang/it/admin/file_manager.php | 44 +- resources/lang/it/admin/language.php | 12 +- resources/lang/it/admin/login.php | 2 +- resources/lang/it/admin/marketing.php | 22 +- resources/lang/it/admin/order.php | 22 +- resources/lang/it/admin/page.php | 10 +- resources/lang/it/admin/plugin.php | 30 +- resources/lang/it/admin/product.php | 61 ++- resources/lang/it/admin/region.php | 14 +- resources/lang/it/admin/rma.php | 28 +- resources/lang/it/admin/rma_reason.php | 4 +- resources/lang/it/admin/role.php | 12 +- resources/lang/it/admin/setting.php | 106 ++-- resources/lang/it/admin/tax_class.php | 12 +- resources/lang/it/admin/tax_rate.php | 24 +- resources/lang/it/admin/user.php | 14 +- resources/lang/it/admin/zone.php | 12 +- resources/lang/it/brand.php | 4 +- resources/lang/it/cart.php | 4 +- resources/lang/it/common.php | 136 +++--- resources/lang/it/currency.php | 16 +- resources/lang/it/customer.php | 6 +- resources/lang/it/customer_group.php | 2 +- resources/lang/it/mail.php | 28 +- resources/lang/it/order.php | 72 +-- resources/lang/it/page.php | 2 +- resources/lang/it/product.php | 24 +- resources/lang/it/rma.php | 30 +- resources/lang/it/shop/account.php | 190 ++++---- resources/lang/it/shop/carts.php | 48 +- resources/lang/it/shop/checkout.php | 48 +- resources/lang/it/shop/common.php | 10 +- resources/lang/it/shop/currency.php | 2 +- resources/lang/it/shop/forgotten.php | 36 +- resources/lang/it/shop/login.php | 50 +- resources/lang/it/shop/order.php | 6 +- resources/lang/it/shop/products.php | 14 +- resources/lang/it/shop/steps.php | 8 +- resources/lang/it/shop/wishlist.php | 2 +- resources/lang/ja/address.php | 20 +- resources/lang/ja/admin/admin_roles.php | 10 +- resources/lang/ja/admin/attribute.php | 18 +- resources/lang/ja/admin/attribute_groups.php | 2 +- resources/lang/ja/admin/brand.php | 9 +- resources/lang/ja/admin/builder.php | 448 ++++++++--------- resources/lang/ja/admin/category.php | 16 +- resources/lang/ja/admin/common.php | 108 ++--- resources/lang/ja/admin/country.php | 4 +- resources/lang/ja/admin/currency.php | 10 +- resources/lang/ja/admin/customer.php | 48 +- resources/lang/ja/admin/customer_group.php | 18 +- resources/lang/ja/admin/dashboard.php | 20 +- resources/lang/ja/admin/design_builder.php | 10 +- resources/lang/ja/admin/file_manager.php | 46 +- resources/lang/ja/admin/language.php | 16 +- resources/lang/ja/admin/login.php | 2 +- resources/lang/ja/admin/marketing.php | 22 +- resources/lang/ja/admin/order.php | 26 +- resources/lang/ja/admin/page.php | 18 +- resources/lang/ja/admin/plugin.php | 34 +- resources/lang/ja/admin/product.php | 63 ++- resources/lang/ja/admin/region.php | 22 +- resources/lang/ja/admin/rma.php | 32 +- resources/lang/ja/admin/rma_reason.php | 8 +- resources/lang/ja/admin/role.php | 12 +- resources/lang/ja/admin/setting.php | 106 ++-- resources/lang/ja/admin/tax_class.php | 18 +- resources/lang/ja/admin/tax_rate.php | 26 +- resources/lang/ja/admin/user.php | 16 +- resources/lang/ja/admin/zone.php | 14 +- resources/lang/ja/auth.php | 2 +- resources/lang/ja/brand.php | 4 +- resources/lang/ja/cart.php | 4 +- resources/lang/ja/common.php | 136 +++--- resources/lang/ja/currency.php | 16 +- resources/lang/ja/customer.php | 6 +- resources/lang/ja/customer_group.php | 2 +- resources/lang/ja/mail.php | 28 +- resources/lang/ja/order.php | 72 +-- resources/lang/ja/page.php | 2 +- resources/lang/ja/product.php | 24 +- resources/lang/ja/rma.php | 30 +- resources/lang/ja/shop/account.php | 192 ++++---- resources/lang/ja/shop/carts.php | 48 +- resources/lang/ja/shop/checkout.php | 48 +- resources/lang/ja/shop/common.php | 10 +- resources/lang/ja/shop/currency.php | 2 +- resources/lang/ja/shop/forgotten.php | 36 +- resources/lang/ja/shop/login.php | 50 +- resources/lang/ja/shop/order.php | 6 +- resources/lang/ja/shop/products.php | 14 +- resources/lang/ja/shop/steps.php | 8 +- resources/lang/ja/shop/wishlist.php | 2 +- resources/lang/ru/address.php | 20 +- resources/lang/ru/admin/admin_roles.php | 10 +- resources/lang/ru/admin/attribute.php | 18 +- resources/lang/ru/admin/attribute_groups.php | 2 +- resources/lang/ru/admin/brand.php | 8 +- resources/lang/ru/admin/builder.php | 452 +++++++++--------- resources/lang/ru/admin/category.php | 10 +- resources/lang/ru/admin/common.php | 108 ++--- resources/lang/ru/admin/country.php | 4 +- resources/lang/ru/admin/currency.php | 8 +- resources/lang/ru/admin/customer.php | 46 +- resources/lang/ru/admin/customer_group.php | 16 +- resources/lang/ru/admin/dashboard.php | 18 +- resources/lang/ru/admin/design_builder.php | 8 +- resources/lang/ru/admin/file_manager.php | 44 +- resources/lang/ru/admin/language.php | 12 +- resources/lang/ru/admin/login.php | 2 +- resources/lang/ru/admin/marketing.php | 22 +- resources/lang/ru/admin/order.php | 22 +- resources/lang/ru/admin/page.php | 10 +- resources/lang/ru/admin/plugin.php | 30 +- resources/lang/ru/admin/product.php | 61 ++- resources/lang/ru/admin/region.php | 14 +- resources/lang/ru/admin/rma.php | 28 +- resources/lang/ru/admin/rma_reason.php | 4 +- resources/lang/ru/admin/role.php | 12 +- resources/lang/ru/admin/setting.php | 106 ++-- resources/lang/ru/admin/tax_class.php | 12 +- resources/lang/ru/admin/tax_rate.php | 24 +- resources/lang/ru/admin/user.php | 14 +- resources/lang/ru/admin/zone.php | 12 +- resources/lang/ru/brand.php | 4 +- resources/lang/ru/cart.php | 4 +- resources/lang/ru/common.php | 136 +++--- resources/lang/ru/currency.php | 16 +- resources/lang/ru/customer.php | 6 +- resources/lang/ru/customer_group.php | 2 +- resources/lang/ru/mail.php | 26 +- resources/lang/ru/order.php | 72 +-- resources/lang/ru/page.php | 2 +- resources/lang/ru/product.php | 24 +- resources/lang/ru/rma.php | 30 +- resources/lang/ru/shop/account.php | 190 ++++---- resources/lang/ru/shop/carts.php | 48 +- resources/lang/ru/shop/checkout.php | 48 +- resources/lang/ru/shop/common.php | 10 +- resources/lang/ru/shop/currency.php | 2 +- resources/lang/ru/shop/forgotten.php | 36 +- resources/lang/ru/shop/login.php | 50 +- resources/lang/ru/shop/order.php | 6 +- resources/lang/ru/shop/products.php | 14 +- resources/lang/ru/shop/steps.php | 8 +- resources/lang/ru/shop/wishlist.php | 2 +- resources/lang/zh_cn/address.php | 20 +- resources/lang/zh_cn/admin/admin_roles.php | 12 +- resources/lang/zh_cn/admin/attribute.php | 18 +- .../lang/zh_cn/admin/attribute_groups.php | 2 +- resources/lang/zh_cn/admin/brand.php | 8 +- resources/lang/zh_cn/admin/builder.php | 449 +++++++++-------- resources/lang/zh_cn/admin/category.php | 10 +- resources/lang/zh_cn/admin/common.php | 116 ++--- resources/lang/zh_cn/admin/country.php | 4 +- resources/lang/zh_cn/admin/currency.php | 8 +- resources/lang/zh_cn/admin/customer.php | 46 +- resources/lang/zh_cn/admin/customer_group.php | 16 +- resources/lang/zh_cn/admin/dashboard.php | 18 +- resources/lang/zh_cn/admin/design_builder.php | 8 +- resources/lang/zh_cn/admin/file_manager.php | 44 +- resources/lang/zh_cn/admin/language.php | 12 +- resources/lang/zh_cn/admin/login.php | 2 +- resources/lang/zh_cn/admin/marketing.php | 40 +- resources/lang/zh_cn/admin/order.php | 22 +- resources/lang/zh_cn/admin/page.php | 10 +- resources/lang/zh_cn/admin/plugin.php | 34 +- resources/lang/zh_cn/admin/product.php | 61 ++- resources/lang/zh_cn/admin/region.php | 14 +- resources/lang/zh_cn/admin/rma.php | 28 +- resources/lang/zh_cn/admin/rma_reason.php | 4 +- resources/lang/zh_cn/admin/role.php | 12 +- resources/lang/zh_cn/admin/setting.php | 106 ++-- resources/lang/zh_cn/admin/tax_class.php | 12 +- resources/lang/zh_cn/admin/tax_rate.php | 24 +- resources/lang/zh_cn/admin/user.php | 14 +- resources/lang/zh_cn/admin/zone.php | 12 +- resources/lang/zh_cn/auth.php | 2 +- resources/lang/zh_cn/brand.php | 4 +- resources/lang/zh_cn/cart.php | 4 +- resources/lang/zh_cn/common.php | 138 +++--- resources/lang/zh_cn/currency.php | 16 +- resources/lang/zh_cn/customer.php | 6 +- resources/lang/zh_cn/customer_group.php | 2 +- resources/lang/zh_cn/mail.php | 26 +- resources/lang/zh_cn/order.php | 72 +-- resources/lang/zh_cn/page.php | 2 +- resources/lang/zh_cn/pagination.php | 2 +- resources/lang/zh_cn/passwords.php | 8 +- resources/lang/zh_cn/product.php | 24 +- resources/lang/zh_cn/rma.php | 30 +- resources/lang/zh_cn/shop/account.php | 190 ++++---- resources/lang/zh_cn/shop/carts.php | 48 +- resources/lang/zh_cn/shop/checkout.php | 48 +- resources/lang/zh_cn/shop/common.php | 10 +- resources/lang/zh_cn/shop/currency.php | 2 +- resources/lang/zh_cn/shop/forgotten.php | 36 +- resources/lang/zh_cn/shop/login.php | 50 +- resources/lang/zh_cn/shop/order.php | 6 +- resources/lang/zh_cn/shop/products.php | 14 +- resources/lang/zh_cn/shop/steps.php | 8 +- resources/lang/zh_cn/shop/wishlist.php | 2 +- resources/lang/zh_cn/validation.php | 202 ++++---- resources/lang/zh_hk/address.php | 20 +- resources/lang/zh_hk/admin/admin_roles.php | 10 +- resources/lang/zh_hk/admin/attribute.php | 18 +- .../lang/zh_hk/admin/attribute_groups.php | 2 +- resources/lang/zh_hk/admin/brand.php | 8 +- resources/lang/zh_hk/admin/builder.php | 449 +++++++++-------- resources/lang/zh_hk/admin/category.php | 10 +- resources/lang/zh_hk/admin/common.php | 112 ++--- resources/lang/zh_hk/admin/country.php | 4 +- resources/lang/zh_hk/admin/currency.php | 8 +- resources/lang/zh_hk/admin/customer.php | 46 +- resources/lang/zh_hk/admin/customer_group.php | 16 +- resources/lang/zh_hk/admin/dashboard.php | 18 +- resources/lang/zh_hk/admin/design_builder.php | 8 +- resources/lang/zh_hk/admin/file_manager.php | 44 +- resources/lang/zh_hk/admin/language.php | 12 +- resources/lang/zh_hk/admin/login.php | 2 +- resources/lang/zh_hk/admin/marketing.php | 40 +- resources/lang/zh_hk/admin/order.php | 22 +- resources/lang/zh_hk/admin/page.php | 10 +- resources/lang/zh_hk/admin/plugin.php | 30 +- resources/lang/zh_hk/admin/product.php | 61 ++- resources/lang/zh_hk/admin/region.php | 14 +- resources/lang/zh_hk/admin/rma.php | 28 +- resources/lang/zh_hk/admin/rma_reason.php | 4 +- resources/lang/zh_hk/admin/role.php | 12 +- resources/lang/zh_hk/admin/setting.php | 106 ++-- resources/lang/zh_hk/admin/tax_class.php | 12 +- resources/lang/zh_hk/admin/tax_rate.php | 12 +- resources/lang/zh_hk/admin/user.php | 14 +- resources/lang/zh_hk/admin/zone.php | 12 +- resources/lang/zh_hk/brand.php | 4 +- resources/lang/zh_hk/cart.php | 4 +- resources/lang/zh_hk/common.php | 136 +++--- resources/lang/zh_hk/currency.php | 16 +- resources/lang/zh_hk/customer.php | 6 +- resources/lang/zh_hk/customer_group.php | 2 +- resources/lang/zh_hk/mail.php | 24 +- resources/lang/zh_hk/order.php | 72 +-- resources/lang/zh_hk/page.php | 2 +- resources/lang/zh_hk/product.php | 24 +- resources/lang/zh_hk/rma.php | 30 +- resources/lang/zh_hk/shop/account.php | 188 ++++---- resources/lang/zh_hk/shop/carts.php | 48 +- resources/lang/zh_hk/shop/checkout.php | 46 +- resources/lang/zh_hk/shop/common.php | 10 +- resources/lang/zh_hk/shop/currency.php | 2 +- resources/lang/zh_hk/shop/forgotten.php | 36 +- resources/lang/zh_hk/shop/login.php | 50 +- resources/lang/zh_hk/shop/order.php | 6 +- resources/lang/zh_hk/shop/products.php | 14 +- resources/lang/zh_hk/shop/steps.php | 8 +- resources/lang/zh_hk/shop/wishlist.php | 2 +- tests/CreatesApplication.php | 2 +- tests/Feature/ExampleTest.php | 1 - 787 files changed, 11696 insertions(+), 11700 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index d8bc1d29..3c8d77dd 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -10,7 +10,7 @@ class Kernel extends ConsoleKernel /** * Define the application's command schedule. * - * @param \Illuminate\Console\Scheduling\Schedule $schedule + * @param \Illuminate\Console\Scheduling\Schedule $schedule * @return void */ protected function schedule(Schedule $schedule) @@ -25,7 +25,7 @@ class Kernel extends ConsoleKernel */ protected function commands() { - $this->load(__DIR__.'/Commands'); + $this->load(__DIR__ . '/Commands'); require base_path('routes/console.php'); } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 4515ee00..0dc01dda 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,10 +2,10 @@ namespace App\Exceptions; +use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Foundation\Exceptions\RegisterErrorViewPaths; use Illuminate\Support\Arr; use Throwable; -use Illuminate\Foundation\Exceptions\RegisterErrorViewPaths; -use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; class Handler extends ExceptionHandler { @@ -41,28 +41,26 @@ class Handler extends ExceptionHandler }); } - /** * Convert the given exception to an array. * - * @param \Throwable $e + * @param \Throwable $e * @return array */ protected function convertExceptionToArray(Throwable $e) { return config('app.debug') ? [ - 'message' => $e->getMessage(), + 'message' => $e->getMessage(), 'exception' => get_class($e), - 'file' => $e->getFile(), - 'line' => $e->getLine(), - 'trace' => collect($e->getTrace())->map(fn ($trace) => Arr::except($trace, ['args']))->all(), + 'file' => $e->getFile(), + 'line' => $e->getLine(), + 'trace' => collect($e->getTrace())->map(fn ($trace) => Arr::except($trace, ['args']))->all(), ] : [ 'message' => $this->isHttpException($e) ? $e->getMessage() : 'Server Error', ]; } - /** * 自定义错误信息页面, 前台与后台不同, 需要分开定义 */ diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 5de1dc97..cadabb59 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -28,7 +28,7 @@ class Kernel extends HttpKernel * @var array */ protected $middlewareGroups = [ - 'shop' => [ + 'shop' => [ \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, @@ -39,7 +39,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, ], - 'admin' => [ + 'admin' => [ \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, @@ -55,7 +55,7 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, ], - 'api' => [ + 'api' => [ // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, 'throttle:api', \Illuminate\Routing\Middleware\SubstituteBindings::class, @@ -70,16 +70,16 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'admin_auth' => \App\Http\Middleware\Authenticate::class, - 'shop_auth' => \App\Http\Middleware\ShopAuthenticate::class, - 'checkout_auth' => \App\Http\Middleware\CheckoutAuthenticate::class, - 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, - 'can' => \Illuminate\Auth\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'admin_auth' => \App\Http\Middleware\Authenticate::class, + 'shop_auth' => \App\Http\Middleware\ShopAuthenticate::class, + 'checkout_auth' => \App\Http\Middleware\CheckoutAuthenticate::class, + 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, + 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, + 'can' => \Illuminate\Auth\Middleware\Authorize::class, + 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, 'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class, - 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, - 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, - 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, + 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, ]; } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index d1eaee7a..7f26ada0 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -9,7 +9,7 @@ class Authenticate extends Middleware /** * Get the path the user should be redirected to when they are not authenticated. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return string|null */ protected function redirectTo($request) diff --git a/app/Http/Middleware/CheckoutAuthenticate.php b/app/Http/Middleware/CheckoutAuthenticate.php index 3e906c94..7a82cf0c 100644 --- a/app/Http/Middleware/CheckoutAuthenticate.php +++ b/app/Http/Middleware/CheckoutAuthenticate.php @@ -3,17 +3,17 @@ namespace App\Http\Middleware; use Beike\Models\Customer; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\Middleware\Authenticate as Middleware; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class CheckoutAuthenticate extends Middleware { /** * Handle an incoming request. * - * @param Request $request + * @param Request $request * @param \Closure $next * @param string[] ...$guards * @return mixed @@ -31,13 +31,13 @@ class CheckoutAuthenticate extends Middleware $customer = current_customer(); if ($customer->status != 1) { Auth::guard(Customer::AUTH_GUARD)->logout(); + return redirect(shop_route('login.index')); } return $next($request); } - /** * Get the path the user should be redirected to when they are not authenticated. * @@ -45,17 +45,16 @@ class CheckoutAuthenticate extends Middleware */ protected function redirectTo($request) { - if (!$request->expectsJson()) { + if (! $request->expectsJson()) { return shop_route('login.index'); } } - /** * Handle an unauthenticated user. * * @param Request $request - * @param array $guards + * @param array $guards * @return void * * @throws AuthenticationException @@ -65,6 +64,7 @@ class CheckoutAuthenticate extends Middleware if (system_setting('base.guest_checkout', 1)) { return; } + throw new AuthenticationException( trans('common.unauthenticated'), $guards, $this->redirectTo($request) ); diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 362b48b0..1d9cee62 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -12,9 +12,9 @@ class RedirectIfAuthenticated /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param string|null ...$guards + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * @param string|null ...$guards * @return mixed */ public function handle(Request $request, Closure $next, ...$guards) diff --git a/app/Http/Middleware/SetLocaleAdmin.php b/app/Http/Middleware/SetLocaleAdmin.php index ff470a2a..30c03c9b 100644 --- a/app/Http/Middleware/SetLocaleAdmin.php +++ b/app/Http/Middleware/SetLocaleAdmin.php @@ -23,6 +23,7 @@ class SetLocaleAdmin } else { App::setLocale('en'); } + return $next($request); } } diff --git a/app/Http/Middleware/SetLocaleFromSession.php b/app/Http/Middleware/SetLocaleFromSession.php index 88846801..06feb132 100644 --- a/app/Http/Middleware/SetLocaleFromSession.php +++ b/app/Http/Middleware/SetLocaleFromSession.php @@ -25,6 +25,7 @@ class SetLocaleFromSession App::setLocale($configLocale); session(['locale' => $configLocale]); } + return $next($request); } } diff --git a/app/Http/Middleware/SetLocaleInstaller.php b/app/Http/Middleware/SetLocaleInstaller.php index 5c578791..2f8267c2 100644 --- a/app/Http/Middleware/SetLocaleInstaller.php +++ b/app/Http/Middleware/SetLocaleInstaller.php @@ -2,10 +2,10 @@ namespace App\Http\Middleware; +use Beike\Installer\Helpers\EnvironmentManager; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\App; -use Beike\Installer\Helpers\EnvironmentManager; class SetLocaleInstaller { @@ -18,9 +18,9 @@ class SetLocaleInstaller */ public function handle(Request $request, Closure $next) { - $locale = $_COOKIE['locale'] ?? 'en'; + $locale = $_COOKIE['locale'] ?? 'en'; $languageDir = base_path('beike/Installer/Lang'); - $languages = array_values(array_diff(scandir($languageDir), array('..', '.'))); + $languages = array_values(array_diff(scandir($languageDir), ['..', '.'])); (new EnvironmentManager)->getEnvContent(); @@ -29,6 +29,7 @@ class SetLocaleInstaller } else { App::setLocale('en'); } + return $next($request); } } diff --git a/app/Http/Middleware/ShareViewData.php b/app/Http/Middleware/ShareViewData.php index 1760fc40..60291c70 100644 --- a/app/Http/Middleware/ShareViewData.php +++ b/app/Http/Middleware/ShareViewData.php @@ -11,19 +11,19 @@ namespace App\Http\Middleware; +use Beike\Repositories\FooterRepo; +use Beike\Repositories\LanguageRepo; +use Beike\Repositories\MenuRepo; use Closure; use Illuminate\Http\Request; -use Beike\Repositories\MenuRepo; -use Beike\Repositories\FooterRepo; use Illuminate\Support\Facades\View; -use Beike\Repositories\CategoryRepo; -use Beike\Repositories\LanguageRepo; class ShareViewData { public function handle(Request $request, Closure $next) { $this->loadShopShareViewData(); + return $next($request); } @@ -33,7 +33,7 @@ class ShareViewData protected function loadShopShareViewData() { if (is_admin()) { - $adminLanguages = $this->handleAdminLanguages(); + $adminLanguages = $this->handleAdminLanguages(); $loggedAdminUser = current_user(); if ($loggedAdminUser) { $currentLanguage = $loggedAdminUser->locale ?: 'en'; @@ -49,7 +49,6 @@ class ShareViewData } } - /** * 处理后台语言包列表 * @@ -57,19 +56,20 @@ class ShareViewData */ private function handleAdminLanguages(): array { - $items = []; + $items = []; $languages = admin_languages(); foreach ($languages as $language) { $path = lang_path("{$language}/admin/base.php"); if (file_exists($path)) { - $baseData = require_once($path); + $baseData = require_once $path; } - $name = $baseData['name'] ?? ''; + $name = $baseData['name'] ?? ''; $items[] = [ 'code' => $language, 'name' => $name, ]; } + return $items; } } diff --git a/app/Http/Middleware/ShopAuthenticate.php b/app/Http/Middleware/ShopAuthenticate.php index 88a90d05..ad363db3 100644 --- a/app/Http/Middleware/ShopAuthenticate.php +++ b/app/Http/Middleware/ShopAuthenticate.php @@ -3,17 +3,17 @@ namespace App\Http\Middleware; use Beike\Models\Customer; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\Middleware\Authenticate as Middleware; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class ShopAuthenticate extends Middleware { /** * Handle an incoming request. * - * @param Request $request + * @param Request $request * @param \Closure $next * @param string[] ...$guards * @return mixed @@ -27,13 +27,13 @@ class ShopAuthenticate extends Middleware $customer = current_customer(); if ($customer->status != 1) { Auth::guard(Customer::AUTH_GUARD)->logout(); + return redirect(shop_route('login.index')); } return $next($request); } - /** * Get the path the user should be redirected to when they are not authenticated. * @@ -41,17 +41,16 @@ class ShopAuthenticate extends Middleware */ protected function redirectTo($request) { - if (!$request->expectsJson()) { + if (! $request->expectsJson()) { return shop_route('login.index'); } } - /** * Handle an unauthenticated user. * * @param Request $request - * @param array $guards + * @param array $guards * @return void * * @throws AuthenticationException diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 0c7d3b6b..beb5d137 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -20,9 +20,9 @@ class TrustProxies extends Middleware * @var int */ protected $headers = - Request::HEADER_X_FORWARDED_FOR | - Request::HEADER_X_FORWARDED_HOST | - Request::HEADER_X_FORWARDED_PORT | + Request::HEADER_X_FORWARDED_FOR | + Request::HEADER_X_FORWARDED_HOST | + Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB; } diff --git a/app/Http/Requests/ContactRequest.php b/app/Http/Requests/ContactRequest.php index 91f6d4b4..9bdc5d4c 100644 --- a/app/Http/Requests/ContactRequest.php +++ b/app/Http/Requests/ContactRequest.php @@ -24,7 +24,7 @@ class ContactRequest extends FormRequest public function rules() { return [ - 'name'=>'required|string|max:100|min:10' + 'name' => 'required|string|max:100|min:10', ]; } } diff --git a/beike/Admin/Database/Seeders/ProductSeeder.php b/beike/Admin/Database/Seeders/ProductSeeder.php index c09de84c..b7921331 100644 --- a/beike/Admin/Database/Seeders/ProductSeeder.php +++ b/beike/Admin/Database/Seeders/ProductSeeder.php @@ -11,16 +11,16 @@ class ProductSeeder extends Seeder public function run() { $faker = \Faker\Factory::create(); - $date = Carbon::create(2021); + $date = Carbon::create(2021); for ($i = 0; $i < 1000; $i++) { - $time = $date->addMinute(); + $time = $date->addMinute(); $productId = DB::table('products')->insertGetId([ - 'image' => $faker->imageUrl(100, 100), - 'video' => '', - 'position' => 0, - 'active' => 1, - 'variables' => null, + 'image' => $faker->imageUrl(100, 100), + 'video' => '', + 'position' => 0, + 'active' => 1, + 'variables' => null, 'created_at' => $time, 'updated_at' => $time, ]); @@ -28,34 +28,34 @@ class ProductSeeder extends Seeder $descriptions = []; foreach (locales() as $locale) { $descriptions[] = [ - 'product_id' => $productId, - 'locale' => $locale['code'], - 'name' => $faker->words(5, true), - 'content' => $faker->paragraphs(6, true), - 'meta_title' => $faker->words(10, true), + 'product_id' => $productId, + 'locale' => $locale['code'], + 'name' => $faker->words(5, true), + 'content' => $faker->paragraphs(6, true), + 'meta_title' => $faker->words(10, true), 'meta_description' => $faker->sentence(10), - 'meta_keywords' => $faker->words(10, true), - 'created_at' => $time, - 'updated_at' => $time, + 'meta_keywords' => $faker->words(10, true), + 'created_at' => $time, + 'updated_at' => $time, ]; } DB::table('product_descriptions')->insert($descriptions); $costPrice = $faker->numberBetween(100, 500); DB::table('product_skus')->insert([ - 'product_id' => $productId, - 'variants' => null, - 'position' => 0, - 'image' => $faker->imageUrl(100, 100), - 'model' => $faker->isbn10(), - 'sku' => $faker->isbn10(), - 'price' => $costPrice + 10, + 'product_id' => $productId, + 'variants' => null, + 'position' => 0, + 'image' => $faker->imageUrl(100, 100), + 'model' => $faker->isbn10(), + 'sku' => $faker->isbn10(), + 'price' => $costPrice + 10, 'origin_price' => $costPrice + 50, - 'cost_price' => $costPrice, - 'quantity' => $faker->numberBetween(100, 1000), - 'is_default' => 1, - 'created_at' => $time, - 'updated_at' => $time, + 'cost_price' => $costPrice, + 'quantity' => $faker->numberBetween(100, 1000), + 'is_default' => 1, + 'created_at' => $time, + 'updated_at' => $time, ]); } } diff --git a/beike/Admin/Http/Controllers/AddressController.php b/beike/Admin/Http/Controllers/AddressController.php index 14d2c53e..6064d7da 100644 --- a/beike/Admin/Http/Controllers/AddressController.php +++ b/beike/Admin/Http/Controllers/AddressController.php @@ -21,7 +21,7 @@ class AddressController extends Controller public function index(Request $request, int $customerId) { $addresses = AddressRepo::listByCustomer($customerId); - $data = [ + $data = [ 'addresses' => AddressResource::collection($addresses), ]; @@ -31,6 +31,7 @@ class AddressController extends Controller public function store(Request $request, int $customerId) { $address = AddressService::addForCustomer($customerId, $request->all()); + return json_success(trans('common.created_success'), $address); } diff --git a/beike/Admin/Http/Controllers/AdminRoleController.php b/beike/Admin/Http/Controllers/AdminRoleController.php index 8d0ffe77..fa04a406 100644 --- a/beike/Admin/Http/Controllers/AdminRoleController.php +++ b/beike/Admin/Http/Controllers/AdminRoleController.php @@ -12,44 +12,46 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Requests\AdminRoleRequest; -use Illuminate\Http\Request; -use Spatie\Permission\Models\Role; -use Illuminate\Support\Facades\Cache; use Beike\Admin\Repositories\AdminRoleRepo; use Beike\Admin\Repositories\PermissionRepo; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Cache; +use Spatie\Permission\Models\Role; class AdminRoleController extends Controller { public function index() { $data = [ - 'roles' => Role::query()->get() + 'roles' => Role::query()->get(), ]; + return view('admin::pages.admin_roles.index', $data); } public function create(Request $request) { $permissionRepo = (new PermissionRepo()); - $data = [ + $data = [ 'permissions' => $permissionRepo->getAllPermissions(), ]; + return view('admin::pages.admin_roles.edit', $data); } public function edit(Request $request, int $id) { Cache::forget('spatie.permission.cache'); - $role = Role::query()->findOrFail($id); + $role = Role::query()->findOrFail($id); $permissionRepo = (new PermissionRepo())->setRole($role); - $data = [ + $data = [ 'permissions' => $permissionRepo->getAllPermissions(), - 'role' => $role, + 'role' => $role, ]; + return view('admin::pages.admin_roles.edit', $data); } - /** * 保存后台用户角色 * @@ -60,18 +62,21 @@ class AdminRoleController extends Controller public function store(AdminRoleRequest $request): array { $adminUser = AdminRoleRepo::createAdminRole($request->toArray()); + return json_success(trans('common.created_success'), $adminUser); } public function update(Request $request, int $adminUserId) { $adminUser = AdminRoleRepo::updateAdminRole($request->toArray()); + return json_success(trans('common.updated_success'), $adminUser); } public function destroy(Request $request, int $adminUserId) { AdminRoleRepo::deleteAdminRole($adminUserId); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/AdminUserController.php b/beike/Admin/Http/Controllers/AdminUserController.php index 2649909d..769ad05f 100644 --- a/beike/Admin/Http/Controllers/AdminUserController.php +++ b/beike/Admin/Http/Controllers/AdminUserController.php @@ -11,10 +11,10 @@ namespace Beike\Admin\Http\Controllers; +use Beike\Admin\Http\Requests\AdminUserRequest; +use Beike\Admin\Repositories\AdminUserRepo; use Illuminate\Http\Request; use Spatie\Permission\Models\Role; -use Beike\Admin\Repositories\AdminUserRepo; -use Beike\Admin\Http\Requests\AdminUserRequest; class AdminUserController extends Controller { @@ -27,12 +27,12 @@ class AdminUserController extends Controller { $data = [ 'admin_users' => AdminUserRepo::getAdminUsers(), - 'admin_roles' => Role::query()->get() + 'admin_roles' => Role::query()->get(), ]; + return view('admin::pages.admin_users.index', $data); } - /** * 创建后台管理员 * @@ -42,27 +42,28 @@ class AdminUserController extends Controller public function store(AdminUserRequest $request) { $adminUser = AdminUserRepo::createAdminUser($request->toArray()); + return json_success(trans('common.created_success'), $adminUser); } - /** * 更新后台管理员 * * @param AdminUserRequest $request - * @param int $adminUserId + * @param int $adminUserId * @return array */ public function update(AdminUserRequest $request, int $adminUserId) { $adminUser = AdminUserRepo::updateAdminUser($adminUserId, $request->toArray()); + return json_success(trans('common.updated_success'), $adminUser); } - public function destroy(Request $request, int $adminUserId) { AdminUserRepo::deleteAdminUser($adminUserId); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/AttributeController.php b/beike/Admin/Http/Controllers/AttributeController.php index a884b162..af005926 100644 --- a/beike/Admin/Http/Controllers/AttributeController.php +++ b/beike/Admin/Http/Controllers/AttributeController.php @@ -24,10 +24,10 @@ class AttributeController extends Controller public function index(Request $request) { $attributes = AttributeRepo::getList(); - $data = [ - 'attribute_list' => $attributes, + $data = [ + 'attribute_list' => $attributes, 'attribute_list_format' => AttributeResource::collection($attributes), - 'attribute_group' => AttributeGroupRepo::getList(), + 'attribute_group' => AttributeGroupRepo::getList(), ]; if ($request->expectsJson()) { @@ -40,7 +40,7 @@ class AttributeController extends Controller public function show(Request $request, int $id) { $data = [ - 'attribute' => (new AttributeDetailResource(AttributeRepo::find($id)))->jsonSerialize(), + 'attribute' => (new AttributeDetailResource(AttributeRepo::find($id)))->jsonSerialize(), 'attribute_group' => AttributeGroupRepo::getList(), ]; @@ -50,41 +50,46 @@ class AttributeController extends Controller public function store(Request $request) { $requestData = json_decode($request->getContent(), true); - $item = AttributeRepo::create($requestData); + $item = AttributeRepo::create($requestData); + return json_success(trans('common.created_success'), $item); } public function update(Request $request, int $id) { $requestData = json_decode($request->getContent(), true); - $item = AttributeRepo::update($id, $requestData); + $item = AttributeRepo::update($id, $requestData); + return json_success(trans('common.updated_success'), $item); } - public function storeValue(Request $request, int $id) { $requestData = json_decode($request->getContent(), true); - $item = AttributeRepo::createValue(array_merge($requestData, ['attribute_id' => $id])); + $item = AttributeRepo::createValue(array_merge($requestData, ['attribute_id' => $id])); + return json_success(trans('common.created_success'), new AttributeValueResource($item)); } public function updateValue(Request $request, int $id, int $value_id) { $requestData = json_decode($request->getContent(), true); - $item = AttributeRepo::updateValue($value_id, $requestData); + $item = AttributeRepo::updateValue($value_id, $requestData); + return json_success(trans('common.updated_success'), new AttributeValueResource($item)); } public function destroyValue(Request $request, int $id, int $value_id) { AttributeRepo::deleteValue($value_id); + return json_success(trans('common.deleted_success')); } public function destroy(Request $request, int $id) { AttributeRepo::delete($id); + return json_success(trans('common.deleted_success')); } diff --git a/beike/Admin/Http/Controllers/AttributeGroupController.php b/beike/Admin/Http/Controllers/AttributeGroupController.php index c3b24905..7a7c29e8 100644 --- a/beike/Admin/Http/Controllers/AttributeGroupController.php +++ b/beike/Admin/Http/Controllers/AttributeGroupController.php @@ -28,20 +28,23 @@ class AttributeGroupController extends Controller public function store(Request $request) { $requestData = json_decode($request->getContent(), true); - $item = AttributeGroupRepo::create($requestData); + $item = AttributeGroupRepo::create($requestData); + return json_success(trans('common.created_success'), $item); } public function update(Request $request, int $id) { $requestData = json_decode($request->getContent(), true); - $item = AttributeGroupRepo::update($id, $requestData); + $item = AttributeGroupRepo::update($id, $requestData); + return json_success(trans('common.updated_success'), $item); } public function destroy(Request $request, int $id) { AttributeGroupRepo::delete($id); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/BrandController.php b/beike/Admin/Http/Controllers/BrandController.php index 67aedfdc..0e41a4a3 100644 --- a/beike/Admin/Http/Controllers/BrandController.php +++ b/beike/Admin/Http/Controllers/BrandController.php @@ -25,7 +25,7 @@ class BrandController extends Controller public function index(Request $request) { $brands = BrandRepo::list($request->only('name', 'first', 'status')); - $data = [ + $data = [ 'brands' => $brands, ]; @@ -36,7 +36,6 @@ class BrandController extends Controller return view('admin::pages.brands.index', $data); } - /** * 创建品牌 * @@ -46,6 +45,7 @@ class BrandController extends Controller public function store(Request $request): array { $brand = BrandRepo::create($request->all()); + return json_success(trans('common.created_success'), $brand); } @@ -73,7 +73,6 @@ class BrandController extends Controller return json_success(trans('common.get_success'), $brands); } - public function name(int $id): array { $name = BrandRepo::getName($id); @@ -81,7 +80,6 @@ class BrandController extends Controller return json_success(trans('common.get_success'), $name); } - /** * 根据商品ID批量获取商品名称 * @@ -90,7 +88,7 @@ class BrandController extends Controller */ public function getNames(Request $request): array { - $ids = explode(',', $request->get('ids')); + $ids = explode(',', $request->get('ids')); $name = BrandRepo::getNames($ids); return json_success(trans('common.get_success'), $name); diff --git a/beike/Admin/Http/Controllers/CategoryController.php b/beike/Admin/Http/Controllers/CategoryController.php index 7fdcbcf8..d5403a22 100644 --- a/beike/Admin/Http/Controllers/CategoryController.php +++ b/beike/Admin/Http/Controllers/CategoryController.php @@ -2,13 +2,13 @@ namespace Beike\Admin\Http\Controllers; -use Beike\Models\Category; -use Illuminate\Http\Request; -use Beike\Repositories\LanguageRepo; -use Beike\Repositories\CategoryRepo; -use Beike\Admin\Services\CategoryService; use Beike\Admin\Http\Requests\CategoryRequest; use Beike\Admin\Http\Resources\CategoryResource; +use Beike\Admin\Services\CategoryService; +use Beike\Models\Category; +use Beike\Repositories\CategoryRepo; +use Beike\Repositories\LanguageRepo; +use Illuminate\Http\Request; class CategoryController extends Controller { @@ -17,7 +17,7 @@ class CategoryController extends Controller public function index() { $categories = CategoryRepo::getAdminList(); - $data = [ + $data = [ 'categories' => CategoryResource::collection($categories), ]; @@ -44,10 +44,9 @@ class CategoryController extends Controller return $this->save($request, $category); } - /** * 删除分类 - * @param Request $request + * @param Request $request * @param Category $category * @return array * @throws \Exception @@ -55,10 +54,10 @@ class CategoryController extends Controller public function destroy(Request $request, Category $category): array { CategoryRepo::delete($category); + return json_success(trans('common.deleted_success')); } - public function name(int $id) { $name = CategoryRepo::getName($id); @@ -73,11 +72,11 @@ class CategoryController extends Controller } $data = [ - 'category' => $category ?? new Category(), - 'languages' => LanguageRepo::all(), + 'category' => $category ?? new Category(), + 'languages' => LanguageRepo::all(), 'descriptions' => $descriptions ?? null, - 'categories' => CategoryRepo::flatten(locale()), - '_redirect' => $this->getRedirect(), + 'categories' => CategoryRepo::flatten(locale()), + '_redirect' => $this->getRedirect(), ]; return view('admin::pages.categories.form', $data); @@ -86,6 +85,7 @@ class CategoryController extends Controller protected function save(Request $request, ?Category $category = null) { (new CategoryService())->createOrUpdate($request->all(), $category); + return redirect($this->getRedirect())->with('success', 'Category created successfully'); } diff --git a/beike/Admin/Http/Controllers/Controller.php b/beike/Admin/Http/Controllers/Controller.php index b4d0566b..b746357b 100644 --- a/beike/Admin/Http/Controllers/Controller.php +++ b/beike/Admin/Http/Controllers/Controller.php @@ -2,8 +2,8 @@ namespace Beike\Admin\Http\Controllers; -use Illuminate\Support\Facades\Route; use App\Http\Controllers\Controller as BaseController; +use Illuminate\Support\Facades\Route; use Symfony\Component\HttpFoundation\BinaryFileResponse; abstract class Controller extends BaseController @@ -19,10 +19,10 @@ abstract class Controller extends BaseController if (empty($this->defaultRoute)) { $this->defaultRoute = $this->getDefaultRoute(); } + return request('_redirect') ?? request()->header('referer', admin_route($this->defaultRoute)); } - /** * 获取当前管理界面列表页路由 * @return string @@ -30,12 +30,12 @@ abstract class Controller extends BaseController private function getDefaultRoute(): string { $currentRouteName = Route::getCurrentRoute()->getName(); - $names = explode('.', $currentRouteName); - $name = $names[1] ?? ''; + $names = explode('.', $currentRouteName); + $name = $names[1] ?? ''; + return "{$name}.index"; } - /** * 导出CSV * @@ -47,37 +47,37 @@ abstract class Controller extends BaseController */ protected function downloadCsv($fileName, $items, string $module = ''): BinaryFileResponse { - $module = $module ?: $fileName; + $module = $module ?: $fileName; $charset = app()->getLocale() == 'zh-hk' ? 'BIG5' : 'GBK'; if (empty($items)) { throw new \Exception(trans('common.empty_items')); } - if (!str_contains($fileName, '.csv')) { + if (! str_contains($fileName, '.csv')) { $fileName = $fileName . '-' . date('YmdHis') . '.csv'; } $headers = [ - 'Cache-Control' => 'must-revalidate, post-check=0, pre-check=0', - 'Content-type' => 'application/octet-stream', + 'Cache-Control' => 'must-revalidate, post-check=0, pre-check=0', + 'Content-type' => 'application/octet-stream', // 'Content-type' => 'text/csv', - 'Content-Disposition' => "attachment; filename={$fileName}", + 'Content-Disposition' => "attachment; filename={$fileName}", 'Content-Transfer-Encoding' => 'binary', - 'Expires' => '0', - 'Pragma' => 'public' + 'Expires' => '0', + 'Pragma' => 'public', ]; $columns = array_keys($items[0]); foreach ($columns as $index => $column) { - $columns[$index] = iconv("UTF-8", "{$charset}//IGNORE", trans("$module.{$column}")); + $columns[$index] = iconv('UTF-8', "{$charset}//IGNORE", trans("$module.{$column}")); } foreach ($items as $index => $item) { foreach ($item as $field => $value) { - $items[$index][$field] = iconv("UTF-8", "{$charset}//IGNORE", $value); + $items[$index][$field] = iconv('UTF-8', "{$charset}//IGNORE", $value); } } $filePath = storage_path('app/' . $fileName); - $file = fopen($filePath, 'w'); + $file = fopen($filePath, 'w'); fputcsv($file, $columns); foreach ($items as $item) { fputcsv($file, $item); diff --git a/beike/Admin/Http/Controllers/CountryController.php b/beike/Admin/Http/Controllers/CountryController.php index 69b4ebc3..2a86f9a6 100644 --- a/beike/Admin/Http/Controllers/CountryController.php +++ b/beike/Admin/Http/Controllers/CountryController.php @@ -51,5 +51,4 @@ class CountryController extends Controller return json_success(trans('common.deleted_success')); } - } diff --git a/beike/Admin/Http/Controllers/CurrencyController.php b/beike/Admin/Http/Controllers/CurrencyController.php index 39ee9bd8..252ca5ff 100644 --- a/beike/Admin/Http/Controllers/CurrencyController.php +++ b/beike/Admin/Http/Controllers/CurrencyController.php @@ -33,13 +33,13 @@ class CurrencyController extends Controller public function store(CurrencyRequest $request) { $data = [ - 'name' => $request->get('name', ''), - 'code' => $request->get('code', ''), - 'symbol_left' => $request->get('symbol_left', ''), - 'symbol_right' => $request->get('symbol_right', ''), - 'decimal_place' => (float)$request->get('decimal_place', 0), - 'value' => (float)$request->get('value', 1), - 'status' => (int)$request->get('status', 0), + 'name' => $request->get('name', ''), + 'code' => $request->get('code', ''), + 'symbol_left' => $request->get('symbol_left', ''), + 'symbol_right' => $request->get('symbol_right', ''), + 'decimal_place' => (float) $request->get('decimal_place', 0), + 'value' => (float) $request->get('value', 1), + 'status' => (int) $request->get('status', 0), ]; $currency = CurrencyRepo::create($data); @@ -49,13 +49,13 @@ class CurrencyController extends Controller public function update(CurrencyRequest $request, int $id) { $data = [ - 'name' => $request->get('name', ''), - 'code' => $request->get('code', ''), - 'symbol_left' => $request->get('symbol_left', ''), - 'symbol_right' => $request->get('symbol_right', ''), - 'decimal_place' => (float)$request->get('decimal_place', 0), - 'value' => (float)$request->get('value', 1), - 'status' => (int)$request->get('status', 0), + 'name' => $request->get('name', ''), + 'code' => $request->get('code', ''), + 'symbol_left' => $request->get('symbol_left', ''), + 'symbol_right' => $request->get('symbol_right', ''), + 'decimal_place' => (float) $request->get('decimal_place', 0), + 'value' => (float) $request->get('value', 1), + 'status' => (int) $request->get('status', 0), ]; $currency = CurrencyRepo::update($id, $data); diff --git a/beike/Admin/Http/Controllers/CustomerController.php b/beike/Admin/Http/Controllers/CustomerController.php index 2bd543cc..0d9e1cd8 100644 --- a/beike/Admin/Http/Controllers/CustomerController.php +++ b/beike/Admin/Http/Controllers/CustomerController.php @@ -29,10 +29,10 @@ class CustomerController extends Controller $customers = CustomerRepo::list($request->only(['name', 'email', 'status', 'from', 'customer_group_id'])); $data = [ - 'customers' => $customers, + 'customers' => $customers, 'customers_format' => CustomerResource::collection($customers)->jsonSerialize(), - 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), - 'type' => 'customer', + 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), + 'type' => 'customer', ]; if ($request->expectsJson()) { @@ -47,10 +47,10 @@ class CustomerController extends Controller $customers = CustomerRepo::list(array_merge($request->only(['name', 'email', 'status', 'from', 'customer_group_id']), ['only_trashed' => true])); $data = [ - 'customers' => $customers, + 'customers' => $customers, 'customers_format' => CustomerResource::collection($customers)->jsonSerialize(), - 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), - 'type' => 'trashed', + 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), + 'type' => 'trashed', ]; if ($request->expectsJson()) { @@ -62,7 +62,7 @@ class CustomerController extends Controller public function store(CustomerRequest $request) { - $data = $request->only(['email', 'name', 'password', 'status', 'customer_group_id']); + $data = $request->only(['email', 'name', 'password', 'status', 'customer_group_id']); $customer = CustomerService::create($data); return json_success(trans('common.success'), new CustomerResource($customer)); @@ -71,14 +71,14 @@ class CustomerController extends Controller public function edit(Request $request, int $customerId) { $addresses = AddressRepo::listByCustomer($customerId); - $customer = CustomerRepo::find($customerId); - $data = [ - 'customer' => $customer, + $customer = CustomerRepo::find($customerId); + $data = [ + 'customer' => $customer, 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), - 'addresses' => AddressResource::collection($addresses)->jsonSerialize(), - 'countries' => CountryRepo::all(), - 'country_id' => system_setting('base.country_id'), - '_redirect' => $this->getRedirect(), + 'addresses' => AddressResource::collection($addresses)->jsonSerialize(), + 'countries' => CountryRepo::all(), + 'country_id' => system_setting('base.country_id'), + '_redirect' => $this->getRedirect(), ]; return view('admin::pages.customers.form', $data); diff --git a/beike/Admin/Http/Controllers/CustomerGroupController.php b/beike/Admin/Http/Controllers/CustomerGroupController.php index 86d9c784..a472a754 100644 --- a/beike/Admin/Http/Controllers/CustomerGroupController.php +++ b/beike/Admin/Http/Controllers/CustomerGroupController.php @@ -11,11 +11,11 @@ namespace Beike\Admin\Http\Controllers; -use Illuminate\Http\Request; -use Beike\Repositories\LanguageRepo; -use Beike\Repositories\CustomerGroupRepo; -use Beike\Admin\Services\CustomerGroupService; use Beike\Admin\Http\Requests\CustomerGroupRequest; +use Beike\Admin\Services\CustomerGroupService; +use Beike\Repositories\CustomerGroupRepo; +use Beike\Repositories\LanguageRepo; +use Illuminate\Http\Request; class CustomerGroupController extends Controller { @@ -27,7 +27,7 @@ class CustomerGroupController extends Controller $data = [ 'customer_groups' => $customers, - 'languages' => LanguageRepo::all(), + 'languages' => LanguageRepo::all(), ]; return view('admin::pages.customer_groups.index', $data); @@ -52,6 +52,7 @@ class CustomerGroupController extends Controller public function destroy(Request $request, int $id) { CustomerGroupRepo::delete($id); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/DesignController.php b/beike/Admin/Http/Controllers/DesignController.php index 4d3305fa..4765cf9b 100644 --- a/beike/Admin/Http/Controllers/DesignController.php +++ b/beike/Admin/Http/Controllers/DesignController.php @@ -2,10 +2,10 @@ namespace Beike\Admin\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\Request; -use Beike\Services\DesignService; use Beike\Repositories\SettingRepo; +use Beike\Services\DesignService; +use Illuminate\Http\Request; +use Illuminate\View\View; class DesignController extends Controller { @@ -18,13 +18,13 @@ class DesignController extends Controller public function index(Request $request): View { $data = [ - 'editors' => ['editor-slide_show', 'editor-image401', 'editor-tab_product', 'editor-image100', 'editor-brand'], + 'editors' => ['editor-slide_show', 'editor-image401', 'editor-tab_product', 'editor-image100', 'editor-brand'], 'design_settings' => system_setting('base.design_setting'), ]; + return view('admin::pages.design.builder.index', $data); } - /** * 预览模块显示结果 * @@ -34,24 +34,23 @@ class DesignController extends Controller */ public function preview(Request $request): View { - $module = json_decode($request->getContent(), true); - $moduleId = $module['module_id'] ?? ''; - $moduleCode = $module['code'] ?? ''; - $content = $module['content'] ?? ''; - $viewPath = "design.{$moduleCode}"; + $module = json_decode($request->getContent(), true); + $moduleId = $module['module_id'] ?? ''; + $moduleCode = $module['code'] ?? ''; + $content = $module['content'] ?? ''; + $viewPath = "design.{$moduleCode}"; $viewData = [ - 'code' => $moduleCode, + 'code' => $moduleCode, 'module_id' => $moduleId, 'view_path' => $viewPath, - 'content' => DesignService::handleModuleContent($moduleCode, $content), - 'design' => (bool)$request->get('design') + 'content' => DesignService::handleModuleContent($moduleCode, $content), + 'design' => (bool) $request->get('design'), ]; return view($viewPath, $viewData); } - /** * 更新所有数据 * @@ -61,9 +60,10 @@ class DesignController extends Controller */ public function update(Request $request): array { - $content = json_decode($request->getContent(), true); + $content = json_decode($request->getContent(), true); $moduleData = DesignService::handleRequestModules($content); SettingRepo::storeValue('design_setting', $moduleData); + return json_success(trans('common.updated_success')); } } diff --git a/beike/Admin/Http/Controllers/DesignFooterController.php b/beike/Admin/Http/Controllers/DesignFooterController.php index 9ae35518..3893bc57 100644 --- a/beike/Admin/Http/Controllers/DesignFooterController.php +++ b/beike/Admin/Http/Controllers/DesignFooterController.php @@ -2,10 +2,10 @@ namespace Beike\Admin\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\Request; use Beike\Repositories\FooterRepo; use Beike\Repositories\SettingRepo; +use Illuminate\Http\Request; +use Illuminate\View\View; class DesignFooterController extends Controller { @@ -20,6 +20,7 @@ class DesignFooterController extends Controller $data = [ 'design_settings' => system_setting('base.footer_setting'), ]; + return view('admin::pages.design.builder.footer', $data); } @@ -32,18 +33,17 @@ class DesignFooterController extends Controller */ public function preview(Request $request): View { - $content = json_decode($request->getContent(), true); - $viewPath = "layout.footer"; + $content = json_decode($request->getContent(), true); + $viewPath = 'layout.footer'; $viewData = [ 'footer_content' => FooterRepo::handleFooterData($content), - 'design' => (bool)$request->get('design') + 'design' => (bool) $request->get('design'), ]; return view($viewPath, $viewData); } - /** * 更新所有数据 * @@ -55,7 +55,8 @@ class DesignFooterController extends Controller { $content = json_decode($request->getContent(), true); - SettingRepo::storeValue("footer_setting", $content); + SettingRepo::storeValue('footer_setting', $content); + return json_success(trans('common.updated_success')); } } diff --git a/beike/Admin/Http/Controllers/DesignMenuController.php b/beike/Admin/Http/Controllers/DesignMenuController.php index 680804d4..6d75ea07 100644 --- a/beike/Admin/Http/Controllers/DesignMenuController.php +++ b/beike/Admin/Http/Controllers/DesignMenuController.php @@ -2,10 +2,9 @@ namespace Beike\Admin\Http\Controllers; -use Illuminate\View\View; -use Illuminate\Http\Request; -use Beike\Repositories\FooterRepo; use Beike\Repositories\SettingRepo; +use Illuminate\Http\Request; +use Illuminate\View\View; class DesignMenuController extends Controller { @@ -20,6 +19,7 @@ class DesignMenuController extends Controller $data = [ 'design_settings' => system_setting('base.menu_setting', []), ]; + return view('admin::pages.design.builder.menu', $data); } @@ -34,7 +34,8 @@ class DesignMenuController extends Controller { $content = json_decode($request->getContent(), true); - SettingRepo::storeValue("menu_setting", $content); + SettingRepo::storeValue('menu_setting', $content); + return json_success(trans('common.updated_success')); } } diff --git a/beike/Admin/Http/Controllers/FileManagerController.php b/beike/Admin/Http/Controllers/FileManagerController.php index 506b563a..c3bf1736 100644 --- a/beike/Admin/Http/Controllers/FileManagerController.php +++ b/beike/Admin/Http/Controllers/FileManagerController.php @@ -16,10 +16,10 @@ class FileManagerController extends Controller public function index() { $data = (new FileManagerService)->getDirectories(); + return view('admin::pages.file_manager.index', ['directories' => $data]); } - /** * 获取某个文件夹下面的文件列表 * @@ -30,12 +30,12 @@ class FileManagerController extends Controller public function getFiles(Request $request): array { $baseFolder = $request->get('base_folder'); - $page = (int)$request->get('page'); - $perPage = (int)$request->get('per_page'); + $page = (int) $request->get('page'); + $perPage = (int) $request->get('per_page'); + return (new FileManagerService)->getFiles($baseFolder, $page, $perPage); } - /** * 获取文件夹列表 * @param Request $request @@ -45,10 +45,10 @@ class FileManagerController extends Controller public function getDirectories(Request $request) { $baseFolder = $request->get('base_folder'); + return (new FileManagerService)->getDirectories($baseFolder); } - /** * 创建文件夹 * POST /admin/file_manager @@ -58,10 +58,10 @@ class FileManagerController extends Controller { $folderName = $request->get('name'); (new FileManagerService)->createDirectory($folderName); + return json_success(trans('common.created_success')); } - /** * 文件或文件夹改名 * PUT /admin/file_manager/rename @@ -70,12 +70,12 @@ class FileManagerController extends Controller public function rename(Request $request): array { $originPath = $request->get('origin_name'); - $newPath = $request->get('new_name'); + $newPath = $request->get('new_name'); (new FileManagerService)->updateName($originPath, $newPath); + return json_success(trans('common.updated_success')); } - /** * 删除文件或文件夹 * DELETE /admin/file_manager/files {"path":"/xx/yy", "files":["1.jpg", "2.png"]} @@ -84,13 +84,13 @@ class FileManagerController extends Controller public function destroyFiles(Request $request): array { $requestData = json_decode($request->getContent(), true); - $basePath = $requestData['path'] ?? ''; - $files = $requestData['files'] ?? []; + $basePath = $requestData['path'] ?? ''; + $files = $requestData['files'] ?? []; (new FileManagerService)->deleteFiles($basePath, $files); + return json_success(trans('common.deleted_success')); } - /** * 删除文件夹 * @@ -102,10 +102,10 @@ class FileManagerController extends Controller { $folderName = $request->get('name'); (new FileManagerService)->deleteDirectoryOrFile($folderName); + return json_success(trans('common.deleted_success')); } - /** * 上传文件 * POST /admin/file_manager/upload @@ -115,15 +115,15 @@ class FileManagerController extends Controller */ public function uploadFiles(UploadRequest $request): array { - $file = $request->file('file'); + $file = $request->file('file'); $savePath = $request->get('path'); $originName = $file->getClientOriginalName(); - $filePath = $file->storeAs($savePath, $originName, 'catalog'); + $filePath = $file->storeAs($savePath, $originName, 'catalog'); return [ 'name' => $originName, - 'url' => asset('catalog/' . $filePath), + 'url' => asset('catalog/' . $filePath), ]; } } diff --git a/beike/Admin/Http/Controllers/ForgottenController.php b/beike/Admin/Http/Controllers/ForgottenController.php index afab55be..906682c5 100644 --- a/beike/Admin/Http/Controllers/ForgottenController.php +++ b/beike/Admin/Http/Controllers/ForgottenController.php @@ -35,6 +35,7 @@ class ForgottenController public function sendVerifyCode(VerifyCodeRequest $request) { UserService::sendVerifyCodeForForgotten($request->get('email')); + return json_success(trans('admin/forgotten.verify_code_sent')); } diff --git a/beike/Admin/Http/Controllers/HomeController.php b/beike/Admin/Http/Controllers/HomeController.php index b4a18819..1f6f55cb 100644 --- a/beike/Admin/Http/Controllers/HomeController.php +++ b/beike/Admin/Http/Controllers/HomeController.php @@ -11,15 +11,15 @@ class HomeController extends Controller public function index() { $data = [ - 'views' => DashboardRepo::getCustomerViewData(), - 'orders' => DashboardRepo::getOrderData(), - 'customers' => DashboardRepo::getCustomerData(), + 'views' => DashboardRepo::getCustomerViewData(), + 'orders' => DashboardRepo::getOrderData(), + 'customers' => DashboardRepo::getCustomerData(), 'order_totals' => DashboardRepo::getTotalData(), 'order_trends' => [ 'latest_month' => OrderReportRepo::getLatestMonth(), - 'latest_week' => OrderReportRepo::getLatestWeek(), - 'latest_year' => OrderReportRepo::getLatestYear(), - ] + 'latest_week' => OrderReportRepo::getLatestWeek(), + 'latest_year' => OrderReportRepo::getLatestYear(), + ], ]; return view('admin::pages.home', $data); diff --git a/beike/Admin/Http/Controllers/LanguageController.php b/beike/Admin/Http/Controllers/LanguageController.php index 90727581..09101b9b 100644 --- a/beike/Admin/Http/Controllers/LanguageController.php +++ b/beike/Admin/Http/Controllers/LanguageController.php @@ -12,9 +12,9 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Services\LanguageService; +use Beike\Repositories\LanguageRepo; use Exception; use Illuminate\Http\Request; -use Beike\Repositories\LanguageRepo; class LanguageController extends Controller { @@ -45,10 +45,9 @@ class LanguageController extends Controller return json_success(trans('common.created_success'), $language); } - /** * @param Request $request - * @param int $id + * @param int $id * @return array * @throws Exception */ @@ -59,7 +58,6 @@ class LanguageController extends Controller return json_success(trans('common.updated_success'), $language); } - /** * 删除语言 * diff --git a/beike/Admin/Http/Controllers/LoginController.php b/beike/Admin/Http/Controllers/LoginController.php index f2de0fb1..9de1416a 100644 --- a/beike/Admin/Http/Controllers/LoginController.php +++ b/beike/Admin/Http/Controllers/LoginController.php @@ -11,9 +11,9 @@ namespace Beike\Admin\Http\Controllers; -use Beike\Models\AdminUser; use App\Http\Controllers\Controller; use Beike\Admin\Http\Requests\LoginRequest; +use Beike\Models\AdminUser; class LoginController extends Controller { @@ -22,15 +22,16 @@ class LoginController extends Controller if (auth(AdminUser::AUTH_GUARD)->check()) { return redirect()->back(); } + return view('admin::pages.login.login', \request()->only('admin_email', 'admin_password')); } - public function store(LoginRequest $loginRequest) { if (auth(AdminUser::AUTH_GUARD)->attempt($loginRequest->validated())) { return redirect(admin_route('home.index')); } + return redirect()->back()->with(['error' => trans('auth.failed')])->withInput(); } } diff --git a/beike/Admin/Http/Controllers/LogoutController.php b/beike/Admin/Http/Controllers/LogoutController.php index e4d5c441..9cd16dcc 100644 --- a/beike/Admin/Http/Controllers/LogoutController.php +++ b/beike/Admin/Http/Controllers/LogoutController.php @@ -12,6 +12,7 @@ class LogoutController extends Controller public function index(Request $request) { Auth::guard(AdminUser::AUTH_GUARD)->logout(); + return redirect(admin_route('login.show')); } } diff --git a/beike/Admin/Http/Controllers/MarketingController.php b/beike/Admin/Http/Controllers/MarketingController.php index d9f92426..d236bcf7 100644 --- a/beike/Admin/Http/Controllers/MarketingController.php +++ b/beike/Admin/Http/Controllers/MarketingController.php @@ -11,11 +11,9 @@ namespace Beike\Admin\Http\Controllers; -use Beike\Repositories\PluginRepo; -use ZanySoft\Zip\Zip; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\Storage; use Beike\Admin\Services\MarketingService; +use Beike\Repositories\PluginRepo; +use Illuminate\Http\Request; class MarketingController { @@ -26,14 +24,14 @@ class MarketingController public function index(Request $request) { $filters = [ - 'type' => $request->get('type'), + 'type' => $request->get('type'), 'keyword' => $request->get('keyword'), ]; $plugins = MarketingService::getInstance()->getList($filters); - $data = [ + $data = [ 'plugins' => $plugins, - 'domain' => str_replace(['http://', 'https://'], '', config('app.url')), - 'types' => PluginRepo::getTypes(), + 'domain' => str_replace(['http://', 'https://'], '', config('app.url')), + 'types' => PluginRepo::getTypes(), ]; if ($request->expectsJson()) { @@ -43,7 +41,6 @@ class MarketingController return view('admin::pages.marketing.index', $data); } - /** * 获取单个插件详情 */ @@ -51,37 +48,37 @@ class MarketingController { try { $pluginCode = $request->code; - $plugin = MarketingService::getInstance()->getPlugin($pluginCode); - $data = [ + $plugin = MarketingService::getInstance()->getPlugin($pluginCode); + $data = [ 'domain' => str_replace(['http://', 'https://'], '', config('app.url')), 'plugin' => $plugin, ]; if ($request->expectsJson()) { return $data; } + return view('admin::pages.marketing.show', $data); } catch (\Exception $e) { return redirect(admin_route('marketing.index'))->withErrors(['error' => $e->getMessage()]); } } - /** * 下单购买插件 */ public function buy(Request $request) { try { - $postData = $request->getContent(); + $postData = $request->getContent(); $pluginCode = $request->code; - $result = MarketingService::getInstance()->buy($pluginCode, $postData); + $result = MarketingService::getInstance()->buy($pluginCode, $postData); + return json_success('获取成功', $result); } catch (\Exception $e) { return json_fail($e->getMessage()); } } - /** * 下载插件安装包到本地 */ @@ -90,6 +87,7 @@ class MarketingController try { $pluginCode = $request->code; MarketingService::getInstance()->download($pluginCode); + return json_success('下载解压成功, 请去插件列表安装'); } catch (\Exception $e) { return json_fail($e->getMessage()); diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php index 5906d72e..f20d99d9 100644 --- a/beike/Admin/Http/Controllers/OrderController.php +++ b/beike/Admin/Http/Controllers/OrderController.php @@ -11,13 +11,13 @@ namespace Beike\Admin\Http\Controllers; -use Beike\Models\Order; -use Beike\Services\ShipmentService; -use Illuminate\Http\Request; -use Beike\Repositories\OrderRepo; -use Beike\Services\StateMachineService; use Beike\Admin\Http\Resources\OrderSimple; +use Beike\Models\Order; +use Beike\Repositories\OrderRepo; +use Beike\Services\ShipmentService; +use Beike\Services\StateMachineService; use Beike\Shop\Http\Resources\Account\OrderList; +use Illuminate\Http\Request; class OrderController extends Controller { @@ -31,14 +31,14 @@ class OrderController extends Controller public function index(Request $request) { $orders = OrderRepo::filterOrders($request->all()); - $data = [ - 'orders' => OrderList::collection($orders), + $data = [ + 'orders' => OrderList::collection($orders), 'statuses' => StateMachineService::getAllStatuses(), ]; + return view('admin::pages.orders.index', $data); } - /** * 导出订单列表 * @@ -50,49 +50,50 @@ class OrderController extends Controller { try { $orders = OrderRepo::filterAll($request->all()); - $items = OrderSimple::collection($orders)->jsonSerialize(); + $items = OrderSimple::collection($orders)->jsonSerialize(); + return $this->downloadCsv('orders', $items, 'order'); } catch (\Exception $e) { return redirect(admin_route('orders.index'))->withErrors(['error' => $e->getMessage()]); } } - /** * 查看单个订单 * * @param Request $request - * @param Order $order + * @param Order $order * @return mixed * @throws \Exception */ public function show(Request $request, Order $order) { $order->load(['orderTotals', 'orderHistories', 'orderShipments']); - $data = hook_filter('admin_order_detail', ['order' => $order, 'html_items' => []]); + $data = hook_filter('admin_order_detail', ['order' => $order, 'html_items' => []]); $data['statuses'] = StateMachineService::getInstance($order)->nextBackendStatuses(); + return view('admin::pages.orders.form', $data); } - /** * 更新订单状态,添加订单更新日志 * * @param Request $request - * @param Order $order + * @param Order $order * @return array * @throws \Throwable */ public function updateStatus(Request $request, Order $order) { - $status = $request->get('status'); + $status = $request->get('status'); $comment = $request->get('comment'); - $notify = $request->get('notify'); + $notify = $request->get('notify'); $shipment = ShipmentService::handleShipment(\request('express_code'), \request('express_number')); $stateMachine = new StateMachineService($order); $stateMachine->setShipment($shipment)->changeStatus($status, $comment, $notify); + return json_success(trans('common.updated_success')); } } diff --git a/beike/Admin/Http/Controllers/PagesController.php b/beike/Admin/Http/Controllers/PagesController.php index 38582c93..3ebaeb3e 100644 --- a/beike/Admin/Http/Controllers/PagesController.php +++ b/beike/Admin/Http/Controllers/PagesController.php @@ -12,11 +12,11 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Requests\PageRequest; -use Beike\Models\Page; -use Illuminate\Http\Request; -use Illuminate\Http\RedirectResponse; use Beike\Admin\Repositories\PageRepo; +use Beike\Models\Page; use Beike\Shop\Http\Resources\PageDetail; +use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; class PagesController { @@ -28,14 +28,14 @@ class PagesController public function index() { $pageList = PageRepo::getList(); - $data = [ - 'pages' => $pageList, - 'pages_format' => PageDetail::collection($pageList)->jsonSerialize() + $data = [ + 'pages' => $pageList, + 'pages_format' => PageDetail::collection($pageList)->jsonSerialize(), ]; + return view('admin::pages.pages.index', $data); } - /** * 创建页面 * @@ -46,7 +46,6 @@ class PagesController return view('admin::pages.pages.form', ['page' => new Page()]); } - /** * 保存新建 * @@ -58,62 +57,62 @@ class PagesController try { $requestData = $request->all(); PageRepo::createOrUpdate($requestData); + return redirect(admin_route('pages.index')); } catch (\Exception $e) { return redirect(admin_route('pages.index'))->withErrors(['error' => $e->getMessage()]); } } - /** * @param Request $request - * @param int $pageId + * @param int $pageId * @return mixed */ public function edit(Request $request, int $pageId) { $data = [ - 'page' => PageRepo::findByPageId($pageId), + 'page' => PageRepo::findByPageId($pageId), 'descriptions' => PageRepo::getDescriptionsByLocale($pageId), ]; + return view('admin::pages.pages.form', $data); } - /** * 保存更新 * * @param PageRequest $request - * @param int $pageId + * @param int $pageId * @return RedirectResponse */ public function update(PageRequest $request, int $pageId) { try { - $requestData = $request->all(); + $requestData = $request->all(); $requestData['id'] = $pageId; PageRepo::createOrUpdate($requestData); + return redirect()->to(admin_route('pages.index')); } catch (\Exception $e) { return redirect(admin_route('pages.index'))->withErrors(['error' => $e->getMessage()]); } } - /** * 删除单页 * * @param Request $request - * @param int $pageId + * @param int $pageId * @return array */ public function destroy(Request $request, int $pageId): array { PageRepo::deleteById($pageId); + return json_success(trans('common.deleted_success')); } - /** * 搜索页面标题自动完成 * @param Request $request @@ -122,10 +121,10 @@ class PagesController public function autocomplete(Request $request): array { $products = PageRepo::autocomplete($request->get('name') ?? ''); + return json_success(trans('common.get_success'), $products); } - /** * 获取单页名称 * @param Page $page @@ -134,6 +133,7 @@ class PagesController public function name(Page $page): array { $name = $page->description->title ?? ''; + return json_success(trans('common.get_success'), $name); } } diff --git a/beike/Admin/Http/Controllers/PluginController.php b/beike/Admin/Http/Controllers/PluginController.php index 1379d8e7..62c27ab8 100644 --- a/beike/Admin/Http/Controllers/PluginController.php +++ b/beike/Admin/Http/Controllers/PluginController.php @@ -11,12 +11,12 @@ namespace Beike\Admin\Http\Controllers; -use Exception; -use Illuminate\Http\Request; +use Beike\Admin\Http\Resources\PluginResource; use Beike\Repositories\PluginRepo; use Beike\Repositories\SettingRepo; +use Exception; use Illuminate\Contracts\View\View; -use Beike\Admin\Http\Resources\PluginResource; +use Illuminate\Http\Request; class PluginController extends Controller { @@ -25,12 +25,12 @@ class PluginController extends Controller */ public function index() { - $plugins = app('plugin')->getPlugins(); + $plugins = app('plugin')->getPlugins(); $data['plugins'] = array_values(PluginResource::collection($plugins)->jsonSerialize()); + return view('admin::pages.plugins.index', $data); } - /** * 上传插件 */ @@ -38,10 +38,10 @@ class PluginController extends Controller { $zipFile = $request->file('file'); app('plugin')->import($zipFile); + return json_success(trans('common.success')); } - /** * @param Request $request * @param $code @@ -52,10 +52,10 @@ class PluginController extends Controller { $plugin = app('plugin')->getPluginOrFail($code); PluginRepo::installPlugin($plugin); + return json_success(trans('common.success')); } - /** * @param Request $request * @param $code @@ -66,10 +66,10 @@ class PluginController extends Controller { $plugin = app('plugin')->getPluginOrFail($code); PluginRepo::uninstallPlugin($plugin); + return json_success(trans('common.success')); } - /** * @param Request $request * @param $code @@ -78,13 +78,13 @@ class PluginController extends Controller */ public function edit(Request $request, $code): View { - $plugin = app('plugin')->getPluginOrFail($code); + $plugin = app('plugin')->getPluginOrFail($code); $columnView = $plugin->getColumnView(); - $view = $columnView ?: 'admin::pages.plugins.form'; + $view = $columnView ?: 'admin::pages.plugins.form'; + return view($view, ['plugin' => $plugin]); } - /** * @param Request $request * @param $code @@ -104,10 +104,10 @@ class PluginController extends Controller SettingRepo::update('plugin', $code, $fields); hook_action('after_edit_plugin', ['plugin_code' => $code, 'fields' => $fields]); + return redirect($this->getRedirect())->with('success', trans('common.updated_success')); } - /** * @param Request $request * @param $code @@ -119,6 +119,7 @@ class PluginController extends Controller app('plugin')->getPluginOrFail($code); $status = $request->get('status'); SettingRepo::update('plugin', $code, ['status' => $status]); + return json_success(trans('common.updated_success')); } } diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index e73739f0..0cc6a1b6 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -2,17 +2,16 @@ namespace Beike\Admin\Http\Controllers; +use Beike\Admin\Http\Requests\ProductRequest; use Beike\Admin\Http\Resources\ProductAttributeResource; +use Beike\Admin\Http\Resources\ProductResource; +use Beike\Admin\Repositories\TaxClassRepo; +use Beike\Admin\Services\ProductService; use Beike\Models\Product; -use Beike\Models\ProductAttribute; -use Illuminate\Http\Request; -use Beike\Repositories\ProductRepo; use Beike\Repositories\CategoryRepo; use Beike\Repositories\LanguageRepo; -use Beike\Admin\Services\ProductService; -use Beike\Admin\Repositories\TaxClassRepo; -use Beike\Admin\Http\Requests\ProductRequest; -use Beike\Admin\Http\Resources\ProductResource; +use Beike\Repositories\ProductRepo; +use Illuminate\Http\Request; class ProductController extends Controller { @@ -22,12 +21,12 @@ class ProductController extends Controller { $requestData = $request->all(); $productList = ProductRepo::list($requestData); - $products = ProductResource::collection($productList)->resource; + $products = ProductResource::collection($productList)->resource; $data = [ 'categories' => CategoryRepo::flatten(locale()), - 'products' => $products, - 'type' => 'products', + 'products' => $products, + 'type' => 'products', ]; if ($request->expectsJson()) { @@ -39,15 +38,15 @@ class ProductController extends Controller public function trashed(Request $request) { - $requestData = $request->all(); + $requestData = $request->all(); $requestData['trashed'] = true; - $productList = ProductRepo::list($requestData); - $products = ProductResource::collection($productList)->resource; + $productList = ProductRepo::list($requestData); + $products = ProductResource::collection($productList)->resource; $data = [ 'categories' => CategoryRepo::flatten(locale()), - 'products' => $products, - 'type' => 'trashed', + 'products' => $products, + 'type' => 'trashed', ]; if ($request->expectsJson()) { @@ -66,6 +65,7 @@ class ProductController extends Controller { try { (new ProductService)->create($request->all()); + return redirect()->to(admin_route('products.index')) ->with('success', trans('common.created_success')); } catch (\Exception $e) { @@ -84,6 +84,7 @@ class ProductController extends Controller { try { (new ProductService)->update($product, $request->all()); + return redirect()->to($this->getRedirect())->with('success', trans('common.updated_success')); } catch (\Exception $e) { return redirect(admin_route('products.edit', $product))->withErrors(['error' => $e->getMessage()]); @@ -93,6 +94,7 @@ class ProductController extends Controller public function destroy(Request $request, Product $product) { $product->delete(); + return json_success(trans('common.deleted_success')); } @@ -108,22 +110,22 @@ class ProductController extends Controller { if ($product->id) { $descriptions = $product->descriptions->keyBy('locale'); - $categoryIds = $product->categories->pluck('id')->toArray(); + $categoryIds = $product->categories->pluck('id')->toArray(); $product->load('brand', 'attributes'); } $data = [ - 'product' => $product, - 'descriptions' => $descriptions ?? [], - 'category_ids' => $categoryIds ?? [], + 'product' => $product, + 'descriptions' => $descriptions ?? [], + 'category_ids' => $categoryIds ?? [], 'product_attributes' => ProductAttributeResource::collection($product->attributes), - 'relations' => ProductResource::collection($product->relations)->resource, - 'languages' => LanguageRepo::all(), - 'tax_classes' => TaxClassRepo::getList(), - 'source' => [ + 'relations' => ProductResource::collection($product->relations)->resource, + 'languages' => LanguageRepo::all(), + 'tax_classes' => TaxClassRepo::getList(), + 'source' => [ 'categories' => CategoryRepo::flatten(locale()), ], - '_redirect' => $this->getRedirect(), + '_redirect' => $this->getRedirect(), ]; return view('admin::pages.products.form.form', $data); @@ -136,7 +138,6 @@ class ProductController extends Controller return json_success(trans('common.get_success'), $name); } - /** * 根据商品ID批量获取商品名称 * @@ -146,12 +147,11 @@ class ProductController extends Controller public function getNames(Request $request): array { $productIds = explode(',', $request->get('product_ids')); - $name = ProductRepo::getNames($productIds); + $name = ProductRepo::getNames($productIds); return json_success(trans('common.get_success'), $name); } - public function autocomplete(Request $request) { $products = ProductRepo::autocomplete($request->get('name') ?? ''); @@ -166,7 +166,6 @@ class ProductController extends Controller return json_success(trans('common.updated_success'), []); } - public function destroyByIds(Request $request) { ProductRepo::DeleteByIds($request->get('ids')); diff --git a/beike/Admin/Http/Controllers/RegionController.php b/beike/Admin/Http/Controllers/RegionController.php index 503cdd3c..77699ac0 100644 --- a/beike/Admin/Http/Controllers/RegionController.php +++ b/beike/Admin/Http/Controllers/RegionController.php @@ -11,18 +11,17 @@ namespace Beike\Admin\Http\Controllers; -use Beike\Models\Region; -use Illuminate\Http\Request; -use Beike\Repositories\CountryRepo; use Beike\Admin\Repositories\RegionRepo; +use Beike\Repositories\CountryRepo; +use Illuminate\Http\Request; class RegionController { public function index() { $data = [ - 'regions' => RegionRepo::getList(), - 'countries' => CountryRepo::all() + 'regions' => RegionRepo::getList(), + 'countries' => CountryRepo::all(), ]; return view('admin::pages.regions.index', $data); @@ -31,21 +30,24 @@ class RegionController public function store(Request $request) { $requestData = json_decode($request->getContent(), true); - $region = RegionRepo::createOrUpdate($requestData); + $region = RegionRepo::createOrUpdate($requestData); + return json_success(trans('common.created_success'), $region); } public function update(Request $request, int $regionId) { - $requestData = json_decode($request->getContent(), true); + $requestData = json_decode($request->getContent(), true); $requestData['id'] = $regionId; - $region = RegionRepo::createOrUpdate($requestData); + $region = RegionRepo::createOrUpdate($requestData); + return json_success(trans('common.updated_success'), $region); } public function destroy(Request $request, int $regionId) { RegionRepo::deleteById($regionId); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/RmaController.php b/beike/Admin/Http/Controllers/RmaController.php index a04dd6d6..75ee47bd 100644 --- a/beike/Admin/Http/Controllers/RmaController.php +++ b/beike/Admin/Http/Controllers/RmaController.php @@ -13,10 +13,7 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Resources\RmaDetail; use Beike\Admin\Http\Resources\RmaHistoryDetail; -use Beike\Models\Rma; -use Beike\Repositories\RmaReasonRepo; use Beike\Repositories\RmaRepo; -use Exception; use Illuminate\Http\Request; class RmaController extends Controller @@ -25,7 +22,7 @@ class RmaController extends Controller { $rmas = RmaRepo::list($request->only('name', 'email', 'telephone', 'product_name', 'sku', 'type', 'status')); $data = [ - 'rmas' => $rmas, + 'rmas' => $rmas, 'rmas_format' => RmaDetail::collection($rmas)->jsonSerialize(), ]; @@ -38,13 +35,14 @@ class RmaController extends Controller */ public function show(int $id) { - $rma = RmaRepo::find($id); + $rma = RmaRepo::find($id); $data = [ - 'rma' => (new RmaDetail($rma))->jsonSerialize(), + 'rma' => (new RmaDetail($rma))->jsonSerialize(), 'histories' => RmaHistoryDetail::collection($rma->histories)->jsonSerialize(), - 'statuses' => RmaRepo::getStatuses(), - 'types' => RmaRepo::getTypes(), + 'statuses' => RmaRepo::getStatuses(), + 'types' => RmaRepo::getTypes(), ]; + return view('admin::pages.rmas.info', $data); } @@ -53,9 +51,10 @@ class RmaController extends Controller RmaRepo::addHistory($id, $request->only('status', 'notify', 'comment')); $data = [ - 'rma' => (new RmaDetail(RmaRepo::find($id)))->jsonSerialize(), - 'statuses' => RmaRepo::getStatuses(), - ]; + 'rma' => (new RmaDetail(RmaRepo::find($id)))->jsonSerialize(), + 'statuses' => RmaRepo::getStatuses(), + ]; + return json_success(trans('common.updated_success'), $data); } diff --git a/beike/Admin/Http/Controllers/RmaReasonController.php b/beike/Admin/Http/Controllers/RmaReasonController.php index e59c38dc..cc20b1aa 100644 --- a/beike/Admin/Http/Controllers/RmaReasonController.php +++ b/beike/Admin/Http/Controllers/RmaReasonController.php @@ -12,8 +12,8 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Resources\RmaReasonDetail; -use Beike\Repositories\RmaReasonRepo; use Beike\Repositories\LanguageRepo; +use Beike\Repositories\RmaReasonRepo; use Exception; use Illuminate\Http\Request; @@ -24,7 +24,7 @@ class RmaReasonController extends Controller $rmaReasons = RmaReasonRepo::list($request->only('name')); $data = [ - 'languages' => LanguageRepo::all(), + 'languages' => LanguageRepo::all(), 'rmaReasons' => RmaReasonDetail::collection($rmaReasons)->jsonSerialize(), ]; @@ -38,6 +38,7 @@ class RmaReasonController extends Controller public function store(Request $request): array { $rmaReason = RmaReasonRepo::create($request->only('name')); + return json_success(trans('common.created_success'), $rmaReason); } diff --git a/beike/Admin/Http/Controllers/SettingController.php b/beike/Admin/Http/Controllers/SettingController.php index 9c1e75aa..794fa5a1 100644 --- a/beike/Admin/Http/Controllers/SettingController.php +++ b/beike/Admin/Http/Controllers/SettingController.php @@ -11,12 +11,12 @@ namespace Beike\Admin\Http\Controllers; -use Illuminate\Http\Request; -use Beike\Repositories\SettingRepo; +use Beike\Admin\Http\Resources\CustomerGroupDetail; use Beike\Repositories\CountryRepo; use Beike\Repositories\CurrencyRepo; use Beike\Repositories\CustomerGroupRepo; -use Beike\Admin\Http\Resources\CustomerGroupDetail; +use Beike\Repositories\SettingRepo; +use Illuminate\Http\Request; class SettingController extends Controller { @@ -29,26 +29,25 @@ class SettingController extends Controller { $themes = [ ['value' => 'default', 'label' => trans('admin/setting.theme_default')], - ['value' => 'black', 'label' => trans('admin/setting.theme_black')] + ['value' => 'black', 'label' => trans('admin/setting.theme_black')], ]; $tax_address = [ ['value' => 'shipping', 'label' => trans('admin/setting.shipping_address')], - ['value' => 'payment', 'label' => trans('admin/setting.payment_address')] + ['value' => 'payment', 'label' => trans('admin/setting.payment_address')], ]; $data = [ - 'countries' => CountryRepo::listEnabled(), - 'currencies' => CurrencyRepo::listEnabled(), - 'tax_address' => $tax_address, + 'countries' => CountryRepo::listEnabled(), + 'currencies' => CurrencyRepo::listEnabled(), + 'tax_address' => $tax_address, 'customer_groups' => CustomerGroupDetail::collection(CustomerGroupRepo::list())->jsonSerialize(), - 'themes' => $themes + 'themes' => $themes, ]; return view('admin::pages.setting', $data); } - /** * 更新系统设置 * @@ -63,13 +62,15 @@ class SettingController extends Controller $oldAdminName = admin_name(); $newAdminName = $settings['admin_name'] ?: 'admin'; - $settingUrl = str_replace($oldAdminName, $newAdminName, admin_route('settings.index')); + $settingUrl = str_replace($oldAdminName, $newAdminName, admin_route('settings.index')); + return redirect($settingUrl)->with('success', trans('common.updated_success')); } public function storeDeveloperToken(Request $request) { SettingRepo::storeValue('developer_token', $request->get('developer_token')); + return json_success(trans('common.updated_success')); } } diff --git a/beike/Admin/Http/Controllers/TaxClassController.php b/beike/Admin/Http/Controllers/TaxClassController.php index 5e88f1b4..cd91fdf3 100644 --- a/beike/Admin/Http/Controllers/TaxClassController.php +++ b/beike/Admin/Http/Controllers/TaxClassController.php @@ -11,18 +11,18 @@ namespace Beike\Admin\Http\Controllers; +use Beike\Admin\Repositories\TaxClassRepo; use Beike\Models\TaxRate; use Illuminate\Http\Request; -use Beike\Admin\Repositories\TaxClassRepo; class TaxClassController extends Controller { public function index() { $data = [ - 'tax_classes' => TaxClassRepo::getList(), + 'tax_classes' => TaxClassRepo::getList(), 'all_tax_rates' => TaxRate::all(), - 'bases' => TaxClassRepo::BASE_TYPES, + 'bases' => TaxClassRepo::BASE_TYPES, ]; return view('admin::pages.tax_classes.index', $data); @@ -31,21 +31,24 @@ class TaxClassController extends Controller public function store(Request $request) { $requestData = json_decode($request->getContent(), true); - $taxClass = TaxClassRepo::createOrUpdate($requestData); + $taxClass = TaxClassRepo::createOrUpdate($requestData); + return json_success(trans('common.created_success'), $taxClass); } public function update(Request $request, int $taxClassId) { - $requestData = json_decode($request->getContent(), true); + $requestData = json_decode($request->getContent(), true); $requestData['id'] = $taxClassId; - $taxClass = TaxClassRepo::createOrUpdate($requestData); + $taxClass = TaxClassRepo::createOrUpdate($requestData); + return json_success(trans('common.updated_success'), $taxClass); } public function destroy(Request $request, int $taxClassId) { TaxClassRepo::deleteById($taxClassId); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/TaxRateController.php b/beike/Admin/Http/Controllers/TaxRateController.php index 13c8bc9b..4b5bf186 100644 --- a/beike/Admin/Http/Controllers/TaxRateController.php +++ b/beike/Admin/Http/Controllers/TaxRateController.php @@ -12,9 +12,9 @@ namespace Beike\Admin\Http\Controllers; use Beike\Admin\Http\Requests\TaxRateRequest; +use Beike\Admin\Repositories\TaxRateRepo; use Beike\Models\Region; use Illuminate\Http\Request; -use Beike\Admin\Repositories\TaxRateRepo; class TaxRateController { @@ -22,7 +22,7 @@ class TaxRateController { $data = [ 'tax_rates' => TaxRateRepo::getList(), - 'regions' => Region::all() + 'regions' => Region::all(), ]; return view('admin::pages.tax_rates.index', $data); @@ -31,23 +31,26 @@ class TaxRateController public function store(TaxRateRequest $request) { $requestData = json_decode($request->getContent(), true); - $taxRate = TaxRateRepo::createOrUpdate($requestData); + $taxRate = TaxRateRepo::createOrUpdate($requestData); $taxRate->load('region'); + return json_success(trans('common.created_success'), $taxRate); } public function update(TaxRateRequest $request, int $taxRateId) { - $requestData = json_decode($request->getContent(), true); + $requestData = json_decode($request->getContent(), true); $requestData['id'] = $taxRateId; - $taxRate = TaxRateRepo::createOrUpdate($requestData); + $taxRate = TaxRateRepo::createOrUpdate($requestData); $taxRate->load('region'); + return json_success(trans('common.updated_success'), $taxRate); } public function destroy(Request $request, int $taxRateId) { TaxRateRepo::deleteById($taxRateId); + return json_success(trans('common.deleted_success')); } } diff --git a/beike/Admin/Http/Controllers/ZoneController.php b/beike/Admin/Http/Controllers/ZoneController.php index 86d4a41b..b1b6b654 100644 --- a/beike/Admin/Http/Controllers/ZoneController.php +++ b/beike/Admin/Http/Controllers/ZoneController.php @@ -22,8 +22,8 @@ class ZoneController extends Controller $zones = ZoneRepo::list($request->only('name', 'code', 'status')); $data = [ - 'zones' => $zones, - 'countries' => CountryRepo::all() + 'zones' => $zones, + 'countries' => CountryRepo::all(), ]; if ($request->expectsJson()) { diff --git a/beike/Admin/Http/Requests/AdminUserRequest.php b/beike/Admin/Http/Requests/AdminUserRequest.php index 851d7437..e8a7aeb6 100644 --- a/beike/Admin/Http/Requests/AdminUserRequest.php +++ b/beike/Admin/Http/Requests/AdminUserRequest.php @@ -32,7 +32,7 @@ class AdminUserRequest extends FormRequest */ public function rules(): array { - if (!$this->id) { + if (! $this->id) { $rules['email'] = 'required|email:rfc|unique:admin_users,email'; } else { $rules['email'] = 'required|email:rfc|unique:admin_users,email,' . $this->id; diff --git a/beike/Admin/Http/Requests/CurrencyRequest.php b/beike/Admin/Http/Requests/CurrencyRequest.php index f67453ee..1511bcdd 100644 --- a/beike/Admin/Http/Requests/CurrencyRequest.php +++ b/beike/Admin/Http/Requests/CurrencyRequest.php @@ -24,11 +24,11 @@ class CurrencyRequest extends FormRequest public function rules() { return [ - 'name' => 'required', - 'code' => 'required|max:16', - 'symbol_left' => 'max:16', - 'symbol_right' => 'max:16', - 'value' => 'required', + 'name' => 'required', + 'code' => 'required|max:16', + 'symbol_left' => 'max:16', + 'symbol_right' => 'max:16', + 'value' => 'required', 'decimal_place' => 'required|max:1', ]; } @@ -36,11 +36,11 @@ class CurrencyRequest extends FormRequest public function attributes() { return [ - 'name' => trans('currency.name'), - 'code' => trans('currency.code'), - 'symbol_left' => trans('currency.symbol_left'), - 'symbol_right' => trans('currency.symbol_right'), - 'value' => trans('currency.value'), + 'name' => trans('currency.name'), + 'code' => trans('currency.code'), + 'symbol_left' => trans('currency.symbol_left'), + 'symbol_right' => trans('currency.symbol_right'), + 'value' => trans('currency.value'), 'decimal_place' => trans('currency.decimal_place'), ]; } diff --git a/beike/Admin/Http/Requests/CustomerGroupRequest.php b/beike/Admin/Http/Requests/CustomerGroupRequest.php index 29ad9efd..b79322b5 100644 --- a/beike/Admin/Http/Requests/CustomerGroupRequest.php +++ b/beike/Admin/Http/Requests/CustomerGroupRequest.php @@ -34,7 +34,7 @@ class CustomerGroupRequest extends FormRequest { return [ 'name.*' => 'required|max:64', - 'level' => 'required|max:16', + 'level' => 'required|max:16', ]; } @@ -42,7 +42,7 @@ class CustomerGroupRequest extends FormRequest { return [ 'descriptions.*.name' => trans('customer_group.name'), - 'level' => trans('customer_group.level'), + 'level' => trans('customer_group.level'), ]; } } diff --git a/beike/Admin/Http/Requests/CustomerRequest.php b/beike/Admin/Http/Requests/CustomerRequest.php index 497e3804..51bc8da5 100644 --- a/beike/Admin/Http/Requests/CustomerRequest.php +++ b/beike/Admin/Http/Requests/CustomerRequest.php @@ -33,24 +33,25 @@ class CustomerRequest extends FormRequest public function rules() { $rules = [ - 'name' => 'required|max:64', - 'email' => 'required|email:rfc|unique:customers', + 'name' => 'required|max:64', + 'email' => 'required|email:rfc|unique:customers', 'customer_group_id' => 'required|exists:customer_groups,id', ]; - if (!$this->id) { + if (! $this->id) { $rules['password'] = 'required|max:64'; } else { $rules['email'] = 'required|email:rfc|unique:customers,email,' . $this->id; } + return $rules; } public function attributes() { return [ - 'name' => trans('customer.name'), - 'email' => trans('customer.email'), - 'password' => trans('customer.password'), + 'name' => trans('customer.name'), + 'email' => trans('customer.email'), + 'password' => trans('customer.password'), 'customer_group_id' => trans('customer.customer_group_id'), ]; } diff --git a/beike/Admin/Http/Requests/ForgottenRequest.php b/beike/Admin/Http/Requests/ForgottenRequest.php index cb9c10a2..9f74aafc 100644 --- a/beike/Admin/Http/Requests/ForgottenRequest.php +++ b/beike/Admin/Http/Requests/ForgottenRequest.php @@ -31,7 +31,7 @@ class ForgottenRequest extends FormRequest public function attributes() { return [ - 'password' => trans('customer.password') + 'password' => trans('customer.password'), ]; } } diff --git a/beike/Admin/Http/Requests/LoginRequest.php b/beike/Admin/Http/Requests/LoginRequest.php index dc8a204d..93febce2 100644 --- a/beike/Admin/Http/Requests/LoginRequest.php +++ b/beike/Admin/Http/Requests/LoginRequest.php @@ -24,10 +24,8 @@ class LoginRequest extends FormRequest public function rules(): array { return [ - 'email' => ['required', 'email'], + 'email' => ['required', 'email'], 'password' => 'required', ]; } - - } diff --git a/beike/Admin/Http/Requests/PageRequest.php b/beike/Admin/Http/Requests/PageRequest.php index 631313a9..54090710 100644 --- a/beike/Admin/Http/Requests/PageRequest.php +++ b/beike/Admin/Http/Requests/PageRequest.php @@ -33,9 +33,9 @@ class PageRequest extends FormRequest public function rules(): array { $rules = [ - 'descriptions.*.title' => 'required|string|min:3|max:32', + 'descriptions.*.title' => 'required|string|min:3|max:32', 'descriptions.*.content' => 'required|string', - 'descriptions.*.locale' => 'required|string', + 'descriptions.*.locale' => 'required|string', ]; return $rules; @@ -44,7 +44,7 @@ class PageRequest extends FormRequest public function attributes() { return [ - 'title' => trans('page.title'), + 'title' => trans('page.title'), 'content' => trans('page.content'), ]; } diff --git a/beike/Admin/Http/Requests/ProductRequest.php b/beike/Admin/Http/Requests/ProductRequest.php index dc2d0a5d..eb036a6b 100644 --- a/beike/Admin/Http/Requests/ProductRequest.php +++ b/beike/Admin/Http/Requests/ProductRequest.php @@ -34,11 +34,11 @@ class ProductRequest extends FormRequest { return [ 'descriptions.*.name' => 'required|string|min:3|max:128', - 'brand_id' => 'int', - 'skus.*.sku' => 'required|string', - 'skus.*.price' => 'required|numeric', + 'brand_id' => 'int', + 'skus.*.sku' => 'required|string', + 'skus.*.price' => 'required|numeric', 'skus.*.origin_price' => 'required|numeric', - 'skus.*.cost_price' => 'numeric', + 'skus.*.cost_price' => 'numeric', ]; } @@ -46,11 +46,11 @@ class ProductRequest extends FormRequest { return [ 'descriptions.*.name' => trans('product.name'), - 'brand_id' => trans('product.brand'), - 'skus.*.sku' => trans('product.sku'), - 'skus.*.price' => trans('product.price'), + 'brand_id' => trans('product.brand'), + 'skus.*.sku' => trans('product.sku'), + 'skus.*.price' => trans('product.price'), 'skus.*.origin_price' => trans('product.origin_price'), - 'skus.*.cost_price' => trans('product.cost_price'), + 'skus.*.cost_price' => trans('product.cost_price'), ]; } } diff --git a/beike/Admin/Http/Requests/RmaRequest.php b/beike/Admin/Http/Requests/RmaRequest.php index 66c793d4..671eab1f 100644 --- a/beike/Admin/Http/Requests/RmaRequest.php +++ b/beike/Admin/Http/Requests/RmaRequest.php @@ -33,27 +33,28 @@ class RmaRequest extends FormRequest public function rules() { $rules = [ - 'order_id' => 'required|exists:orders,id', + 'order_id' => 'required|exists:orders,id', 'order_product_id' => 'required|exists:order_products,id', - 'customer_id' => 'required|exists:customers,id', - 'quantity' => 'required', - 'opened' => 'required', - 'rma_reason_id' => 'required|exists:rma_reasons,id', - 'type' => 'required', + 'customer_id' => 'required|exists:customers,id', + 'quantity' => 'required', + 'opened' => 'required', + 'rma_reason_id' => 'required|exists:rma_reasons,id', + 'type' => 'required', ]; + return $rules; } public function attributes() { return [ - 'order_id' => trans('rma.order_id'), + 'order_id' => trans('rma.order_id'), 'order_product_id' => trans('rma.order_product_id'), - 'customer_id' => trans('rma.customer_id'), - 'quantity' => trans('rma.quantity'), - 'opened' => trans('rma.opened'), - 'rma_reason_id' => trans('rma.rma_reason_id'), - 'type' => trans('rma.type'), + 'customer_id' => trans('rma.customer_id'), + 'quantity' => trans('rma.quantity'), + 'opened' => trans('rma.opened'), + 'rma_reason_id' => trans('rma.rma_reason_id'), + 'type' => trans('rma.type'), ]; } } diff --git a/beike/Admin/Http/Requests/TaxRateRequest.php b/beike/Admin/Http/Requests/TaxRateRequest.php index dadd313c..2d6915b2 100644 --- a/beike/Admin/Http/Requests/TaxRateRequest.php +++ b/beike/Admin/Http/Requests/TaxRateRequest.php @@ -33,19 +33,19 @@ class TaxRateRequest extends FormRequest public function rules(): array { $rule = [ - 'name' => 'required|string|max:10', - 'rate' => 'required|numeric', - 'type' => 'required|in:percent,flat', + 'name' => 'required|string|max:10', + 'rate' => 'required|numeric', + 'type' => 'required|in:percent,flat', 'region_id' => 'required|int', ]; if ($this->type == 'percent') { $rule['rate'] = 'required|numeric|gt:0|lt:100'; } + return $rule; } - public function attributes() { return [ diff --git a/beike/Admin/Http/Resources/AddressResource.php b/beike/Admin/Http/Resources/AddressResource.php index 613c1fff..feaa85ab 100644 --- a/beike/Admin/Http/Resources/AddressResource.php +++ b/beike/Admin/Http/Resources/AddressResource.php @@ -9,22 +9,22 @@ class AddressResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'name' => $this->name, - 'phone' => $this->phone, + 'name' => $this->name, + 'phone' => $this->phone, 'country_id' => $this->country_id, - 'country' => $this->country->name, - 'zone_id' => $this->zone_id, - 'zone' => $this->zone, - 'city' => $this->city, - 'zipcode' => $this->zipcode, - 'address_1' => $this->address_1, - 'address_2' => $this->address_2, + 'country' => $this->country->name, + 'zone_id' => $this->zone_id, + 'zone' => $this->zone, + 'city' => $this->city, + 'zipcode' => $this->zipcode, + 'address_1' => $this->address_1, + 'address_2' => $this->address_2, ]; return $data; diff --git a/beike/Admin/Http/Resources/AdminUserDetail.php b/beike/Admin/Http/Resources/AdminUserDetail.php index 657d2d60..a7311719 100644 --- a/beike/Admin/Http/Resources/AdminUserDetail.php +++ b/beike/Admin/Http/Resources/AdminUserDetail.php @@ -18,11 +18,11 @@ class AdminUserDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'name' => $this->name, - 'email' => $this->email, - 'locale' => $this->locale, - 'roles' => $this->roles, + 'id' => $this->id, + 'name' => $this->name, + 'email' => $this->email, + 'locale' => $this->locale, + 'roles' => $this->roles, 'roles_name' => $this->roles->pluck('name')->toArray(), 'created_at' => time_format($this->created_at), 'updated_at' => time_format($this->updated_at), diff --git a/beike/Admin/Http/Resources/AttributeDetailResource.php b/beike/Admin/Http/Resources/AttributeDetailResource.php index ffbdec08..76ceaea4 100644 --- a/beike/Admin/Http/Resources/AttributeDetailResource.php +++ b/beike/Admin/Http/Resources/AttributeDetailResource.php @@ -9,20 +9,20 @@ class AttributeDetailResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, - 'attribute_group_id' => $this->attribute_group_id, - 'name' => $this->description->name ?? '', - 'sort_order' => $this->sort_order, + 'id' => $this->id, + 'attribute_group_id' => $this->attribute_group_id, + 'name' => $this->description->name ?? '', + 'sort_order' => $this->sort_order, 'attribute_group_name' => $this->attributeGroup->description->name ?? '', - 'created_at' => time_format($this->created_at), - 'values' => AttributeValueResource::collection($this->values), - 'descriptions' => $this->descriptions + 'created_at' => time_format($this->created_at), + 'values' => AttributeValueResource::collection($this->values), + 'descriptions' => $this->descriptions, ]; return $data; diff --git a/beike/Admin/Http/Resources/AttributeResource.php b/beike/Admin/Http/Resources/AttributeResource.php index f6d98ff2..13e22bb3 100644 --- a/beike/Admin/Http/Resources/AttributeResource.php +++ b/beike/Admin/Http/Resources/AttributeResource.php @@ -9,17 +9,17 @@ class AttributeResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, - 'name' => $this->description->name ?? '', - 'sort_order' => $this->sort_order, + 'id' => $this->id, + 'name' => $this->description->name ?? '', + 'sort_order' => $this->sort_order, 'attribute_group_name' => $this->attributeGroup->description->name ?? '', - 'created_at' => time_format($this->created_at), + 'created_at' => time_format($this->created_at), ]; return $data; diff --git a/beike/Admin/Http/Resources/AttributeValueResource.php b/beike/Admin/Http/Resources/AttributeValueResource.php index 2aa0225f..e2b9b4a2 100644 --- a/beike/Admin/Http/Resources/AttributeValueResource.php +++ b/beike/Admin/Http/Resources/AttributeValueResource.php @@ -9,18 +9,18 @@ class AttributeValueResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, + 'id' => $this->id, 'attribute_id' => $this->attribute_id, - 'name' => $this->description->name, - 'description' => $this->description, + 'name' => $this->description->name, + 'description' => $this->description, 'descriptions' => $this->descriptions, - 'created_at' => time_format($this->created_at), + 'created_at' => time_format($this->created_at), ]; return $data; diff --git a/beike/Admin/Http/Resources/AutocompleteResource.php b/beike/Admin/Http/Resources/AutocompleteResource.php index 81e5cc4c..52e37da1 100644 --- a/beike/Admin/Http/Resources/AutocompleteResource.php +++ b/beike/Admin/Http/Resources/AutocompleteResource.php @@ -9,13 +9,13 @@ class AutocompleteResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, + 'id' => $this->id, 'name' => $this->description->name ?? '', ]; diff --git a/beike/Admin/Http/Resources/CategoryResource.php b/beike/Admin/Http/Resources/CategoryResource.php index 8ecf3df5..85020f3d 100644 --- a/beike/Admin/Http/Resources/CategoryResource.php +++ b/beike/Admin/Http/Resources/CategoryResource.php @@ -9,19 +9,19 @@ class CategoryResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, - 'name' => $this->description->name ?? '', + 'id' => $this->id, + 'name' => $this->description->name ?? '', 'parent_id' => $this->parent_id, - 'position' => $this->position, - 'active' => $this->active, - 'url_edit' => admin_route('categories.edit', $this), - 'children' => CategoryResource::collection($this->children), + 'position' => $this->position, + 'active' => $this->active, + 'url_edit' => admin_route('categories.edit', $this), + 'children' => self::collection($this->children), ]; return $data; diff --git a/beike/Admin/Http/Resources/CustomerGroupDetail.php b/beike/Admin/Http/Resources/CustomerGroupDetail.php index f6ddd2aa..fbb7aac3 100644 --- a/beike/Admin/Http/Resources/CustomerGroupDetail.php +++ b/beike/Admin/Http/Resources/CustomerGroupDetail.php @@ -10,20 +10,20 @@ class CustomerGroupDetail extends JsonResource /** * Transform the resource into an array. * - * @param Request $request + * @param Request $request * @return array */ public function toArray($request): array { $data = [ - 'id' => $this->id, - 'total' => $this->total, + 'id' => $this->id, + 'total' => $this->total, 'reward_point_factor' => $this->reward_point_factor, - 'use_point_factor' => $this->use_point_factor, - 'discount_factor' => $this->discount_factor, - 'level' => $this->level, - 'name' => $this->description->name ?? '', - 'description' => $this->description->description ?? '', + 'use_point_factor' => $this->use_point_factor, + 'discount_factor' => $this->discount_factor, + 'level' => $this->level, + 'name' => $this->description->name ?? '', + 'description' => $this->description->description ?? '', ]; return $data; diff --git a/beike/Admin/Http/Resources/CustomerResource.php b/beike/Admin/Http/Resources/CustomerResource.php index 9d5840e1..3e8cf3c3 100644 --- a/beike/Admin/Http/Resources/CustomerResource.php +++ b/beike/Admin/Http/Resources/CustomerResource.php @@ -9,22 +9,22 @@ class CustomerResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, - 'name' => $this->name, - 'email' => $this->email, - 'status' => $this->status, - 'created_at' => time_format($this->created_at), - 'avatar' => image_resize($this->avatar), - 'from' => $this->from, + 'id' => $this->id, + 'name' => $this->name, + 'email' => $this->email, + 'status' => $this->status, + 'created_at' => time_format($this->created_at), + 'avatar' => image_resize($this->avatar), + 'from' => $this->from, 'customer_group_name' => $this->customerGroup->description->name ?? '', - 'edit' => admin_route('customers.edit', $this->id), - 'delete' => admin_route('customers.destroy', $this->id), + 'edit' => admin_route('customers.edit', $this->id), + 'delete' => admin_route('customers.destroy', $this->id), ]; return $data; diff --git a/beike/Admin/Http/Resources/OrderSimple.php b/beike/Admin/Http/Resources/OrderSimple.php index 6c752783..057978fb 100644 --- a/beike/Admin/Http/Resources/OrderSimple.php +++ b/beike/Admin/Http/Resources/OrderSimple.php @@ -18,13 +18,13 @@ class OrderSimple extends JsonResource public function toArray($request): array { $data = [ - 'id' => $this->id, - 'number' => $this->number, + 'id' => $this->id, + 'number' => $this->number, 'customer_name' => $this->customer_name, - 'email' => $this->email, - 'telephone' => $this->telephone, - 'created_at' => $this->created_at, - 'updated_at' => $this->updated_at, + 'email' => $this->email, + 'telephone' => $this->telephone, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, 'status_format' => $this->status_format, ]; diff --git a/beike/Admin/Http/Resources/PluginResource.php b/beike/Admin/Http/Resources/PluginResource.php index 8c378ec4..abc50a4d 100644 --- a/beike/Admin/Http/Resources/PluginResource.php +++ b/beike/Admin/Http/Resources/PluginResource.php @@ -17,19 +17,19 @@ class PluginResource extends JsonResource public function toArray($request): array { $data = [ - 'name' => $this->name, - 'version' => $this->version, - 'dir_name' => $this->dirName, - 'path' => $this->path, - 'code' => $this->code, + 'name' => $this->name, + 'version' => $this->version, + 'dir_name' => $this->dirName, + 'path' => $this->path, + 'code' => $this->code, 'description' => $this->description, - 'type' => $this->type, + 'type' => $this->type, 'type_format' => trans('admin/plugin.' . $this->type), - 'icon' => plugin_resize($this->code, $this->icon), - 'author' => $this->author, - 'status' => $this->getStatus(), - 'installed' => $this->getInstalled(), - 'edit_url' => $this->getEditUrl(), + 'icon' => plugin_resize($this->code, $this->icon), + 'author' => $this->author, + 'status' => $this->getStatus(), + 'installed' => $this->getInstalled(), + 'edit_url' => $this->getEditUrl(), ]; return $data; diff --git a/beike/Admin/Http/Resources/ProductAttributeResource.php b/beike/Admin/Http/Resources/ProductAttributeResource.php index f08575d6..00b4cc9a 100644 --- a/beike/Admin/Http/Resources/ProductAttributeResource.php +++ b/beike/Admin/Http/Resources/ProductAttributeResource.php @@ -18,15 +18,15 @@ class ProductAttributeResource extends JsonResource { $this->load('attribute', 'attributeValue'); $data = [ - 'attribute' => [ - 'id' => $this->attribute_id, + 'attribute' => [ + 'id' => $this->attribute_id, 'name' => $this->attribute->description->name, ], 'attribute_value' => [ - 'id' => $this->attribute_value_id, + 'id' => $this->attribute_value_id, 'name' => $this->attributeValue->description->name, ], - ]; + ]; return $data; } diff --git a/beike/Admin/Http/Resources/ProductResource.php b/beike/Admin/Http/Resources/ProductResource.php index ac332f5e..dc5f7b70 100644 --- a/beike/Admin/Http/Resources/ProductResource.php +++ b/beike/Admin/Http/Resources/ProductResource.php @@ -19,18 +19,18 @@ class ProductResource extends JsonResource $masterSku = $this->master_sku; $data = [ - 'id' => $this->id, - 'images' => array_map(function ($image) { + 'id' => $this->id, + 'images' => array_map(function ($image) { return image_resize($image); }, $this->images ?? []), - 'name' => $this->description->name ?? '', + 'name' => $this->description->name ?? '', 'price_formatted' => currency_format($masterSku->price), - 'active' => $this->active, - 'position' => $this->position, - 'url' => shop_route('products.show', $this->id), - 'created_at' => time_format($this->created_at), - 'deleted_at' => $this->deleted_at ? time_format($this->deleted_at) : '', - 'url_edit' => admin_route('products.edit', $this->id), + 'active' => $this->active, + 'position' => $this->position, + 'url' => shop_route('products.show', $this->id), + 'created_at' => time_format($this->created_at), + 'deleted_at' => $this->deleted_at ? time_format($this->deleted_at) : '', + 'url_edit' => admin_route('products.edit', $this->id), ]; return $data; diff --git a/beike/Admin/Http/Resources/RmaDetail.php b/beike/Admin/Http/Resources/RmaDetail.php index 9618dcea..92b2d00d 100644 --- a/beike/Admin/Http/Resources/RmaDetail.php +++ b/beike/Admin/Http/Resources/RmaDetail.php @@ -18,25 +18,25 @@ class RmaDetail extends JsonResource { public function toArray($request): array { - $types = RmaRepo::getTypes(); + $types = RmaRepo::getTypes(); $statuses = RmaRepo::getStatuses(); return [ - 'id' => $this->id, + 'id' => $this->id, 'order_product_id' => $this->order_product_id, - 'quantity' => $this->quantity, - 'opened' => $this->opened, - 'type' => $types[$this->type], - 'comment' => $this->comment, - 'status' => $statuses[$this->status], - 'created_at' => time_format($this->created_at), - 'email' => $this->email, - 'telephone' => $this->telephone, - 'product_name' => $this->product_name, - 'name' => $this->name, - 'sku' => $this->sku, - 'reason' => $this->reason ? (json_decode($this->reason->name, true)[locale()] ?? '') : '', - 'type_text' => $this->type_text, + 'quantity' => $this->quantity, + 'opened' => $this->opened, + 'type' => $types[$this->type], + 'comment' => $this->comment, + 'status' => $statuses[$this->status], + 'created_at' => time_format($this->created_at), + 'email' => $this->email, + 'telephone' => $this->telephone, + 'product_name' => $this->product_name, + 'name' => $this->name, + 'sku' => $this->sku, + 'reason' => $this->reason ? (json_decode($this->reason->name, true)[locale()] ?? '') : '', + 'type_text' => $this->type_text, ]; } } diff --git a/beike/Admin/Http/Resources/RmaHistoryDetail.php b/beike/Admin/Http/Resources/RmaHistoryDetail.php index 91ffb69c..3d3f5482 100644 --- a/beike/Admin/Http/Resources/RmaHistoryDetail.php +++ b/beike/Admin/Http/Resources/RmaHistoryDetail.php @@ -21,12 +21,12 @@ class RmaHistoryDetail extends JsonResource $statuses = RmaRepo::getStatuses(); return [ - 'id' => $this->id, - 'rma_id' => $this->rma_id, - 'status' => $statuses[$this->status], + 'id' => $this->id, + 'rma_id' => $this->rma_id, + 'status' => $statuses[$this->status], 'created_at' => time_format($this->created_at), - 'notify' => $this->notify, - 'comment' => $this->comment, + 'notify' => $this->notify, + 'comment' => $this->comment, ]; } } diff --git a/beike/Admin/Http/Resources/RmaReasonDetail.php b/beike/Admin/Http/Resources/RmaReasonDetail.php index c8cfee62..5216383c 100644 --- a/beike/Admin/Http/Resources/RmaReasonDetail.php +++ b/beike/Admin/Http/Resources/RmaReasonDetail.php @@ -11,7 +11,6 @@ namespace Beike\Admin\Http\Resources; -use Beike\Repositories\RmaRepo; use Illuminate\Http\Resources\Json\JsonResource; class RmaReasonDetail extends JsonResource @@ -19,9 +18,9 @@ class RmaReasonDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'name' => json_decode($this->name, true)[locale()] ?? '', - 'names' => json_decode($this->name, true) + 'id' => $this->id, + 'name' => json_decode($this->name, true)[locale()] ?? '', + 'names' => json_decode($this->name, true), ]; } } diff --git a/beike/Admin/Http/Resources/TaxClassDetail.php b/beike/Admin/Http/Resources/TaxClassDetail.php index c5a611f9..e928a248 100644 --- a/beike/Admin/Http/Resources/TaxClassDetail.php +++ b/beike/Admin/Http/Resources/TaxClassDetail.php @@ -18,13 +18,13 @@ class TaxClassDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'title' => $this->title, + 'id' => $this->id, + 'title' => $this->title, 'description' => sub_string($this->description), - 'created_at' => time_format($this->created_at), - 'updated_at' => time_format($this->updated_at), - 'tax_rates' => $this->taxRates->toArray(), - 'tax_rules' => $this->taxRules->toArray(), + 'created_at' => time_format($this->created_at), + 'updated_at' => time_format($this->updated_at), + 'tax_rates' => $this->taxRates->toArray(), + 'tax_rules' => $this->taxRules->toArray(), ]; } } diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 463a1537..cdeff3ca 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -11,25 +11,25 @@ namespace Beike\Admin\Providers; -use Beike\Models\AdminUser; -use Illuminate\Support\Str; -use Beike\Console\Commands\Sitemap; -use Illuminate\Support\Facades\View; -use Illuminate\Support\Facades\Config; -use Illuminate\Support\ServiceProvider; -use Beike\Admin\View\Components\Filter; -use Beike\Admin\View\Components\Header; -use Beike\Admin\View\Components\Sidebar; use Beike\Admin\View\Components\Alert; -use Beike\Admin\View\Components\NoData; +use Beike\Admin\View\Components\Filter; use Beike\Admin\View\Components\Form\Image; use Beike\Admin\View\Components\Form\Input; -use Beike\Admin\View\Components\Form\Select; -use Beike\Console\Commands\MakeRootAdminUser; -use Beike\Admin\View\Components\Form\Textarea; -use Beike\Console\Commands\GenerateDatabaseDict; use Beike\Admin\View\Components\Form\InputLocale; +use Beike\Admin\View\Components\Form\Select; use Beike\Admin\View\Components\Form\SwitchRadio; +use Beike\Admin\View\Components\Form\Textarea; +use Beike\Admin\View\Components\Header; +use Beike\Admin\View\Components\NoData; +use Beike\Admin\View\Components\Sidebar; +use Beike\Console\Commands\GenerateDatabaseDict; +use Beike\Console\Commands\MakeRootAdminUser; +use Beike\Console\Commands\Sitemap; +use Beike\Models\AdminUser; +use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\View; +use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Str; use Illuminate\View\FileViewFinder; class AdminServiceProvider extends ServiceProvider @@ -51,7 +51,7 @@ class AdminServiceProvider extends ServiceProvider $this->loadRoutesFrom(__DIR__ . '/../Routes/admin.php'); $adminName = admin_name(); - if (!Str::startsWith($uri, "/{$adminName}")) { + if (! Str::startsWith($uri, "/{$adminName}")) { return; } @@ -69,13 +69,12 @@ class AdminServiceProvider extends ServiceProvider Config::set('filesystems.disks.catalog', [ 'driver' => 'local', - 'root' => public_path('catalog'), + 'root' => public_path('catalog'), ]); $this->loadDesignComponents(); } - /** * 加载后台命令行脚本 */ @@ -90,24 +89,22 @@ class AdminServiceProvider extends ServiceProvider } } - /** * 注册后台用户 guard */ protected function registerGuard() { Config::set('auth.guards.' . AdminUser::AUTH_GUARD, [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'admin_users', ]); Config::set('auth.providers.admin_users', [ 'driver' => 'eloquent', - 'model' => AdminUser::class, + 'model' => AdminUser::class, ]); } - /** * 加载主题模板, 用于装修预览 */ @@ -117,34 +114,33 @@ class AdminServiceProvider extends ServiceProvider $paths = $app['config']['view.paths']; if ($theme = system_setting('base.theme')) { $customTheme[] = base_path("themes/{$theme}"); - $paths = array_merge($customTheme, $paths); + $paths = array_merge($customTheme, $paths); } + return new FileViewFinder($app['files'], $paths); }); } - /** * 后台UI组件 */ protected function loadAdminViewComponents() { $this->loadViewComponentsAs('admin', [ - 'header' => Header::class, - 'sidebar' => Sidebar::class, - 'filter' => Filter::class, - 'alert' => Alert::class, + 'header' => Header::class, + 'sidebar' => Sidebar::class, + 'filter' => Filter::class, + 'alert' => Alert::class, 'form-input-locale' => InputLocale::class, - 'form-switch' => SwitchRadio::class, - 'form-input' => Input::class, - 'form-select' => Select::class, - 'form-image' => Image::class, - 'form-textarea' => Textarea::class, - 'no-data' => NoData::class, + 'form-switch' => SwitchRadio::class, + 'form-input' => Input::class, + 'form-select' => Select::class, + 'form-image' => Image::class, + 'form-textarea' => Textarea::class, + 'no-data' => NoData::class, ]); } - /** * seeder 数据 */ @@ -155,7 +151,6 @@ class AdminServiceProvider extends ServiceProvider ], 'beike-seeders'); } - /** * 加载首页 page builder 相关组件 * @@ -163,26 +158,25 @@ class AdminServiceProvider extends ServiceProvider */ protected function loadDesignComponents() { - $viewPath = base_path() . '/beike/Admin/View'; + $viewPath = base_path() . '/beike/Admin/View'; $builderPath = $viewPath . '/DesignBuilders/'; $builders = glob($builderPath . '*'); foreach ($builders as $builder) { - $builderName = basename($builder, '.php'); - $aliasName = Str::snake($builderName); + $builderName = basename($builder, '.php'); + $aliasName = Str::snake($builderName); $componentName = Str::studly($builderName); $classBaseName = "\\Beike\\Admin\\View\\DesignBuilders\\{$componentName}"; - if (!class_exists($classBaseName)) { + if (! class_exists($classBaseName)) { throw new \Exception("请先定义自定义模板类 {$classBaseName}"); } $this->loadViewComponentsAs('editor', [ - $aliasName => $classBaseName + $aliasName => $classBaseName, ]); } } - /** * 后台公共数据 */ diff --git a/beike/Admin/Repositories/AdminRoleRepo.php b/beike/Admin/Repositories/AdminRoleRepo.php index 42542adf..d84b6630 100644 --- a/beike/Admin/Repositories/AdminRoleRepo.php +++ b/beike/Admin/Repositories/AdminRoleRepo.php @@ -25,13 +25,13 @@ class AdminRoleRepo */ public static function createAdminRole($data): Role { - $adminRole = Role::findOrCreate($data['name'], 'web_admin'); + $adminRole = Role::findOrCreate($data['name'], 'web_admin'); $permissions = $data['permissions']; self::syncPermissions($adminRole, $permissions); + return $adminRole; } - /** * 编辑新角色 * @@ -43,16 +43,16 @@ class AdminRoleRepo { $adminRole = Role::findById($data['id']); $adminRole->update([ - 'name' => $data['name'], + 'name' => $data['name'], 'guard_name' => 'web_admin', ]); $permissions = $data['permissions']; self::syncPermissions($adminRole, $permissions); + return $adminRole; } - /** * 同步所有权限 * @@ -78,7 +78,6 @@ class AdminRoleRepo $adminRole->syncPermissions($items); } - /** * 删除角色 * diff --git a/beike/Admin/Repositories/AdminUserRepo.php b/beike/Admin/Repositories/AdminUserRepo.php index c5832daa..22fcf442 100644 --- a/beike/Admin/Repositories/AdminUserRepo.php +++ b/beike/Admin/Repositories/AdminUserRepo.php @@ -11,8 +11,8 @@ namespace Beike\Admin\Repositories; -use Beike\Models\AdminUser; use Beike\Admin\Http\Resources\AdminUserDetail; +use Beike\Models\AdminUser; use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; class AdminUserRepo @@ -22,12 +22,12 @@ class AdminUserRepo */ public static function getAdminUsers(): array { - $builder = AdminUser::query()->with(['roles']); + $builder = AdminUser::query()->with(['roles']); $adminUsers = $builder->get(); + return AdminUserDetail::collection($adminUsers)->jsonSerialize(); } - /** * 创建后台管理员用户 * @@ -37,21 +37,21 @@ class AdminUserRepo public static function createAdminUser($data): AdminUser { $adminUser = new AdminUser([ - 'name' => $data['name'], - 'email' => $data['email'], + 'name' => $data['name'], + 'email' => $data['email'], 'password' => bcrypt($data['password']), - 'locale' => $data['locale'], - 'active' => true, + 'locale' => $data['locale'], + 'active' => true, ]); $adminUser->save(); if (isset($data['roles'])) { $adminUser->assignRole($data['roles']); } + return $adminUser; } - /** * 更新后台管理员用户 * @@ -61,11 +61,11 @@ class AdminUserRepo */ public static function updateAdminUser($adminUserId, $data) { - $password = $data['password'] ?? ''; + $password = $data['password'] ?? ''; $adminUser = AdminUser::query()->findOrFail($adminUserId); - $userData = [ - 'name' => $data['name'], - 'email' => $data['email'], + $userData = [ + 'name' => $data['name'], + 'email' => $data['email'], 'locale' => $data['locale'], 'active' => true, ]; @@ -74,10 +74,10 @@ class AdminUserRepo } $adminUser->update($userData); $adminUser->syncRoles($data['roles']); + return $adminUser; } - /** * 删除后台用户 * diff --git a/beike/Admin/Repositories/AttributeGroupRepo.php b/beike/Admin/Repositories/AttributeGroupRepo.php index 1c306f3d..512f0a7d 100644 --- a/beike/Admin/Repositories/AttributeGroupRepo.php +++ b/beike/Admin/Repositories/AttributeGroupRepo.php @@ -30,7 +30,7 @@ class AttributeGroupRepo foreach ($data['name'] as $locale => $name) { $descriptions[] = [ 'locale' => $locale, - 'name' => $name, + 'name' => $name, ]; } $attributeGroup->descriptions()->createMany($descriptions); @@ -50,7 +50,7 @@ class AttributeGroupRepo foreach ($data['name'] as $locale => $name) { $descriptions[] = [ 'locale' => $locale, - 'name' => $name, + 'name' => $name, ]; } $attributeGroup->descriptions()->delete(); diff --git a/beike/Admin/Repositories/AttributeRepo.php b/beike/Admin/Repositories/AttributeRepo.php index d4769a06..34e85260 100644 --- a/beike/Admin/Repositories/AttributeRepo.php +++ b/beike/Admin/Repositories/AttributeRepo.php @@ -11,10 +11,8 @@ namespace Beike\Admin\Repositories; -use Beike\Admin\Http\Resources\TaxClassDetail; use Beike\Models\Attribute; use Beike\Models\AttributeValue; -use Beike\Models\TaxClass; class AttributeRepo { @@ -27,14 +25,14 @@ class AttributeRepo { $attribute = Attribute::query()->create([ 'attribute_group_id' => $data['attribute_group_id'], - 'sort_order' => $data['sort_order'], + 'sort_order' => $data['sort_order'], ]); $descriptions = []; foreach ($data['name'] as $locale => $name) { $descriptions[] = [ 'locale' => $locale, - 'name' => $name, + 'name' => $name, ]; } $attribute->descriptions()->createMany($descriptions); @@ -46,14 +44,14 @@ class AttributeRepo { $attribute = Attribute::query()->updateOrCreate(['id' => $id], [ 'attribute_group_id' => $data['attribute_group_id'], - 'sort_order' => $data['sort_order'], + 'sort_order' => $data['sort_order'], ]); $descriptions = []; foreach ($data['name'] as $locale => $name) { $descriptions[] = [ 'locale' => $locale, - 'name' => $name, + 'name' => $name, ]; } $attribute->descriptions()->delete(); @@ -72,7 +70,7 @@ class AttributeRepo foreach ($data['name'] as $locale => $name) { $descriptions[] = [ 'locale' => $locale, - 'name' => $name, + 'name' => $name, ]; } $attributeValue->descriptions()->createMany($descriptions); @@ -88,7 +86,7 @@ class AttributeRepo foreach ($data['name'] as $locale => $name) { $descriptions[] = [ 'locale' => $locale, - 'name' => $name, + 'name' => $name, ]; } $attributeValue->descriptions()->delete(); @@ -114,7 +112,6 @@ class AttributeRepo $attribute->delete(); } - public static function autocomplete($name) { $builder = Attribute::query()->with('description') diff --git a/beike/Admin/Repositories/DashboardRepo.php b/beike/Admin/Repositories/DashboardRepo.php index 6edac6a4..a963e354 100644 --- a/beike/Admin/Repositories/DashboardRepo.php +++ b/beike/Admin/Repositories/DashboardRepo.php @@ -12,8 +12,8 @@ namespace Beike\Admin\Repositories; use Beike\Models\Product; -use Beike\Repositories\OrderRepo; use Beike\Repositories\CustomerRepo; +use Beike\Repositories\OrderRepo; class DashboardRepo { @@ -25,22 +25,20 @@ class DashboardRepo public static function getProductData(): array { return [ - 'total' => quantity_format(Product::query()->count()), + 'total' => quantity_format(Product::query()->count()), 'percentage' => 0, ]; } - /** * 获取客户访问统计今日昨日比较 * @return array * @todo - * */ public static function getCustomerViewData(): array { - $today = 10; - $yesterday = 8; + $today = 10; + $yesterday = 8; $difference = $today - $yesterday; if ($difference && $yesterday) { $percentage = round(($difference / $yesterday) * 100); @@ -49,12 +47,11 @@ class DashboardRepo } return [ - 'total' => $today, + 'total' => $today, 'percentage' => $percentage, ]; } - /** * 获取订单基础统计, 总数和今日昨日比较 * @@ -62,8 +59,8 @@ class DashboardRepo */ public static function getOrderData(): array { - $today = OrderRepo::getListBuilder(['start' => today()->subDay(), 'end' => today()])->count(); - $yesterday = OrderRepo::getListBuilder(['start' => today()->subDays(2), 'end' => today()->subDay()])->count(); + $today = OrderRepo::getListBuilder(['start' => today()->subDay(), 'end' => today()])->count(); + $yesterday = OrderRepo::getListBuilder(['start' => today()->subDays(2), 'end' => today()->subDay()])->count(); $difference = $today - $yesterday; if ($difference && $yesterday) { $percentage = round(($difference / $yesterday) * 100); @@ -72,12 +69,11 @@ class DashboardRepo } return [ - 'total' => $today, + 'total' => $today, 'percentage' => $percentage, ]; } - /** * 获取客户注册今日昨日比较 * @@ -85,8 +81,8 @@ class DashboardRepo */ public static function getCustomerData(): array { - $today = CustomerRepo::getListBuilder(['start' => today()->subDay(), 'end' => today()])->count(); - $yesterday = CustomerRepo::getListBuilder(['start' => today()->subDays(2), 'end' => today()->subDay()])->count(); + $today = CustomerRepo::getListBuilder(['start' => today()->subDay(), 'end' => today()])->count(); + $yesterday = CustomerRepo::getListBuilder(['start' => today()->subDays(2), 'end' => today()->subDay()])->count(); $difference = $today - $yesterday; if ($difference && $yesterday) { $percentage = round(($difference / $yesterday) * 100); @@ -95,12 +91,11 @@ class DashboardRepo } return [ - 'total' => $today, + 'total' => $today, 'percentage' => $percentage, ]; } - /** * 获取订单总额基础统计, 总数和今日昨日比较 * @@ -108,8 +103,8 @@ class DashboardRepo */ public static function getTotalData(): array { - $today = OrderRepo::getListBuilder(['start' => today()->subDay(), 'end' => today()])->sum('total'); - $yesterday = OrderRepo::getListBuilder(['start' => today()->subDays(2), 'end' => today()->subDay()])->sum('total'); + $today = OrderRepo::getListBuilder(['start' => today()->subDay(), 'end' => today()])->sum('total'); + $yesterday = OrderRepo::getListBuilder(['start' => today()->subDays(2), 'end' => today()->subDay()])->sum('total'); $difference = $today - $yesterday; if ($difference && $yesterday) { $percentage = round(($difference / $yesterday) * 100); @@ -118,7 +113,7 @@ class DashboardRepo } return [ - 'total' => currency_format($today), + 'total' => currency_format($today), 'percentage' => $percentage, ]; } diff --git a/beike/Admin/Repositories/PageRepo.php b/beike/Admin/Repositories/PageRepo.php index 230b5184..1a53c4e8 100644 --- a/beike/Admin/Repositories/PageRepo.php +++ b/beike/Admin/Repositories/PageRepo.php @@ -12,8 +12,8 @@ namespace Beike\Admin\Repositories; use Beike\Models\Page; -use Illuminate\Support\Facades\DB; use Illuminate\Contracts\Pagination\LengthAwarePaginator; +use Illuminate\Support\Facades\DB; class PageRepo { @@ -25,37 +25,38 @@ class PageRepo public static function getList(): LengthAwarePaginator { $builder = Page::query()->with([ - 'description' + 'description', ])->orderByDesc('updated_at'); return $builder->paginate(perPage()); } - public static function findByPageId($pageId) { $page = Page::query()->findOrFail($pageId); $page->load(['descriptions']); + return $page; } - public static function getDescriptionsByLocale($pageId) { $page = self::findByPageId($pageId); + return $page->descriptions->keyBy('locale')->toArray(); } - public static function createOrUpdate($data) { try { DB::beginTransaction(); $region = self::pushPage($data); DB::commit(); + return $region; } catch (\Exception $e) { DB::rollBack(); + throw $e; } } @@ -70,13 +71,14 @@ class PageRepo } $page->fill([ 'position' => $data['position'] ?? 0, - 'active' => $data['active'] ?? true, + 'active' => $data['active'] ?? true, ]); $page->saveOrFail(); $page->descriptions()->delete(); $page->descriptions()->createMany($data['descriptions']); $page->load(['descriptions']); + return $page; } @@ -87,7 +89,6 @@ class PageRepo $page->delete(); } - /** * 页面内容自动完成 * @@ -103,11 +104,12 @@ class PageRepo $results = []; foreach ($pages as $page) { $results[] = [ - 'id' => $page->id, - 'name' => $page->description->title, - 'status' => $page->active + 'id' => $page->id, + 'name' => $page->description->title, + 'status' => $page->active, ]; } + return $results; } } diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php index 3db49515..8a0b6367 100644 --- a/beike/Admin/Repositories/PermissionRepo.php +++ b/beike/Admin/Repositories/PermissionRepo.php @@ -12,23 +12,26 @@ namespace Beike\Admin\Repositories; use Beike\Models\AdminUser; -use Spatie\Permission\Models\Role; use Spatie\Permission\Exceptions\PermissionDoesNotExist; +use Spatie\Permission\Models\Role; class PermissionRepo { private ?AdminUser $adminUser = null; + private ?Role $adminRole = null; - public function setUser(AdminUser $user): PermissionRepo + public function setUser(AdminUser $user): self { $this->adminUser = $user; + return $this; } - public function setRole(Role $role): PermissionRepo + public function setRole(Role $role): self { $this->adminRole = $role; + return $this; } @@ -63,10 +66,10 @@ class PermissionRepo ['title' => trans('admin/common.zone'), 'permissions' => $this->getZonePermissions()], ['title' => trans('admin/common.country'), 'permissions' => $this->getCountryPermissions()], ]; + return hook_filter('role.all_permissions', $permissions); } - /** * 订单权限列表 * @@ -75,11 +78,11 @@ class PermissionRepo private function getOrderPermissions(): array { $routes = ['orders_index', 'orders_export', 'orders_show', 'orders_update_status']; - $items = $this->getPermissionList('order', $routes); + $items = $this->getPermissionList('order', $routes); + return hook_filter('role.order_permissions', $items); } - /** * 售后（退换货）权限列表 * @@ -88,11 +91,11 @@ class PermissionRepo private function getRmaPermissions(): array { $routes = ['rmas_index', 'rmas_show', 'rmas_update', 'rmas_delete']; - $items = $this->getPermissionList('rma', $routes); + $items = $this->getPermissionList('rma', $routes); + return hook_filter('role.rma_permissions', $items); } - /** * 售后（退换货）原因权限列表 * @@ -101,11 +104,11 @@ class PermissionRepo private function getRmaReasonPermissions(): array { $routes = ['rma_reasons_index', 'rma_reasons_create', 'rma_reasons_update', 'rma_reasons_delete']; - $items = $this->getPermissionList('rma_reason', $routes); + $items = $this->getPermissionList('rma_reason', $routes); + return hook_filter('role.rma_reason_permissions', $items); } - /** * 商品权限列表 * @@ -114,11 +117,11 @@ class PermissionRepo private function getProductPermissions(): array { $routes = ['products_index', 'products_create', 'products_show', 'products_update', 'products_delete', 'products_trashed', 'products_restore']; - $items = $this->getPermissionList('product', $routes); + $items = $this->getPermissionList('product', $routes); + return hook_filter('role.product_permissions', $items); } - /** * 分类权限列表 * @@ -127,11 +130,11 @@ class PermissionRepo private function getCategoryPermissions(): array { $routes = ['categories_index', 'categories_create', 'categories_show', 'categories_update', 'categories_delete']; - $items = $this->getPermissionList('category', $routes); + $items = $this->getPermissionList('category', $routes); + return hook_filter('role.category_permissions', $items); } - /** * 品牌权限列表 * @@ -140,11 +143,11 @@ class PermissionRepo private function getBrandPermissions(): array { $routes = ['brands_index', 'brands_create', 'brands_show', 'brands_update', 'brands_delete']; - $items = $this->getPermissionList('brand', $routes); + $items = $this->getPermissionList('brand', $routes); + return hook_filter('role.brand_permissions', $items); } - /** * 客户权限列表 * @@ -153,11 +156,11 @@ class PermissionRepo private function getCustomerPermissions(): array { $routes = ['customers_index', 'customers_create', 'customers_show', 'customers_update', 'customers_delete']; - $items = $this->getPermissionList('customer', $routes); + $items = $this->getPermissionList('customer', $routes); + return hook_filter('role.customer_permissions', $items); } - /** * 客户组权限列表 * @@ -166,11 +169,11 @@ class PermissionRepo private function getCustomerGroupPermissions(): array { $routes = ['customer_groups_index', 'customer_groups_create', 'customer_groups_show', 'customer_groups_update', 'customer_groups_delete']; - $items = $this->getPermissionList('customer_group', $routes); + $items = $this->getPermissionList('customer_group', $routes); + return hook_filter('role.customer_group_permissions', $items); } - /** * 设置权限列表 * @@ -179,11 +182,11 @@ class PermissionRepo private function getSettingPermissions(): array { $routes = ['settings_index', 'settings_update', 'design_index', 'design_footer_index', 'design_menu_index']; - $items = $this->getPermissionList('setting', $routes); + $items = $this->getPermissionList('setting', $routes); + return hook_filter('role.setting_permissions', $items); } - /** * 内容管理列表 * @return mixed @@ -191,11 +194,11 @@ class PermissionRepo private function getContentPermissions() { $routes = ['pages_index', 'pages_create', 'pages_show', 'pages_update', 'pages_delete']; - $items = $this->getPermissionList('page', $routes); + $items = $this->getPermissionList('page', $routes); + return hook_filter('role.page_permissions', $items); } - /** * 插件权限列表 * @@ -204,11 +207,11 @@ class PermissionRepo private function getPluginPermissions(): array { $routes = ['plugins_index', 'plugins_import', 'plugins_update', 'plugins_show', 'plugins_install', 'plugins_update_status', 'plugins_uninstall']; - $items = $this->getPermissionList('plugin', $routes); + $items = $this->getPermissionList('plugin', $routes); + return hook_filter('role.plugin_permissions', $items); } - /** * 后台管理员权限列表 * @@ -217,11 +220,11 @@ class PermissionRepo private function getAdminUserPermissions() { $routes = ['admin_users_index', 'admin_users_create', 'admin_users_show', 'admin_users_update', 'admin_users_delete']; - $items = $this->getPermissionList('user', $routes); + $items = $this->getPermissionList('user', $routes); + return hook_filter('role.user_permissions', $items); } - /** * 后台管理员权限列表 * @@ -230,11 +233,11 @@ class PermissionRepo private function getAdminRolePermissions() { $routes = ['admin_roles_index', 'admin_roles_create', 'admin_roles_show', 'admin_roles_update', 'admin_roles_delete']; - $items = $this->getPermissionList('role', $routes); + $items = $this->getPermissionList('role', $routes); + return hook_filter('role.role_permissions', $items); } - /** * 区域分组权限列表 * @@ -243,11 +246,11 @@ class PermissionRepo private function getRegionPermissions(): array { $routes = ['regions_index', 'regions_create', 'regions_show', 'regions_update', 'regions_delete']; - $items = $this->getPermissionList('region', $routes); + $items = $this->getPermissionList('region', $routes); + return hook_filter('role.region_permissions', $items); } - /** * 获取税率权限列表 * @@ -256,11 +259,11 @@ class PermissionRepo private function getTaxRatePermissions(): array { $routes = ['tax_rates_index', 'tax_rates_create', 'tax_rates_show', 'tax_rates_update', 'tax_rates_delete']; - $items = $this->getPermissionList('tax_rate', $routes); + $items = $this->getPermissionList('tax_rate', $routes); + return hook_filter('role.tax_rate_permissions', $items); } - /** * 获取税类权限列表 * @@ -269,11 +272,11 @@ class PermissionRepo private function getTaxClassPermissions(): array { $routes = ['tax_classes_index', 'tax_classes_create', 'tax_classes_show', 'tax_classes_update', 'tax_classes_delete']; - $items = $this->getPermissionList('tax_class', $routes); + $items = $this->getPermissionList('tax_class', $routes); + return hook_filter('role.tax_class_permissions', $items); } - /** * 获取汇率权限列表 * @@ -282,11 +285,11 @@ class PermissionRepo private function getCurrencyPermissions(): array { $routes = ['currencies_index', 'currencies_create', 'currencies_show', 'currencies_update', 'currencies_delete']; - $items = $this->getPermissionList('currency', $routes); + $items = $this->getPermissionList('currency', $routes); + return hook_filter('role.currency_permissions', $items); } - /** * 获取语言权限列表 * @@ -295,11 +298,11 @@ class PermissionRepo private function getLanguagePermissions(): array { $routes = ['languages_index', 'languages_create', 'languages_update', 'languages_delete']; - $items = $this->getPermissionList('language', $routes); + $items = $this->getPermissionList('language', $routes); + return hook_filter('role.language_permissions', $items); } - /** * 获取文件管理器权限列表 * @@ -308,11 +311,11 @@ class PermissionRepo private function getFileManagerPermissions(): array { $routes = ['file_manager_create', 'file_manager_show', 'file_manager_update', 'file_manager_delete']; - $items = $this->getPermissionList('file_manager', $routes); + $items = $this->getPermissionList('file_manager', $routes); + return hook_filter('role.file_manager_permissions', $items); } - /** * 获取省份权限列表 * @@ -321,11 +324,11 @@ class PermissionRepo private function getZonePermissions(): array { $routes = ['zones_create', 'zones_index', 'zones_update', 'zones_delete']; - $items = $this->getPermissionList('zone', $routes); + $items = $this->getPermissionList('zone', $routes); + return hook_filter('role.zone_permissions', $items); } - /** * 获取国家权限列表 * @@ -334,11 +337,11 @@ class PermissionRepo private function getCountryPermissions(): array { $routes = ['countries_create', 'countries_index', 'countries_update', 'countries_delete']; - $items = $this->getPermissionList('country', $routes); + $items = $this->getPermissionList('country', $routes); + return hook_filter('role.country_permissions', $items); } - /** * 根据模块和路由返回权限列表 * @@ -352,6 +355,7 @@ class PermissionRepo foreach ($routes as $route) { $items[] = ['code' => $route, 'name' => trans("admin/{$module}.{$route}"), 'selected' => $this->hasPermission($route)]; } + return $items; } @@ -372,6 +376,7 @@ class PermissionRepo } catch (PermissionDoesNotExist $exception) { return false; } + return false; } } diff --git a/beike/Admin/Repositories/RegionRepo.php b/beike/Admin/Repositories/RegionRepo.php index 876fba4f..c5b13a1b 100644 --- a/beike/Admin/Repositories/RegionRepo.php +++ b/beike/Admin/Repositories/RegionRepo.php @@ -27,9 +27,11 @@ class RegionRepo DB::beginTransaction(); $region = self::pushRegion($data); DB::commit(); + return $region; } catch (\Exception $e) { DB::rollBack(); + throw $e; } } @@ -43,7 +45,7 @@ class RegionRepo $region = new Region(); } $region->fill([ - 'name' => $data['name'], + 'name' => $data['name'], 'description' => $data['description'], ]); $region->saveOrFail(); @@ -52,8 +54,8 @@ class RegionRepo foreach ($data['region_zones'] as $regionZone) { if ($regionZone['country_id']) { $newRegionZones[] = [ - 'country_id' => (int)$regionZone['country_id'], - 'zone_id' => (int)$regionZone['zone_id'], + 'country_id' => (int) $regionZone['country_id'], + 'zone_id' => (int) $regionZone['zone_id'], ]; } } @@ -62,6 +64,7 @@ class RegionRepo $region->regionZones()->createMany($newRegionZones); } $region->load(['regionZones']); + return $region; } diff --git a/beike/Admin/Repositories/Report/OrderReportRepo.php b/beike/Admin/Repositories/Report/OrderReportRepo.php index 5b0d95b0..0d2d50e3 100644 --- a/beike/Admin/Repositories/Report/OrderReportRepo.php +++ b/beike/Admin/Repositories/Report/OrderReportRepo.php @@ -11,8 +11,6 @@ namespace Beike\Admin\Repositories\Report; - -use Beike\Models\Order; use Beike\Repositories\OrderRepo; use Carbon\Carbon; use Carbon\CarbonPeriod; @@ -38,27 +36,27 @@ class OrderReportRepo ->get() ->keyBy('date'); - $dates = $totals = $amounts = []; + $dates = $totals = $amounts = []; $period = CarbonPeriod::create(today()->subMonth(), today()->subDay())->toArray(); foreach ($period as $date) { - $dateFormat = $date->format('Y-m-d'); - $orderTotal = $orderTotals[$dateFormat] ?? null; + $dateFormat = $date->format('Y-m-d'); + $orderTotal = $orderTotals[$dateFormat] ?? null; $orderAmount = $orderAmounts[$dateFormat] ?? null; - $dates[] = $dateFormat; - $totals[] = $orderTotal ? $orderTotal->total : 0; + $dates[] = $dateFormat; + $totals[] = $orderTotal ? $orderTotal->total : 0; $amounts[] = $orderAmount ? $orderAmount->amount : 0; } $data = [ - 'period' => $dates, - 'totals' => $totals, + 'period' => $dates, + 'totals' => $totals, 'amounts' => $amounts, ]; + return hook_filter('dashboard.order_report_month', $data); } - /** * 获取最近一周每日销售订单数 */ @@ -76,27 +74,27 @@ class OrderReportRepo ->get() ->keyBy('date'); - $dates = $totals = $amounts = []; + $dates = $totals = $amounts = []; $period = CarbonPeriod::create(today()->subWeek(), today()->subDay())->toArray(); foreach ($period as $date) { - $dateFormat = $date->format('Y-m-d'); - $orderTotal = $orderTotals[$dateFormat] ?? null; + $dateFormat = $date->format('Y-m-d'); + $orderTotal = $orderTotals[$dateFormat] ?? null; $orderAmount = $orderAmounts[$dateFormat] ?? null; - $dates[] = $dateFormat; - $totals[] = $orderTotal ? $orderTotal->total : 0; + $dates[] = $dateFormat; + $totals[] = $orderTotal ? $orderTotal->total : 0; $amounts[] = $orderAmount ? $orderAmount->amount : 0; } $data = [ - 'period' => $dates, - 'totals' => $totals, + 'period' => $dates, + 'totals' => $totals, 'amounts' => $amounts, ]; + return hook_filter('dashboard.order_report_week', $data); } - /** * 获取最近一年每月销售订单数 */ @@ -108,7 +106,7 @@ class OrderReportRepo ->get(); $orderMonthTotals = []; foreach ($orderTotals as $orderTotal) { - $key = Carbon::create($orderTotal->year, $orderTotal->month)->format('Y-m'); + $key = Carbon::create($orderTotal->year, $orderTotal->month)->format('Y-m'); $orderMonthTotals[$key] = $orderTotal['total']; } @@ -118,27 +116,28 @@ class OrderReportRepo ->get(); $orderMonthAmounts = []; foreach ($orderAmounts as $orderAmount) { - $key = Carbon::create($orderAmount->year, $orderAmount->month)->format('Y-m'); + $key = Carbon::create($orderAmount->year, $orderAmount->month)->format('Y-m'); $orderMonthAmounts[$key] = $orderAmount['amount']; } - $dates = $totals = $amounts = []; + $dates = $totals = $amounts = []; $period = CarbonPeriod::create(today()->subYear()->endOfMonth(), '1 month', today()->endOfMonth())->toArray(); foreach ($period as $date) { - $dateFormat = $date->format('Y-m'); - $orderTotal = $orderMonthTotals[$dateFormat] ?? null; + $dateFormat = $date->format('Y-m'); + $orderTotal = $orderMonthTotals[$dateFormat] ?? null; $orderAmount = $orderMonthAmounts[$dateFormat] ?? null; - $dates[] = $dateFormat; - $totals[] = $orderTotal ?: 0; + $dates[] = $dateFormat; + $totals[] = $orderTotal ?: 0; $amounts[] = $orderAmount ?: 0; } $data = [ - 'period' => $dates, - 'totals' => $totals, + 'period' => $dates, + 'totals' => $totals, 'amounts' => $amounts, ]; + return hook_filter('dashboard.order_report_year', $data); } } diff --git a/beike/Admin/Repositories/TaxClassRepo.php b/beike/Admin/Repositories/TaxClassRepo.php index e3b4e6a8..8df54501 100644 --- a/beike/Admin/Repositories/TaxClassRepo.php +++ b/beike/Admin/Repositories/TaxClassRepo.php @@ -16,13 +16,13 @@ use Beike\Models\TaxClass; class TaxClassRepo { - const BASE_TYPES = ['store', 'payment', 'shipping']; + public const BASE_TYPES = ['store', 'payment', 'shipping']; public static function getList() { $taxClass = TaxClass::query()->with([ 'taxRates.region', - 'taxRules' + 'taxRules', ])->get(); return TaxClassDetail::collection($taxClass)->jsonSerialize(); @@ -37,7 +37,7 @@ class TaxClassRepo $taxClass = new TaxClass(); } $taxClass->fill([ - 'title' => $data['title'], + 'title' => $data['title'], 'description' => $data['description'], ]); $taxClass->saveOrFail(); @@ -46,13 +46,14 @@ class TaxClassRepo foreach ($data['tax_rules'] as $rule) { $rules[] = [ 'tax_rate_id' => $rule['tax_rate_id'], - 'based' => $rule['based'], - 'priority' => (int)$rule['priority'], + 'based' => $rule['based'], + 'priority' => (int) $rule['priority'], ]; } $taxClass->taxRules()->delete(); $taxClass->taxRules()->createMany($rules); $taxClass->load(['taxRules']); + return $taxClass; } diff --git a/beike/Admin/Repositories/TaxRateRepo.php b/beike/Admin/Repositories/TaxRateRepo.php index ad37144a..341e370f 100644 --- a/beike/Admin/Repositories/TaxRateRepo.php +++ b/beike/Admin/Repositories/TaxRateRepo.php @@ -18,7 +18,7 @@ class TaxRateRepo public static function getList() { return TaxRate::query()->with([ - 'region' + 'region', ])->get(); } @@ -32,11 +32,12 @@ class TaxRateRepo } $taxRate->fill([ 'region_id' => $data['region_id'], - 'name' => $data['name'], - 'rate' => $data['rate'], - 'type' => $data['type'], + 'name' => $data['name'], + 'rate' => $data['rate'], + 'type' => $data['type'], ]); $taxRate->saveOrFail(); + return $taxRate; } @@ -49,6 +50,7 @@ class TaxRateRepo public static function getNameByRateId($taxRateId) { $taxRate = TaxRate::query()->findOrFail($taxRateId); + return $taxRate->name; } } diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php index 262d2056..191422b0 100644 --- a/beike/Admin/Routes/admin.php +++ b/beike/Admin/Routes/admin.php @@ -47,7 +47,6 @@ Route::prefix($adminName) Route::middleware('can:brands_update')->put('brands/{id}', [Controllers\BrandController::class, 'update'])->name('brands.update'); Route::middleware('can:brands_delete')->delete('brands/{id}', [Controllers\BrandController::class, 'destroy'])->name('brands.destroy'); - // 商品分类 Route::middleware('can:categories_index')->get('categories/autocomplete', [Controllers\CategoryController::class, 'autocomplete'])->name('categories.autocomplete'); Route::middleware('can:categories_show')->get('categories/{category}/name', [Controllers\CategoryController::class, 'name'])->name('categories.name'); @@ -58,21 +57,18 @@ Route::prefix($adminName) Route::middleware('can:categories_update')->put('categories/{category}', [Controllers\CategoryController::class, 'update'])->name('categories.update'); Route::middleware('can:categories_delete')->delete('categories/{category}', [Controllers\CategoryController::class, 'destroy'])->name('categories.destroy'); - // 国家 Route::middleware('can:countries_index')->get('countries', [Controllers\CountryController::class, 'index'])->name('countries.index'); Route::middleware('can:countries_create')->post('countries', [Controllers\CountryController::class, 'store'])->name('countries.store'); Route::middleware('can:countries_update')->put('countries/{id}', [Controllers\CountryController::class, 'update'])->name('countries.update'); Route::middleware('can:countries_delete')->delete('countries/{id}', [Controllers\CountryController::class, 'destroy'])->name('countries.destroy'); - // 省份 Route::middleware('can:zones_index')->get('zones', [Controllers\ZoneController::class, 'index'])->name('zones.index'); Route::middleware('can:zones_create')->post('zones', [Controllers\ZoneController::class, 'store'])->name('zones.store'); Route::middleware('can:zones_update')->put('zones/{id}', [Controllers\ZoneController::class, 'update'])->name('zones.update'); Route::middleware('can:zones_delete')->delete('zones/{id}', [Controllers\ZoneController::class, 'destroy'])->name('zones.destroy'); - // 客户 Route::middleware('can:customers_index')->get('customers/trashed', [Controllers\CustomerController::class, 'trashed'])->name('customers.trashed'); Route::middleware('can:customers_index')->get('customers', [Controllers\CustomerController::class, 'index'])->name('customers.index'); @@ -84,7 +80,6 @@ Route::prefix($adminName) Route::middleware('can:customers_delete')->delete('customers/{id}/force', [Controllers\CustomerController::class, 'forceDelete'])->name('customers.force_delete'); Route::middleware('can:customers_delete')->post('customers/force_delete_all', [Controllers\CustomerController::class, 'forceDeleteAll'])->name('customers.force_delete_all'); - // 客户地址 Route::middleware('can:customers_show')->get('customers/{customer_id}/addresses', [Controllers\AddressController::class, 'index'])->name('customers.addresses.index'); Route::middleware('can:customers_update')->post('customers/{customer_id}/addresses', [Controllers\AddressController::class, 'store'])->name('customers.addresses.store'); @@ -93,21 +88,18 @@ Route::prefix($adminName) Route::get('countries/{country_id}/zones', [Controllers\ZoneController::class, 'listByCountry'])->name('countries.zones.index'); - // 客户组 Route::middleware('can:customer_groups_index')->get('customer_groups', [Controllers\CustomerGroupController::class, 'index'])->name('customer_groups.index'); Route::middleware('can:customer_groups_create')->post('customer_groups', [Controllers\CustomerGroupController::class, 'store'])->name('customer_groups.store'); Route::middleware('can:customer_groups_update')->put('customer_groups/{id}', [Controllers\CustomerGroupController::class, 'update'])->name('customer_groups.update'); Route::middleware('can:customer_groups_delete')->delete('customer_groups/{id}', [Controllers\CustomerGroupController::class, 'destroy'])->name('customer_groups.destroy'); - // 货币 Route::middleware('can:currencies_index')->get('currencies', [Controllers\CurrencyController::class, 'index'])->name('currencies.index'); Route::middleware('can:currencies_create')->post('currencies', [Controllers\CurrencyController::class, 'store'])->name('currencies.store'); Route::middleware('can:currencies_update')->put('currencies/{id}', [Controllers\CurrencyController::class, 'update'])->name('currencies.update'); Route::middleware('can:currencies_delete')->delete('currencies/{id}', [Controllers\CurrencyController::class, 'destroy'])->name('currencies.destroy'); - // 页面装修 Route::middleware('can:design_index')->get('design/builder', [Controllers\DesignController::class, 'index'])->name('design.index'); Route::middleware('can:design_index')->put('design/builder', [Controllers\DesignController::class, 'update'])->name('design.update'); @@ -120,11 +112,9 @@ Route::prefix($adminName) Route::middleware('can:design_menu_index')->get('design_menu/builder', [Controllers\DesignMenuController::class, 'index'])->name('design_menu.index'); Route::middleware('can:design_menu_index')->put('design_menu/builder', [Controllers\DesignMenuController::class, 'update'])->name('design_menu.update'); - Route::put('edit', [Controllers\EditController::class, 'update'])->name('edit'); Route::get('edit/locale', [Controllers\EditController::class, 'locale'])->name('edit.locale'); - // 图片库 Route::middleware('can:file_manager_show')->get('file_manager', [Controllers\FileManagerController::class, 'index'])->name('file_manager.index'); Route::middleware('can:file_manager_show')->get('file_manager/files', [Controllers\FileManagerController::class, 'getFiles'])->name('file_manager.get_files'); @@ -137,21 +127,18 @@ Route::prefix($adminName) Route::get('logout', [Controllers\LogoutController::class, 'index'])->name('logout.index'); - // 语言管理 Route::middleware('can:languages_index')->get('languages', [Controllers\LanguageController::class, 'index'])->name('languages.index'); Route::middleware('can:languages_create')->post('languages', [Controllers\LanguageController::class, 'store'])->name('languages.store'); Route::middleware('can:languages_update')->put('languages/{id}', [Controllers\LanguageController::class, 'update'])->name('languages.update'); Route::middleware('can:languages_delete')->delete('languages/{id}', [Controllers\LanguageController::class, 'destroy'])->name('languages.destroy'); - // 订单 Route::middleware('can:orders_index')->get('orders', [Controllers\OrderController::class, 'index'])->name('orders.index'); Route::middleware('can:orders_export')->get('orders/export', [Controllers\OrderController::class, 'export'])->name('orders.export'); Route::middleware('can:orders_show')->get('orders/{order}', [Controllers\OrderController::class, 'show'])->name('orders.show'); Route::middleware('can:orders_update_status')->put('orders/{order}/status', [Controllers\OrderController::class, 'updateStatus'])->name('orders.update_status'); - // 插件 Route::middleware('can:plugins_index')->get('plugins', [Controllers\PluginController::class, 'index'])->name('plugins.index'); Route::middleware('can:plugins_import')->post('plugins/import', [Controllers\PluginController::class, 'import'])->name('plugins.import'); @@ -161,14 +148,12 @@ Route::prefix($adminName) Route::middleware('can:plugins_install')->post('plugins/{code}/install', [Controllers\PluginController::class, 'install'])->name('plugins.install'); Route::middleware('can:plugins_uninstall')->post('plugins/{code}/uninstall', [Controllers\PluginController::class, 'uninstall'])->name('plugins.uninstall'); - // 插件市场 Route::middleware('can:marketing_index')->get('marketing', [Controllers\MarketingController::class, 'index'])->name('marketing.index'); Route::middleware('can:marketing_show')->get('marketing/{code}', [Controllers\MarketingController::class, 'show'])->name('marketing.show'); Route::middleware('can:marketing_buy')->post('marketing/{code}/buy', [Controllers\MarketingController::class, 'buy'])->name('marketing.buy'); Route::middleware('can:marketing_download')->post('marketing/{code}/download', [Controllers\MarketingController::class, 'download'])->name('marketing.download'); - // 单页 Route::middleware('can:pages_index')->get('pages', [Controllers\PagesController::class, 'index'])->name('pages.index'); Route::middleware('can:pages_index')->get('pages/autocomplete', [Controllers\PagesController::class, 'autocomplete'])->name('pages.autocomplete'); @@ -179,7 +164,6 @@ Route::prefix($adminName) Route::middleware('can:pages_update')->put('pages/{page}', [Controllers\PagesController::class, 'update'])->name('pages.update'); Route::middleware('can:pages_delete')->delete('pages/{page}', [Controllers\PagesController::class, 'destroy'])->name('pages.destroy'); - // 商品 Route::middleware('can:products_restore')->put('products/restore', [Controllers\ProductController::class, 'restore']); Route::middleware('can:products_trashed')->get('products/trashed', [Controllers\ProductController::class, 'trashed'])->name('products.trashed'); @@ -197,14 +181,12 @@ Route::prefix($adminName) Route::middleware('can:products_update')->put('products/{product}', [Controllers\ProductController::class, 'update'])->name('products.update'); Route::middleware('can:products_delete')->delete('products/{product}', [Controllers\ProductController::class, 'destroy'])->name('products.destroy'); - // 区域组 Route::middleware('can:regions_index')->get('regions', [Controllers\RegionController::class, 'index'])->name('regions.index'); Route::middleware('can:regions_create')->post('regions', [Controllers\RegionController::class, 'store'])->name('regions.store'); Route::middleware('can:regions_update')->put('regions/{id}', [Controllers\RegionController::class, 'update'])->name('regions.update'); Route::middleware('can:regions_delete')->delete('regions/{id}', [Controllers\RegionController::class, 'destroy'])->name('regions.destroy'); - // RMA Route::middleware('can:rmas_update')->post('rmas/history/{id}', [Controllers\RmaController::class, 'addHistory'])->name('rmas.add_history'); Route::middleware('can:rmas_index')->get('rmas', [Controllers\RmaController::class, 'index'])->name('rmas.index'); @@ -220,28 +202,24 @@ Route::prefix($adminName) Route::middleware('can:settings_update')->post('settings', [Controllers\SettingController::class, 'store'])->name('settings.store'); Route::middleware('can:settings_update')->post('settings/store_token', [Controllers\SettingController::class, 'storeDeveloperToken'])->name('settings.store_token'); - // 税类 Route::middleware('can:tax_classes_index')->get('tax_classes', [Controllers\TaxClassController::class, 'index'])->name('tax_classes.index'); Route::middleware('can:tax_classes_create')->post('tax_classes', [Controllers\TaxClassController::class, 'store'])->name('tax_classes.store'); Route::middleware('can:tax_classes_update')->put('tax_classes/{tax_class}', [Controllers\TaxClassController::class, 'update'])->name('tax_classes.update'); Route::middleware('can:tax_classes_delete')->delete('tax_classes/{tax_class}', [Controllers\TaxClassController::class, 'destroy'])->name('tax_classes.destroy'); - // 税费 Route::middleware('can:tax_rates_index')->get('tax_rates', [Controllers\TaxRateController::class, 'index'])->name('tax_rates.index'); Route::middleware('can:tax_rates_create')->post('tax_rates', [Controllers\TaxRateController::class, 'store'])->name('tax_rates.store'); Route::middleware('can:tax_rates_update')->put('tax_rates/{tax_rate}', [Controllers\TaxRateController::class, 'update'])->name('tax_rates.update'); Route::middleware('can:tax_rates_delete')->delete('tax_rates/{tax_rate}', [Controllers\TaxRateController::class, 'destroy'])->name('tax_rates.destroy'); - // 后台用户 Route::middleware('can:admin_users_index')->get('admin_users', [Controllers\AdminUserController::class, 'index'])->name('admin_users.index'); Route::middleware('can:admin_users_create')->post('admin_users', [Controllers\AdminUserController::class, 'store'])->name('admin_users.store'); Route::middleware('can:admin_users_update')->put('admin_users/{user_id}', [Controllers\AdminUserController::class, 'update'])->name('admin_users.update'); Route::middleware('can:admin_users_delete')->delete('admin_users/{user_id}', [Controllers\AdminUserController::class, 'destroy'])->name('admin_users.destroy'); - // 后台用户组 Route::middleware('can:admin_roles_index')->get('admin_roles', [Controllers\AdminRoleController::class, 'index'])->name('admin_roles.index'); Route::middleware('can:admin_roles_create')->get('admin_roles/create', [Controllers\AdminRoleController::class, 'create'])->name('admin_roles.create'); diff --git a/beike/Admin/Services/AddressService.php b/beike/Admin/Services/AddressService.php index 347eb2af..197198d2 100644 --- a/beike/Admin/Services/AddressService.php +++ b/beike/Admin/Services/AddressService.php @@ -11,27 +11,25 @@ namespace Beike\Admin\Services; -use Beike\Models\Category; -use Beike\Models\CategoryPath; use Beike\Repositories\AddressRepo; -use Beike\Repositories\CustomerRepo; use Beike\Repositories\ZoneRepo; -use Illuminate\Support\Facades\DB; class AddressService { public static function addForCustomer($customerId, $data) { - $data = self::getParams($data); + $data = self::getParams($data); $data['customer_id'] = $customerId; - $address = AddressRepo::create($data); + $address = AddressRepo::create($data); + return $address; } public static function update($addressId, $data) { - $data = self::getParams($data); + $data = self::getParams($data); $address = AddressRepo::update($addressId, $data); + return $address; } @@ -42,17 +40,18 @@ class AddressService public static function getParams($data): array { $data = [ - 'name' => $data['name'] ?? '', - 'phone' => $data['phone'] ?? '', - 'country_id' => (int)$data['country_id'] ?? 0, - 'zone_id' => (int)$data['zone_id'] ?? 0, - 'zone' => ZoneRepo::find($data['zone_id'])->name, - 'city_id' => (int)$data['city_id'] ?? 0, - 'city' => $data['city'] ?? '', - 'zipcode' => $data['zipcode'] ?? '', - 'address_1' => $data['address_1'] ?? '', - 'address_2' => $data['address_2'] ?? '', + 'name' => $data['name'] ?? '', + 'phone' => $data['phone'] ?? '', + 'country_id' => (int) $data['country_id'] ?? 0, + 'zone_id' => (int) $data['zone_id'] ?? 0, + 'zone' => ZoneRepo::find($data['zone_id'])->name, + 'city_id' => (int) $data['city_id'] ?? 0, + 'city' => $data['city'] ?? '', + 'zipcode' => $data['zipcode'] ?? '', + 'address_1' => $data['address_1'] ?? '', + 'address_2' => $data['address_2'] ?? '', ]; + return $data; } } diff --git a/beike/Admin/Services/CategoryService.php b/beike/Admin/Services/CategoryService.php index 91db2f1b..cf7d53d3 100644 --- a/beike/Admin/Services/CategoryService.php +++ b/beike/Admin/Services/CategoryService.php @@ -33,12 +33,12 @@ class CategoryService $descriptions = []; foreach ($data['descriptions'] as $locale => $description) { $descriptions[] = [ - 'locale' => $locale, - 'name' => $description['name'], - 'content' => $description['content'] ?? '', - 'meta_title' => $description['meta_title'] ?? '', + 'locale' => $locale, + 'name' => $description['name'], + 'content' => $description['content'] ?? '', + 'meta_title' => $description['meta_title'] ?? '', 'meta_description' => $description['meta_description'] ?? '', - 'meta_keywords' => $description['meta_keywords'] ?? '', + 'meta_keywords' => $description['meta_keywords'] ?? '', ]; } if ($isUpdating) { @@ -55,6 +55,7 @@ class CategoryService DB::commit(); } catch (\Exception $e) { DB::rollBack(); + throw $e; } @@ -66,19 +67,19 @@ class CategoryService // Paths $paths = []; // 复制上级分类的 paths - $level = 0; + $level = 0; $parentPaths = CategoryPath::query()->where('category_id', $category->parent_id)->orderBy('level')->get(); foreach ($parentPaths as $path) { $paths[] = [ 'path_id' => $path->path_id, - 'level' => $level, + 'level' => $level, ]; $level++; } // 自身 $paths[] = [ 'path_id' => $category->id, - 'level' => $level, + 'level' => $level, ]; $category->paths()->createMany($paths); } @@ -103,7 +104,7 @@ class CategoryService $newPathIds = $newParentPathIds; $results = CategoryPath::query() - ->where('category_id', (int)$category_path->category_id) + ->where('category_id', (int) $category_path->category_id) ->where('level', '>=', $category_path->level) ->orderBy('level') ->get(); @@ -116,10 +117,10 @@ class CategoryService foreach ($newPathIds as $path_id) { $paths[] = [ 'category_id' => $category_path->category_id, - 'path_id' => $path_id, - 'level' => $level, - 'created_at' => now(), - 'updated_at' => now(), + 'path_id' => $path_id, + 'level' => $level, + 'created_at' => now(), + 'updated_at' => now(), ]; $level++; } @@ -134,7 +135,6 @@ class CategoryService // $this->repairCategories(0); } - /** * 重建category path * @@ -149,13 +149,13 @@ class CategoryService CategoryPath::query()->where('category_id', $category->id)->delete(); // Fix for records with no paths - $level = 0; + $level = 0; $subCategoryPaths = CategoryPath::query()->where('category_id', $parentId)->orderBy('level')->get(); foreach ($subCategoryPaths as $path) { CategoryPath::query()->create([ 'category_id' => $category->id, - 'path_id' => $path->path_id, - 'level' => $level, + 'path_id' => $path->path_id, + 'level' => $level, ]); $level++; } @@ -167,8 +167,8 @@ class CategoryService ->first(); $pathData = [ 'category_id' => $category->id, - 'path_id' => $category->id, - 'level' => $level + 'path_id' => $category->id, + 'level' => $level, ]; if ($path) { $path->update($pathData); diff --git a/beike/Admin/Services/CustomerGroupService.php b/beike/Admin/Services/CustomerGroupService.php index f0213f49..ab27b0a8 100644 --- a/beike/Admin/Services/CustomerGroupService.php +++ b/beike/Admin/Services/CustomerGroupService.php @@ -11,7 +11,6 @@ namespace Beike\Admin\Services; - use Beike\Repositories\CustomerGroupRepo; class CustomerGroupService @@ -22,13 +21,13 @@ class CustomerGroupService */ public static function create($data) { - $data = self::getParams($data); + $data = self::getParams($data); $customerGroup = CustomerGroupRepo::create($data); $descriptions = []; foreach ($data['descriptions'] as $locale => $description) { $description['locale'] = $locale; - $descriptions[] = $description; + $descriptions[] = $description; } $customerGroup->descriptions()->createMany($descriptions); @@ -37,7 +36,7 @@ class CustomerGroupService public static function update($id, $data) { - $data = self::getParams($data); + $data = self::getParams($data); $customerGroup = CustomerGroupRepo::find($id); $customerGroup->update($data); @@ -46,7 +45,7 @@ class CustomerGroupService $descriptions = []; foreach ($data['descriptions'] as $locale => $description) { $description['locale'] = $locale; - $descriptions[] = $description; + $descriptions[] = $description; } $customerGroup->descriptions()->createMany($descriptions); @@ -58,18 +57,18 @@ class CustomerGroupService $descriptions = []; foreach ($data['name'] as $locale => $value) { $descriptions[$locale] = [ - 'name' => $value, - 'description' => $data['description'][$locale] ?? '' + 'name' => $value, + 'description' => $data['description'][$locale] ?? '', ]; } $params = [ - 'total' => (int)$data['total'] ?? 0, - 'reward_point_factor' => (float)$data['reward_point_factor'] ?? 0, - 'use_point_factor' => (float)$data['use_point_factor'] ?? 0, - 'discount_factor' => (float)$data['discount_factor'] ?? 0, - 'level' => (int)$data['level'] ?? 0, - 'descriptions' => $descriptions, + 'total' => (int) $data['total'] ?? 0, + 'reward_point_factor' => (float) $data['reward_point_factor'] ?? 0, + 'use_point_factor' => (float) $data['use_point_factor'] ?? 0, + 'discount_factor' => (float) $data['discount_factor'] ?? 0, + 'level' => (int) $data['level'] ?? 0, + 'descriptions' => $descriptions, ]; return $params; diff --git a/beike/Admin/Services/CustomerService.php b/beike/Admin/Services/CustomerService.php index 24cfe654..19b872ab 100644 --- a/beike/Admin/Services/CustomerService.php +++ b/beike/Admin/Services/CustomerService.php @@ -11,19 +11,16 @@ namespace Beike\Admin\Services; -use Beike\Models\Category; -use Beike\Models\CategoryPath; use Beike\Repositories\CustomerRepo; -use Illuminate\Support\Facades\DB; class CustomerService { public static function create($data) { $data['locale'] = system_setting('base.locale'); - $data['from'] = 'admin'; - $customer = CustomerRepo::create($data); + $data['from'] = 'admin'; + $customer = CustomerRepo::create($data); + return $customer; } - } diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index 4d65c878..458ce742 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -11,33 +11,29 @@ namespace Beike\Admin\Services; -use Illuminate\Support\Facades\File; - class FileManagerService { private $fileBasePath = ''; - public function __construct() { $this->fileBasePath = public_path('catalog'); } - /** * 获取某个目录下所有文件夹 */ public function getDirectories($baseFolder = '/'): array { $currentBasePath = rtrim($this->fileBasePath . $baseFolder, '/'); - $directories = glob("{$currentBasePath}/*", GLOB_ONLYDIR); + $directories = glob("{$currentBasePath}/*", GLOB_ONLYDIR); $result = []; foreach ($directories as $directory) { $baseName = basename($directory); - $dirName = str_replace($this->fileBasePath, '', $directory); + $dirName = str_replace($this->fileBasePath, '', $directory); if (is_dir($directory)) { - $item = $this->handleFolder($dirName, $baseName); + $item = $this->handleFolder($dirName, $baseName); $subDirectories = $this->getDirectories($dirName); if ($subDirectories) { $item['children'] = $subDirectories; @@ -45,10 +41,10 @@ class FileManagerService $result[] = $item; } } + return $result; } - /** * 获取某个目录下的文件和文件夹 * @@ -61,9 +57,9 @@ class FileManagerService public function getFiles($baseFolder, int $page = 1, int $perPage = 20): array { $currentBasePath = rtrim($this->fileBasePath . $baseFolder, '/'); - $files = glob($currentBasePath . '/*'); + $files = glob($currentBasePath . '/*'); usort($files, function ($a, $b) { - return filemtime($a) - filemtime($b) <0; + return filemtime($a) - filemtime($b) < 0; }); $images = []; @@ -78,17 +74,16 @@ class FileManagerService } } - $page = $page > 0 ? $page : 1; + $page = $page > 0 ? $page : 1; $imageCollection = collect($images); return [ - 'images' => $imageCollection->forPage($page, $perPage)->values()->toArray(), + 'images' => $imageCollection->forPage($page, $perPage)->values()->toArray(), 'image_total' => $imageCollection->count(), - 'image_page' => $page, + 'image_page' => $page, ]; } - /** * 创建目录 * @param $folderName @@ -97,14 +92,13 @@ class FileManagerService public function createDirectory($folderName) { $catalogFolderPath = "catalog/{$folderName}"; - $folderPath = public_path($catalogFolderPath); + $folderPath = public_path($catalogFolderPath); if (is_dir($folderPath)) { throw new \Exception(trans('admin/file_manager.directory_already_exist')); } create_directories($catalogFolderPath); } - /** * 删除文件或文件夹 * @@ -125,7 +119,6 @@ class FileManagerService } } - /** * 批量删除文件 * @@ -145,7 +138,6 @@ class FileManagerService } } - /** * 修改文件夹或者文件名称 * @@ -156,18 +148,17 @@ class FileManagerService public function updateName($originPath, $newPath) { $originPath = public_path("catalog/{$originPath}"); - if (!is_dir($originPath) && !file_exists($originPath)) { + if (! is_dir($originPath) && ! file_exists($originPath)) { throw new \Exception(trans('admin/file_manager.target_not_exist')); } $originBase = dirname($originPath); - $newPath = $originBase . '/' . $newPath; + $newPath = $originBase . '/' . $newPath; if ($originPath == $newPath) { return; } @rename($originPath, $newPath); } - /** * 处理文件夹 * @@ -179,11 +170,10 @@ class FileManagerService { return [ 'path' => $folderPath, - 'name' => $baseName + 'name' => $baseName, ]; } - /** * 检测是否含有子文件夹 * @@ -192,17 +182,17 @@ class FileManagerService */ private function hasSubFolders($folderPath): bool { - $path = public_path("catalog/{$folderPath}"); + $path = public_path("catalog/{$folderPath}"); $subFiles = glob($path . '/*'); foreach ($subFiles as $subFile) { if (is_dir($subFile)) { return true; } } + return false; } - /** * 处理文件 * @@ -214,11 +204,11 @@ class FileManagerService private function handleImage($filePath, $baseName): array { return [ - 'path' => 'catalog' . $filePath, - 'name' => $baseName, - 'url' => image_resize("catalog{$filePath}"), + 'path' => 'catalog' . $filePath, + 'name' => $baseName, + 'url' => image_resize("catalog{$filePath}"), 'origin_url' => image_origin("catalog{$filePath}"), - 'selected' => false, + 'selected' => false, ]; } } diff --git a/beike/Admin/Services/LanguageService.php b/beike/Admin/Services/LanguageService.php index 8329ba45..ca9a0c3a 100644 --- a/beike/Admin/Services/LanguageService.php +++ b/beike/Admin/Services/LanguageService.php @@ -17,18 +17,18 @@ class LanguageService $result = []; foreach (admin_languages() as $languageCode) { $langFile = resource_path("lang/$languageCode/admin/base.php"); - if (!is_file($langFile)) { + if (! is_file($langFile)) { throw new \Exception("File ($langFile) not exist!"); } - $baseData = require($langFile); - $name = $baseData['name'] ?? $languageCode; + $baseData = require $langFile; + $name = $baseData['name'] ?? $languageCode; $result[] = [ - 'code' => $languageCode, - 'name' => $name, - 'id' => $languages[$languageCode]['id'] ?? 0, - 'image' => $languages[$languageCode]['image'] ?? '', + 'code' => $languageCode, + 'name' => $name, + 'id' => $languages[$languageCode]['id'] ?? 0, + 'image' => $languages[$languageCode]['image'] ?? '', 'sort_order' => $languages[$languageCode]['sort_order'] ?? '', - 'status' => $languages[$languageCode]['status'] ?? '', + 'status' => $languages[$languageCode]['status'] ?? '', ]; } @@ -46,7 +46,7 @@ class LanguageService $models = self::$models; foreach ($models as $className) { $className = "\\Beike\\Models\\$className"; - $items = $className::query()->where('locale', system_setting('base.locale', 'en'))->get()->toArray(); + $items = $className::query()->where('locale', system_setting('base.locale', 'en'))->get()->toArray(); foreach ($items as &$item) { if (isset($item['created_at'])) { $item['created_at'] = now(); @@ -59,13 +59,14 @@ class LanguageService } $className::query()->insert($items); } + return $language; } public static function delete($id) { $language = LanguageRepo::find($id); - if (!$language) { + if (! $language) { return; } if ($language->code == system_setting('base.locale')) { diff --git a/beike/Admin/Services/MarketingService.php b/beike/Admin/Services/MarketingService.php index b87b2fda..c0e510b4 100644 --- a/beike/Admin/Services/MarketingService.php +++ b/beike/Admin/Services/MarketingService.php @@ -11,11 +11,11 @@ namespace Beike\Admin\Services; -use ZanySoft\Zip\Zip; +use Illuminate\Http\Client\PendingRequest; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Storage; -use Illuminate\Http\Client\PendingRequest; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use ZanySoft\Zip\Zip; class MarketingService { @@ -35,7 +35,6 @@ class MarketingService return new self; } - /** * 获取可插件市场插件列表 * @@ -45,13 +44,13 @@ class MarketingService public function getList(array $filters = []): mixed { $url = config('beike.api_url') . '/api/plugins'; - if (!empty($filters)) { + if (! empty($filters)) { $url .= '?' . http_build_query($filters); } + return $this->httpClient->get($url)->json(); } - /** * 获取插件市场单个插件信息 * @@ -60,15 +59,15 @@ class MarketingService */ public function getPlugin($pluginCode): mixed { - $url = config('beike.api_url') . "/api/plugins/{$pluginCode}"; + $url = config('beike.api_url') . "/api/plugins/{$pluginCode}"; $plugin = $this->httpClient->get($url)->json(); if (empty($plugin)) { throw new NotFoundHttpException('该插件不存在或已下架'); } + return $plugin; } - /** * 购买插件市场单个插件 * @@ -85,11 +84,10 @@ class MarketingService $status = $content['status'] ?? ''; if ($status == 'success') { return $content['data']; - } else { - throw new \Exception($content['message'] ?? ''); } - } + throw new \Exception($content['message'] ?? ''); + } /** * 下载插件到网站 @@ -100,7 +98,7 @@ class MarketingService public function download($pluginCode) { $datetime = date('Y-m-d'); - $url = config('beike.api_url') . "/api/plugins/{$pluginCode}/download"; + $url = config('beike.api_url') . "/api/plugins/{$pluginCode}/download"; $content = $this->httpClient->get($url)->body(); @@ -108,7 +106,7 @@ class MarketingService Storage::disk('local')->put($pluginPath, $content); $pluginZip = storage_path('app/' . $pluginPath); - $zipFile = Zip::open($pluginZip); + $zipFile = Zip::open($pluginZip); $zipFile->extract(base_path('plugins')); } } diff --git a/beike/Admin/Services/ProductService.php b/beike/Admin/Services/ProductService.php index acb9c5c0..9ffcf3ac 100644 --- a/beike/Admin/Services/ProductService.php +++ b/beike/Admin/Services/ProductService.php @@ -3,7 +3,6 @@ namespace Beike\Admin\Services; use Beike\Models\Product; -use Beike\Models\ProductDescription; use Illuminate\Support\Facades\DB; class ProductService @@ -11,6 +10,7 @@ class ProductService public function create(array $data): Product { $product = new Product; + return $this->createOrUpdate($product, $data); } @@ -26,7 +26,7 @@ class ProductService try { DB::beginTransaction(); - $data['brand_id'] = (int)$data['brand_id']; + $data['brand_id'] = (int) $data['brand_id']; $data['variables'] = json_decode($data['variables']); $product->fill($data); $product->save(); @@ -39,7 +39,7 @@ class ProductService $descriptions = []; foreach ($data['descriptions'] as $locale => $description) { - $description['locale'] = $locale; + $description['locale'] = $locale; $description['content'] = $description['content'] ?? ''; $descriptions[] = $description; @@ -50,11 +50,11 @@ class ProductService $skus = []; foreach ($data['skus'] as $index => $sku) { - $sku['position'] = $index; - $sku['origin_price'] = (float)$sku['origin_price']; - $sku['cost_price'] = (float)$sku['cost_price']; - $sku['quantity'] = (int)$sku['quantity']; - $skus[] = $sku; + $sku['position'] = $index; + $sku['origin_price'] = (float) $sku['origin_price']; + $sku['cost_price'] = (float) $sku['cost_price']; + $sku['quantity'] = (int) $sku['quantity']; + $skus[] = $sku; } $product->skus()->createMany($skus); @@ -66,6 +66,7 @@ class ProductService return $product; } catch (\Exception $e) { DB::rollBack(); + throw $e; } } diff --git a/beike/Admin/Services/UserService.php b/beike/Admin/Services/UserService.php index 7f670f01..1b755273 100644 --- a/beike/Admin/Services/UserService.php +++ b/beike/Admin/Services/UserService.php @@ -11,8 +11,6 @@ namespace Beike\Admin\Services; - -use Beike\Libraries\Notification; use Beike\Repositories\UserRepo; use Beike\Repositories\VerifyCodeRepo; use Illuminate\Support\Carbon; @@ -25,13 +23,14 @@ class UserService * @param $email * @return void */ - public static function sendVerifyCodeForForgotten($email) { + public static function sendVerifyCodeForForgotten($email) + { $code = str_pad(mt_rand(10, 999999), 6, '0', STR_PAD_LEFT); VerifyCodeRepo::deleteByAccount($email); VerifyCodeRepo::create([ 'account' => $email, - 'code' => $code, + 'code' => $code, ]); Log::info("找回密码验证码：{$code}"); @@ -51,6 +50,7 @@ class UserService $verifyCode = VerifyCodeRepo::findByAccount($account); if ($verifyCode->created_at->addMinutes(10) < Carbon::now()) { $verifyCode->delete(); + throw new \Exception(trans('admin/user.verify_code_expired')); } @@ -59,7 +59,7 @@ class UserService } $user = UserRepo::findByEmail($account); - if (!$user) { + if (! $user) { throw new \Exception(trans('admin/user.account_not_exist')); } diff --git a/beike/Admin/View/Components/Alert.php b/beike/Admin/View/Components/Alert.php index 6752e63f..7d60c203 100644 --- a/beike/Admin/View/Components/Alert.php +++ b/beike/Admin/View/Components/Alert.php @@ -7,12 +7,13 @@ use Illuminate\View\Component; class Alert extends Component { public string $type; + public string $msg; - public function __construct(?string $type = 'success', string $msg) + public function __construct(?string $type, string $msg) { $this->type = $type ?? 'success'; - $this->msg = $msg; + $this->msg = $msg; } public function render() diff --git a/beike/Admin/View/Components/Filter.php b/beike/Admin/View/Components/Filter.php index a9ffddd2..a67c458d 100644 --- a/beike/Admin/View/Components/Filter.php +++ b/beike/Admin/View/Components/Filter.php @@ -7,6 +7,7 @@ use Illuminate\View\Component; class Filter extends Component { public string $url; + public array $queries; /** @@ -16,7 +17,7 @@ class Filter extends Component */ public function __construct(string $url) { - $this->url = $url; + $this->url = $url; $this->queries = request()->query() ?? []; } diff --git a/beike/Admin/View/Components/Form/Image.php b/beike/Admin/View/Components/Form/Image.php index dd51eba6..f362eb86 100644 --- a/beike/Admin/View/Components/Form/Image.php +++ b/beike/Admin/View/Components/Form/Image.php @@ -7,12 +7,14 @@ use Illuminate\View\Component; class Image extends Component { public string $name; + public string $title; + public string $value; public function __construct(string $name, ?string $title, ?string $value) { - $this->name = $name; + $this->name = $name; $this->title = $title ?? ''; $this->value = $value ?? ''; } diff --git a/beike/Admin/View/Components/Form/Input.php b/beike/Admin/View/Components/Form/Input.php index e4f235df..5dfb190d 100644 --- a/beike/Admin/View/Components/Form/Input.php +++ b/beike/Admin/View/Components/Form/Input.php @@ -7,23 +7,30 @@ use Illuminate\View\Component; class Input extends Component { public string $name; + public string $title; + public string $value; + public string $error; + public string $width; + public string $type; + public string $step; + public bool $required; public function __construct(string $name, string $title, ?string $value, bool $required = false, ?string $error = '', ?string $width = '400', ?string $type = 'text', ?string $step = '') { - $this->name = $name; - $this->title = $title; - $this->value = $value; - $this->error = $error; - $this->width = $width; - $this->type = $type; - $this->step = $step; + $this->name = $name; + $this->title = $title; + $this->value = $value; + $this->error = $error; + $this->width = $width; + $this->type = $type; + $this->step = $step; $this->required = $required; } diff --git a/beike/Admin/View/Components/Form/InputLocale.php b/beike/Admin/View/Components/Form/InputLocale.php index 930bd788..bdf946b1 100644 --- a/beike/Admin/View/Components/Form/InputLocale.php +++ b/beike/Admin/View/Components/Form/InputLocale.php @@ -8,17 +8,21 @@ use Illuminate\View\Component; class InputLocale extends Component { public string $name; + public string $title; + public string $width; + public $value; + public bool $required; public function __construct(string $name, string $title, $value, ?string $width = '400', ?bool $required = false) { - $this->name = $name; - $this->title = $title; - $this->width = $width; - $this->value = $value; + $this->name = $name; + $this->title = $title; + $this->width = $width; + $this->value = $value; $this->required = $required; } @@ -32,7 +36,7 @@ class InputLocale extends Component // descriptions.*.name => descriptions[zh_cn][name] $segments = explode('.', $this->name); - $key = $segments[0]; + $key = $segments[0]; for ($i = 1; $i < count($segments); $i++) { $segment = $segments[$i]; if ($segment == '*') { @@ -41,6 +45,7 @@ class InputLocale extends Component $key .= '[' . $segment . ']'; } } + return $key; } @@ -54,7 +59,7 @@ class InputLocale extends Component $valueKey = implode('.', $segments); $valueKey = str_replace('*', $code, $valueKey); - return old($oldKey, Arr::get($this->value, $valueKey, '')); + return old($oldKey, Arr::get($this->value, $valueKey, '')); } public function errorKey($code) diff --git a/beike/Admin/View/Components/Form/Select.php b/beike/Admin/View/Components/Form/Select.php index 86ce0c5d..3984247c 100644 --- a/beike/Admin/View/Components/Form/Select.php +++ b/beike/Admin/View/Components/Form/Select.php @@ -7,20 +7,25 @@ use Illuminate\View\Component; class Select extends Component { public string $name; + public string $value; + public string $title; + public array $options; + public string $key; + public string $label; public function __construct(string $name, string $value, string $title, array $options, ?string $key = 'value', ?string $label = 'label') { - $this->name = $name; - $this->title = $title; - $this->value = $value; + $this->name = $name; + $this->title = $title; + $this->value = $value; $this->options = $options; - $this->key = $key; - $this->label = $label; + $this->key = $key; + $this->label = $label; } public function render() diff --git a/beike/Admin/View/Components/Form/SwitchRadio.php b/beike/Admin/View/Components/Form/SwitchRadio.php index 91cb4b8f..6604ed61 100644 --- a/beike/Admin/View/Components/Form/SwitchRadio.php +++ b/beike/Admin/View/Components/Form/SwitchRadio.php @@ -7,12 +7,14 @@ use Illuminate\View\Component; class SwitchRadio extends Component { public string $name; + public string $value; + public string $title; public function __construct(string $name, string $value, string $title) { - $this->name = $name; + $this->name = $name; $this->title = $title; $this->value = $value; } diff --git a/beike/Admin/View/Components/Form/Textarea.php b/beike/Admin/View/Components/Form/Textarea.php index 8141df01..a4bd0972 100644 --- a/beike/Admin/View/Components/Form/Textarea.php +++ b/beike/Admin/View/Components/Form/Textarea.php @@ -7,18 +7,22 @@ use Illuminate\View\Component; class Textarea extends Component { public string $name; + public string $title; + public string $value; + public bool $required; + public bool $html; public function __construct(string $name, string $title, ?string $value, bool $required = false, bool $html = false) { - $this->name = $name; - $this->title = $title; - $this->value = $value; + $this->name = $name; + $this->title = $title; + $this->value = $value; $this->required = $required; - $this->html = $html; + $this->html = $html; } public function render() diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php index 7947bf8f..eaa0dce2 100644 --- a/beike/Admin/View/Components/Header.php +++ b/beike/Admin/View/Components/Header.php @@ -8,6 +8,7 @@ use Illuminate\View\Component; class Header extends Component { public array $links = []; + private ?AdminUser $adminUser; /** @@ -20,7 +21,6 @@ class Header extends Component $this->adminUser = current_user(); } - /** * Get the view / contents that represent the component. * @@ -28,32 +28,32 @@ class Header extends Component */ public function render() { - $sidebar = new Sidebar(); + $sidebar = new Sidebar(); $preparedMenus = $this->prepareMenus(); foreach ($preparedMenus as $menu) { if ($menu['code']) { - $routes = []; + $routes = []; $sideMenuRoutes = $sidebar->{"get{$menu['code']}SubRoutes"}(); foreach ($sideMenuRoutes as $route) { $route_first = explode('.', $route['route'])[0] ?? ''; - $routes[] = "admin." . $route['route']; - $routes[] = 'admin.' . $route_first . '.edit'; - $routes[] = 'admin.' . $route_first . '.show'; + $routes[] = 'admin.' . $route['route']; + $routes[] = 'admin.' . $route_first . '.edit'; + $routes[] = 'admin.' . $route_first . '.show'; } $is_route = equal_route($routes); } else { - $is_route = equal_route("admin." . $menu['route']); + $is_route = equal_route('admin.' . $menu['route']); } $this->addLink($menu['name'], $menu['route'], $is_route); } + return view('admin::components.header'); } - /** * 默认菜单 */ @@ -68,10 +68,10 @@ class Header extends Component ['name' => trans('admin/common.setting'), 'route' => 'settings.index', 'code' => 'Setting'], // ['name' => trans('admin/common.marketing'), 'route' => 'marketing.index', 'code' => ''], ]; + return hook_filter('admin.header_menus', $menus); } - /** * 添加后台顶部菜单链接 * @@ -86,11 +86,11 @@ class Header extends Component return; } - $url = admin_route($route); + $url = admin_route($route); $this->links[] = [ - 'title' => $title, - 'url' => $url, - 'active' => $active + 'title' => $title, + 'url' => $url, + 'active' => $active, ]; } } diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php index 8988ea74..58f89861 100644 --- a/beike/Admin/View/Components/Sidebar.php +++ b/beike/Admin/View/Components/Sidebar.php @@ -9,8 +9,11 @@ use Illuminate\View\Component; class Sidebar extends Component { public array $links = []; + private string $adminName; + private ?string $routeNameWithPrefix; + private ?AdminUser $adminUser; /** @@ -20,9 +23,9 @@ class Sidebar extends Component */ public function __construct() { - $this->adminName = admin_name(); + $this->adminName = admin_name(); $this->routeNameWithPrefix = request()->route()->getName(); - $this->adminUser = current_user(); + $this->adminUser = current_user(); } /** @@ -32,46 +35,45 @@ class Sidebar extends Component */ public function render() { - $adminName = $this->adminName; + $adminName = $this->adminName; $routeNameWithPrefix = request()->route()->getName(); - $routeName = str_replace($adminName . '.', '', $routeNameWithPrefix); + $routeName = str_replace($adminName . '.', '', $routeNameWithPrefix); if (Str::startsWith($routeName, ['home.'])) { $routes = $this->getHomeSubRoutes(); foreach ($routes as $route) { - $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false), $route['hide_mobile'] ?? 0); + $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool) ($route['blank'] ?? false), $route['hide_mobile'] ?? 0); } } elseif (Str::startsWith($routeName, ['products.', 'categories.', 'brands.', 'attribute_groups.', 'attributes.'])) { $routes = $this->getProductSubRoutes(); foreach ($routes as $route) { - $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false), $route['hide_mobile'] ?? 0); + $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool) ($route['blank'] ?? false), $route['hide_mobile'] ?? 0); } } elseif (Str::startsWith($routeName, ['customers.', 'customer_groups.'])) { $routes = $this->getCustomerSubRoutes(); foreach ($routes as $route) { - $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false), $route['hide_mobile'] ?? 0); + $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool) ($route['blank'] ?? false), $route['hide_mobile'] ?? 0); } } elseif (Str::startsWith($routeName, ['orders.', 'rmas.', 'rma_reasons.'])) { $routes = $this->getOrderSubRoutes(); foreach ($routes as $route) { - $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false), $route['hide_mobile'] ?? 0); + $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool) ($route['blank'] ?? false), $route['hide_mobile'] ?? 0); } } elseif (Str::startsWith($routeName, ['pages.'])) { $routes = $this->getPagesSubRoutes(); foreach ($routes as $route) { - $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false), $route['hide_mobile'] ?? 0); + $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool) ($route['blank'] ?? false), $route['hide_mobile'] ?? 0); } } elseif (Str::startsWith($routeName, ['settings.', 'admin_users.', 'admin_roles.', 'plugins.', 'marketing.', 'tax_classes', 'tax_rates', 'regions', 'currencies', 'languages', 'design_menu', 'countries', 'zones'])) { $routes = $this->getSettingSubRoutes(); foreach ($routes as $route) { - $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool)($route['blank'] ?? false), $route['hide_mobile'] ?? 0); + $this->addLink($route['route'], $route['icon'] ?? '', $this->equalRoute($route['route']), (bool) ($route['blank'] ?? false), $route['hide_mobile'] ?? 0); } } return view('admin::components.sidebar'); } - /** * 添加左侧菜单链接 * @@ -87,19 +89,18 @@ class Sidebar extends Component return; } - $title = trans("admin/common.{$permissionRoute}"); - $url = admin_route($route); + $title = trans("admin/common.{$permissionRoute}"); + $url = admin_route($route); $this->links[] = [ - 'title' => $title, - 'url' => $url, - 'icon' => $icon, - 'active' => $active, + 'title' => $title, + 'url' => $url, + 'icon' => $icon, + 'active' => $active, 'hide_mobile' => $hide_mobile, - 'new_window' => $newWindow + 'new_window' => $newWindow, ]; } - /** * 获取首页子页面路由 */ @@ -111,12 +112,12 @@ class Sidebar extends Component ['route' => 'design_menu.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ['route' => 'languages.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ['route' => 'currencies.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], - ['route' => 'plugins.index', 'icon' => 'fa fa-tachometer-alt' ,'hide_mobile' => 1], + ['route' => 'plugins.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ]; + return hook_filter('sidebar.home_routes', $routes); } - /** * 获取商品子页面路由 */ @@ -125,15 +126,15 @@ class Sidebar extends Component $routes = [ ['route' => 'categories.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'products.index', 'icon' => 'fa fa-tachometer-alt'], - ['route' => 'brands.index', 'icon' => 'fa fa-tachometer-alt','hide_mobile' => 1], + ['route' => 'brands.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ['route' => 'attribute_groups.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'attributes.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'products.trashed', 'icon' => 'fa fa-tachometer-alt'], ]; + return hook_filter('sidebar.product_routes', $routes); } - /** * 获取商品子页面路由 */ @@ -144,10 +145,10 @@ class Sidebar extends Component ['route' => 'customer_groups.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'customers.trashed', 'icon' => 'fa fa-tachometer-alt'], ]; + return hook_filter('sidebar.customer_routes', $routes); } - /** * 获取订单子页面路由 */ @@ -158,6 +159,7 @@ class Sidebar extends Component ['route' => 'rmas.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'rma_reasons.index', 'icon' => 'fa fa-tachometer-alt'], ]; + return hook_filter('sidebar.order_routes', $routes); } @@ -170,6 +172,7 @@ class Sidebar extends Component $routes = [ ['route' => 'pages.index', 'icon' => 'fa fa-tachometer-alt'], ]; + return hook_filter('sidebar.pages_routes', $routes); } @@ -182,8 +185,8 @@ class Sidebar extends Component $routes = [ ['route' => 'settings.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'admin_users.index', 'icon' => 'fa fa-tachometer-alt'], - ['route' => 'plugins.index', 'icon' => 'fa fa-tachometer-alt','hide_mobile' => 1], - ['route' => 'marketing.index', 'icon' => 'fa fa-tachometer-alt','hide_mobile' => 1], + ['route' => 'plugins.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], + ['route' => 'marketing.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ['route' => 'regions.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'tax_rates.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'tax_classes.index', 'icon' => 'fa fa-tachometer-alt'], @@ -191,14 +194,14 @@ class Sidebar extends Component ['route' => 'languages.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'countries.index', 'icon' => 'fa fa-tachometer-alt'], ['route' => 'zones.index', 'icon' => 'fa fa-tachometer-alt'], - ['route' => 'design.index', 'icon' => 'fa fa-tachometer-alt', 'blank' => true ,'hide_mobile' => 1], - ['route' => 'design_footer.index', 'icon' => 'fa fa-tachometer-alt', 'blank' => true ,'hide_mobile' => 1], - ['route' => 'design_menu.index', 'icon' => 'fa fa-tachometer-alt' ,'hide_mobile' => 1], + ['route' => 'design.index', 'icon' => 'fa fa-tachometer-alt', 'blank' => true, 'hide_mobile' => 1], + ['route' => 'design_footer.index', 'icon' => 'fa fa-tachometer-alt', 'blank' => true, 'hide_mobile' => 1], + ['route' => 'design_menu.index', 'icon' => 'fa fa-tachometer-alt', 'hide_mobile' => 1], ]; + return hook_filter('sidebar.setting_routes', $routes); } - /** * 是否为当前访问路由 * @@ -208,6 +211,7 @@ class Sidebar extends Component private function equalRoute($routeName): bool { $currentRouteName = str_replace($this->adminName . '.', '', $this->routeNameWithPrefix); + return $routeName == $currentRouteName; } } diff --git a/beike/Admin/View/DesignBuilders/Brand.php b/beike/Admin/View/DesignBuilders/Brand.php index 91fef1b0..7dafab5f 100644 --- a/beike/Admin/View/DesignBuilders/Brand.php +++ b/beike/Admin/View/DesignBuilders/Brand.php @@ -11,8 +11,8 @@ namespace Beike\Admin\View\DesignBuilders; -use Illuminate\View\Component; use Illuminate\Contracts\View\View; +use Illuminate\View\Component; class Brand extends Component { diff --git a/beike/Admin/View/DesignBuilders/Image100.php b/beike/Admin/View/DesignBuilders/Image100.php index 253316c8..709d3f45 100644 --- a/beike/Admin/View/DesignBuilders/Image100.php +++ b/beike/Admin/View/DesignBuilders/Image100.php @@ -11,8 +11,8 @@ namespace Beike\Admin\View\DesignBuilders; -use Illuminate\View\Component; use Illuminate\Contracts\View\View; +use Illuminate\View\Component; class Image100 extends Component { diff --git a/beike/Admin/View/DesignBuilders/Image401.php b/beike/Admin/View/DesignBuilders/Image401.php index d9aeeeac..ed2b07d8 100644 --- a/beike/Admin/View/DesignBuilders/Image401.php +++ b/beike/Admin/View/DesignBuilders/Image401.php @@ -11,8 +11,8 @@ namespace Beike\Admin\View\DesignBuilders; -use Illuminate\View\Component; use Illuminate\Contracts\View\View; +use Illuminate\View\Component; class Image401 extends Component { diff --git a/beike/Admin/View/DesignBuilders/SlideShow.php b/beike/Admin/View/DesignBuilders/SlideShow.php index f0b00ca1..e45211ee 100644 --- a/beike/Admin/View/DesignBuilders/SlideShow.php +++ b/beike/Admin/View/DesignBuilders/SlideShow.php @@ -11,8 +11,8 @@ namespace Beike\Admin\View\DesignBuilders; -use Illuminate\View\Component; use Illuminate\Contracts\View\View; +use Illuminate\View\Component; class SlideShow extends Component { @@ -33,10 +33,10 @@ class SlideShow extends Component public function render(): View { $data['register'] = [ - 'code' => 'slideshow', - 'sort' => 0, - 'name' => trans('admin/design_builder.module_slideshow'), - 'icon' => '', + 'code' => 'slideshow', + 'sort' => 0, + 'name' => trans('admin/design_builder.module_slideshow'), + 'icon' => '', 'style' => 'font-size: 40px;', ]; diff --git a/beike/Admin/View/DesignBuilders/TabProduct.php b/beike/Admin/View/DesignBuilders/TabProduct.php index a2afad4e..c620310b 100644 --- a/beike/Admin/View/DesignBuilders/TabProduct.php +++ b/beike/Admin/View/DesignBuilders/TabProduct.php @@ -11,8 +11,8 @@ namespace Beike\Admin\View\DesignBuilders; -use Illuminate\View\Component; use Illuminate\Contracts\View\View; +use Illuminate\View\Component; class TabProduct extends Component { diff --git a/beike/Config/beike.php b/beike/Config/beike.php index 4c28d337..5d907209 100644 --- a/beike/Config/beike.php +++ b/beike/Config/beike.php @@ -12,5 +12,5 @@ return [ 'api_url' => env('BEIKE_API_URL', 'https://beikeshop.com'), 'version' => '1.2.5', - 'build' => '20221226', + 'build' => '20221226', ]; diff --git a/beike/Console/Commands/GenerateDatabaseDict.php b/beike/Console/Commands/GenerateDatabaseDict.php index c38658f2..ae7e0fc2 100644 --- a/beike/Console/Commands/GenerateDatabaseDict.php +++ b/beike/Console/Commands/GenerateDatabaseDict.php @@ -11,27 +11,27 @@ namespace Beike\Console\Commands; -use UniSharp\DocUs\Parser; use Illuminate\Console\Command; use Illuminate\Support\Collection; use Illuminate\Support\Facades\DB; +use UniSharp\DocUs\Parser; class GenerateDatabaseDict extends Command { protected $signature = 'make:dict'; + protected $description = '生成数据字典 Markdown 文档'; public function handle() { $filePath = storage_path('database.md'); // $filePath = '/Users/edward/Guangda/Products/beike/beikedocs/docs/dev/database.md'; - $tables = $this->getTables(); + $tables = $this->getTables(); $markdown = view('vendor.unisharp.markdown', compact('tables'))->render(); file_put_contents($filePath, $markdown); dump('done'); } - /** * 获取所有数据表信息 * @return Collection @@ -39,10 +39,12 @@ class GenerateDatabaseDict extends Command private function getTables(): Collection { $schema = Parser::getSchema(); + return $schema->map(function ($item) { - $tableName = $item['name']; - $result = collect(DB::select("SHOW TABLE STATUS WHERE Name='{$tableName}'"))->first(); + $tableName = $item['name']; + $result = collect(DB::select("SHOW TABLE STATUS WHERE Name='{$tableName}'"))->first(); $item['comment'] = $result->Comment; + return $item; }); } diff --git a/beike/Console/Commands/MakeRootAdminUser.php b/beike/Console/Commands/MakeRootAdminUser.php index f295ba09..22568ec5 100644 --- a/beike/Console/Commands/MakeRootAdminUser.php +++ b/beike/Console/Commands/MakeRootAdminUser.php @@ -8,23 +8,25 @@ use Illuminate\Console\Command; class MakeRootAdminUser extends Command { protected $signature = 'make:admin'; + protected $description = '生成第 1 个 root admin 账号'; public function handle() { - $email = $this->ask('请输入登录邮箱地址'); + $email = $this->ask('请输入登录邮箱地址'); $password = $this->ask('请输入密码'); - if (!$email || !$password) { + if (! $email || ! $password) { $this->info('邮箱地址/手机号码不能为空，退出'); + return; } $admin = AdminUser::create([ - 'name' => 'John Doe', - 'email' => $email, + 'name' => 'John Doe', + 'email' => $email, 'password' => bcrypt($password), - 'active' => true, + 'active' => true, ]); $this->info('账号创建成功，退出'); diff --git a/beike/Console/Commands/Sitemap.php b/beike/Console/Commands/Sitemap.php index 877ac040..c4a0c6ea 100644 --- a/beike/Console/Commands/Sitemap.php +++ b/beike/Console/Commands/Sitemap.php @@ -23,7 +23,6 @@ class Sitemap extends Command /** * Execute the console command. - * */ public function handle() { diff --git a/beike/Helpers.php b/beike/Helpers.php index 39ccc71d..a8d19596 100644 --- a/beike/Helpers.php +++ b/beike/Helpers.php @@ -1,21 +1,21 @@ getRequestUri(); + $uri = request()->getRequestUri(); if (Str::startsWith($uri, "/{$adminName}")) { return true; } + return false; } - /** * 是否访问安装页面 * @return bool @@ -231,9 +235,9 @@ function is_admin(): bool function is_installer(): bool { $uri = request()->getRequestUri(); - return Str::startsWith($uri, "/installer"); -} + return Str::startsWith($uri, '/installer'); +} /** * 是否为当前访问路由 @@ -278,10 +282,11 @@ function current_customer(): ?Customer function locales(): array { $locales = LanguageRepo::enabled()->toArray(); + return array_map(function ($item) { return [ 'name' => $item['name'], - 'code' => $item['code'] + 'code' => $item['code'], ]; }, $locales); } @@ -294,10 +299,12 @@ function locales(): array function locale(): string { if (is_admin()) { - $locales = collect(locales())->pluck('code'); + $locales = collect(locales())->pluck('code'); $userLocale = current_user()->locale; + return ($locales->contains($userLocale)) ? $userLocale : 'en'; } + return Session::get('locale') ?? system_setting('base.locale'); } @@ -311,6 +318,7 @@ function admin_locale(): string if (is_admin()) { return current_user()->locale; } + return locale(); } @@ -320,14 +328,15 @@ function admin_locale(): string * @param $price * @param string $currency * @param string $value - * @param bool $format + * @param bool $format * @return string */ function currency_format($price, string $currency = '', string $value = '', bool $format = true): string { - if (!$currency) { + if (! $currency) { $currency = is_admin() ? system_setting('base.currency') : current_currency_code(); } + return CurrencyService::getInstance()->format($price, $currency, $value, $format); } @@ -345,10 +354,10 @@ function time_format($datetime = null) } elseif (is_int($datetime)) { return date($format, $datetime); } + return date($format); } - /** * 获取插件根目录 * @@ -360,7 +369,6 @@ function plugin_path(string $path = ''): string return base_path('plugins') . ($path ? DIRECTORY_SEPARATOR . ltrim($path, DIRECTORY_SEPARATOR) : $path); } - /** * 插件图片缩放 * @@ -378,6 +386,7 @@ function plugin_resize($pluginCode, $image, int $width = 100, int $height = 100) return $image; } $pluginDirName = $plugin->getDirname(); + return (new \Beike\Services\ImageService($image))->setPluginDirName($pluginDirName)->resize($width, $height); } @@ -395,6 +404,7 @@ function image_resize($image, int $width = 100, int $height = 100) if (Str::startsWith($image, 'http')) { return $image; } + return (new \Beike\Services\ImageService($image))->resize($width, $height); } @@ -407,6 +417,7 @@ function image_origin($image) if (Str::startsWith($image, 'http')) { return $image; } + return (new \Beike\Services\ImageService($image))->originUrl(); } @@ -428,6 +439,7 @@ function languages(): Collection function current_language() { $code = locale(); + return Language::query()->where('code', $code)->first(); } @@ -438,10 +450,11 @@ function current_language() */ function admin_languages(): array { - $packages = language_packages(); + $packages = language_packages(); $adminLanguages = collect($packages)->filter(function ($package) { return file_exists(resource_path("lang/{$package}/admin")); })->toArray(); + return array_values($adminLanguages); } @@ -452,7 +465,8 @@ function admin_languages(): array function language_packages(): array { $languageDir = resource_path('lang'); - return array_values(array_diff(scandir($languageDir), array('..', '.'))); + + return array_values(array_diff(scandir($languageDir), ['..', '.'])); } /** @@ -481,7 +495,8 @@ function current_currency_code(): string function current_currency_id(): string { $currencyCode = current_currency_code(); - $currency = \Beike\Models\Currency::query()->where('code', $currencyCode)->first(); + $currency = \Beike\Models\Currency::query()->where('code', $currencyCode)->first(); + return $currency->id ?? 0; } @@ -501,9 +516,10 @@ function quantity_format($quantity) return round($quantity / 1000000, 1) . 'M'; } elseif ($quantity > 1000) { return round($quantity / 1000, 1) . 'K'; - } else { - return $quantity; } + + return $quantity; + } /** @@ -512,9 +528,9 @@ function quantity_format($quantity) function json_success($message, $data = []): array { return [ - 'status' => 'success', + 'status' => 'success', 'message' => $message, - 'data' => $data, + 'data' => $data, ]; } @@ -524,16 +540,16 @@ function json_success($message, $data = []): array function json_fail($message, $data = []): array { return [ - 'status' => 'fail', + 'status' => 'fail', 'message' => $message, - 'data' => $data, + 'data' => $data, ]; } -if (!function_exists('sub_string')) { +if (! function_exists('sub_string')) { /** * @param $string - * @param int $length + * @param int $length * @param string $dot * @return string */ @@ -560,8 +576,9 @@ function to_sql($builder): array|string|null $sql = $builder->toSql(); foreach ($builder->getBindings() as $binding) { $value = is_numeric($binding) ? $binding : "'" . $binding . "'"; - $sql = preg_replace('/\?/', $value, $sql, 1); + $sql = preg_replace('/\?/', $value, $sql, 1); } + return $sql; } @@ -571,11 +588,11 @@ function to_sql($builder): array|string|null */ function create_directories($directoryPath) { - $path = ''; + $path = ''; $directories = explode('/', $directoryPath); foreach ($directories as $directory) { $path = $path . '/' . $directory; - if (!is_dir(public_path($path))) { + if (! is_dir(public_path($path))) { @mkdir(public_path($path), 0755); } } @@ -651,7 +668,6 @@ function is_mobile(): bool return (new \Jenssegers\Agent\Agent())->isMobile(); } - /** * 当前访问协议是否为 https * @@ -659,21 +675,21 @@ function is_mobile(): bool */ function is_secure(): bool { - if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') { + if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') { return true; } elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https') { return true; - } elseif (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') { + } elseif (! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') { return true; } elseif (isset($_SERVER['SERVER_PORT']) && intval($_SERVER['SERVER_PORT']) === 443) { return true; } elseif (isset($_SERVER['REQUEST_SCHEME']) && strtolower($_SERVER['REQUEST_SCHEME']) === 'https') { return true; } + return false; } - /** * 每页商品显示数量 * @@ -681,5 +697,5 @@ function is_secure(): bool */ function perPage(): int { - return (int)system_setting('base.product_per_page', 20); + return (int) system_setting('base.product_per_page', 20); } diff --git a/beike/Installer/Controllers/DatabaseController.php b/beike/Installer/Controllers/DatabaseController.php index f6e0452b..17981960 100644 --- a/beike/Installer/Controllers/DatabaseController.php +++ b/beike/Installer/Controllers/DatabaseController.php @@ -2,12 +2,12 @@ namespace Beike\Installer\Controllers; -use Illuminate\Routing\Controller; -use Illuminate\Support\Facades\DB; -use Illuminate\Http\RedirectResponse; -use Illuminate\Support\Facades\Schema; use Beike\Admin\Repositories\AdminUserRepo; use Beike\Installer\Helpers\DatabaseManager; +use Illuminate\Http\RedirectResponse; +use Illuminate\Routing\Controller; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Schema; class DatabaseController extends Controller { @@ -31,19 +31,20 @@ class DatabaseController extends Controller */ public function index() { - DB::statement("SET FOREIGN_KEY_CHECKS = 0"); - $rows = DB::select('SHOW TABLES'); + DB::statement('SET FOREIGN_KEY_CHECKS = 0'); + $rows = DB::select('SHOW TABLES'); $tables = array_column($rows, 'Tables_in_' . env('DB_DATABASE')); foreach ($tables as $table) { Schema::drop($table); } - DB::statement("SET FOREIGN_KEY_CHECKS = 1"); + DB::statement('SET FOREIGN_KEY_CHECKS = 1'); $params = request()->all(); + try { $response = $this->databaseManager->migrateAndSeed(); - $status = $response['status'] ?? ''; - $message = $response['message'] ?? ''; + $status = $response['status'] ?? ''; + $message = $response['message'] ?? ''; if ($status == 'error' && $message) { return redirect()->route('installer.environment')->withInput($params)->withErrors(['error' => $message]); } @@ -52,12 +53,12 @@ class DatabaseController extends Controller } $email = request('admin_email'); - $data = [ - 'name' => substr($email, 0, strpos($email, '@')), - 'email' => $email, + $data = [ + 'name' => substr($email, 0, strpos($email, '@')), + 'email' => $email, 'password' => request('admin_password'), - 'locale' => session('locale') ?? 'en', - 'active' => true, + 'locale' => session('locale') ?? 'en', + 'active' => true, ]; AdminUserRepo::createAdminUser($data); diff --git a/beike/Installer/Controllers/EnvironmentController.php b/beike/Installer/Controllers/EnvironmentController.php index 0c0c535e..c96f6192 100644 --- a/beike/Installer/Controllers/EnvironmentController.php +++ b/beike/Installer/Controllers/EnvironmentController.php @@ -2,13 +2,13 @@ namespace Beike\Installer\Controllers; +use Beike\Installer\Helpers\EnvironmentManager; +use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Routing\Controller; use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\DB; -use Illuminate\Http\RedirectResponse; use Illuminate\Support\Facades\Validator; -use Beike\Installer\Helpers\EnvironmentManager; class EnvironmentController extends Controller { @@ -40,13 +40,13 @@ class EnvironmentController extends Controller /** * Processes the newly saved environment configuration (Form Wizard). * - * @param Request $request + * @param Request $request * @param Redirector $redirect * @return RedirectResponse */ public function saveWizard(Request $request, Redirector $redirect): RedirectResponse { - $rules = config('installer.environment.form.rules'); + $rules = config('installer.environment.form.rules'); $messages = [ 'environment_custom.required_if' => trans('installer::installer_messages.environment.name_required'), ]; @@ -70,7 +70,6 @@ class EnvironmentController extends Controller return redirect(route('installer.database', $params)); } - /** * 数据库信息检测 * @@ -79,13 +78,13 @@ class EnvironmentController extends Controller */ public function validateDatabase(Request $request): array { - $rules = config('installer.environment.form.rules'); + $rules = config('installer.environment.form.rules'); $messages = [ 'environment_custom.required_if' => trans('installer::installer_messages.environment.name_required'), ]; - unset($rules['admin_email']); - unset($rules['admin_password']); + unset($rules['admin_email'], $rules['admin_password']); + $validator = Validator::make($request->all(), $rules, $messages); if ($validator->fails()) { @@ -100,7 +99,6 @@ class EnvironmentController extends Controller return json_success(''); } - /** * TODO: We can remove this code if PR will be merged: https://github.com/RachidLaasri/LaravelInstaller/pull/162 * Validate database connection with user credentials (Form Wizard). @@ -116,16 +114,16 @@ class EnvironmentController extends Controller config([ 'database' => [ - 'default' => $connection, + 'default' => $connection, 'connections' => [ $connection => array_merge($settings, [ - 'driver' => $connection, - 'host' => $request->input('database_hostname'), - 'port' => $request->input('database_port'), + 'driver' => $connection, + 'host' => $request->input('database_hostname'), + 'port' => $request->input('database_port'), 'database' => $request->input('database_name'), 'username' => $request->input('database_username'), 'password' => $request->input('database_password'), - 'options' => [ + 'options' => [ \PDO::ATTR_TIMEOUT => 1, ], ]), @@ -136,34 +134,42 @@ class EnvironmentController extends Controller DB::purge(); $result = []; + try { - $pdo = DB::connection()->getPdo(); + $pdo = DB::connection()->getPdo(); $serverVersion = $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION); if (version_compare($serverVersion, '5.7', '<')) { $result['database_version'] = trans('installer::installer_messages.environment.db_connection_failed_invalid_version'); + return $result; } + return true; } catch (\PDOException $e) { switch ($e->getCode()) { case 1115: $result['database_version'] = trans('installer::installer_messages.environment.db_connection_failed_invalid_version'); + break; case 2002: $result['database_hostname'] = trans('installer::installer_messages.environment.db_connection_failed_host_port'); - $result['database_port'] = trans('installer::installer_messages.environment.db_connection_failed_host_port'); + $result['database_port'] = trans('installer::installer_messages.environment.db_connection_failed_host_port'); + break; case 1045: $result['database_username'] = trans('installer::installer_messages.environment.db_connection_failed_user_password'); $result['database_password'] = trans('installer::installer_messages.environment.db_connection_failed_user_password'); + break; case 1049: $result['database_name'] = trans('installer::installer_messages.environment.db_connection_failed_database_name'); + break; default: $result['database_other'] = $e->getMessage(); } } + return $result; } } diff --git a/beike/Installer/Controllers/FinalController.php b/beike/Installer/Controllers/FinalController.php index 567d103f..4fb40035 100644 --- a/beike/Installer/Controllers/FinalController.php +++ b/beike/Installer/Controllers/FinalController.php @@ -2,10 +2,10 @@ namespace Beike\Installer\Controllers; -use Illuminate\Routing\Controller; use Beike\Installer\Helpers\EnvironmentManager; use Beike\Installer\Helpers\FinalInstallManager; use Beike\Installer\Helpers\InstalledFileManager; +use Illuminate\Routing\Controller; class FinalController extends Controller { @@ -13,20 +13,20 @@ class FinalController extends Controller * Update installed file and display finished view. * * @param InstalledFileManager $fileManager - * @param FinalInstallManager $finalInstall - * @param EnvironmentManager $environment + * @param FinalInstallManager $finalInstall + * @param EnvironmentManager $environment * @return mixed */ public function index(InstalledFileManager $fileManager, FinalInstallManager $finalInstall, EnvironmentManager $environment) { - $finalMessages = $finalInstall->runFinal(); + $finalMessages = $finalInstall->runFinal(); $finalStatusMessage = $fileManager->update(); - $finalEnvFile = $environment->getEnvContent(); + $finalEnvFile = $environment->getEnvContent(); $steps = 5; - $data = compact('finalMessages', 'finalStatusMessage', 'finalEnvFile', 'steps'); - $data['admin_email'] = request('admin_email'); + $data = compact('finalMessages', 'finalStatusMessage', 'finalEnvFile', 'steps'); + $data['admin_email'] = request('admin_email'); $data['admin_password'] = request('admin_password'); return view('installer::finished', $data); diff --git a/beike/Installer/Controllers/PermissionsController.php b/beike/Installer/Controllers/PermissionsController.php index 1144509a..2e6769fc 100644 --- a/beike/Installer/Controllers/PermissionsController.php +++ b/beike/Installer/Controllers/PermissionsController.php @@ -2,8 +2,8 @@ namespace Beike\Installer\Controllers; -use Illuminate\Routing\Controller; use Beike\Installer\Helpers\PermissionsChecker; +use Illuminate\Routing\Controller; class PermissionsController extends Controller { diff --git a/beike/Installer/Controllers/RequirementsController.php b/beike/Installer/Controllers/RequirementsController.php index 377f5a06..36a61397 100644 --- a/beike/Installer/Controllers/RequirementsController.php +++ b/beike/Installer/Controllers/RequirementsController.php @@ -2,8 +2,8 @@ namespace Beike\Installer\Controllers; -use Illuminate\Routing\Controller; use Beike\Installer\Helpers\RequirementsChecker; +use Illuminate\Routing\Controller; class RequirementsController extends Controller { diff --git a/beike/Installer/Controllers/WelcomeController.php b/beike/Installer/Controllers/WelcomeController.php index d170834f..adee31fa 100644 --- a/beike/Installer/Controllers/WelcomeController.php +++ b/beike/Installer/Controllers/WelcomeController.php @@ -18,10 +18,9 @@ class WelcomeController extends Controller { private $languages = [ 'zh_cn' => '简体中文', - 'en' => 'English', + 'en' => 'English', ]; - public function index() { if (installed()) { @@ -29,8 +28,8 @@ class WelcomeController extends Controller } $data['languages'] = $this->languages; - $data['locale'] = $_COOKIE['locale'] ?? 'en'; - $data['steps'] = 1; + $data['locale'] = $_COOKIE['locale'] ?? 'en'; + $data['steps'] = 1; return view('installer::welcome', $data); } diff --git a/beike/Installer/Helpers/DatabaseManager.php b/beike/Installer/Helpers/DatabaseManager.php index 296fb101..7c20f2db 100644 --- a/beike/Installer/Helpers/DatabaseManager.php +++ b/beike/Installer/Helpers/DatabaseManager.php @@ -34,7 +34,7 @@ class DatabaseManager private function migrate(BufferedOutput $outputLog) { try { - Artisan::call('migrate', ['--force'=> true], $outputLog); + Artisan::call('migrate', ['--force' => true], $outputLog); } catch (Exception $e) { return $this->response($e->getMessage(), 'error', $outputLog); } @@ -62,16 +62,16 @@ class DatabaseManager /** * Return a formatted error messages. * - * @param string $message - * @param string $status + * @param string $message + * @param string $status * @param \Symfony\Component\Console\Output\BufferedOutput $outputLog * @return array */ private function response($message, $status, BufferedOutput $outputLog) { return [ - 'status' => $status, - 'message' => $message, + 'status' => $status, + 'message' => $message, 'dbOutputLog' => $outputLog->fetch(), ]; } @@ -89,7 +89,7 @@ class DatabaseManager touch($database); DB::reconnect(Config::get('database.default')); } - $outputLog->write('Using SqlLite database: '.$database, 1); + $outputLog->write('Using SqlLite database: ' . $database, 1); } } } diff --git a/beike/Installer/Helpers/EnvironmentManager.php b/beike/Installer/Helpers/EnvironmentManager.php index 6f6be3a9..1159f0b7 100644 --- a/beike/Installer/Helpers/EnvironmentManager.php +++ b/beike/Installer/Helpers/EnvironmentManager.php @@ -23,7 +23,7 @@ class EnvironmentManager */ public function __construct() { - $this->envPath = base_path('.env'); + $this->envPath = base_path('.env'); $this->envExamplePath = base_path('.env.example'); } @@ -34,7 +34,7 @@ class EnvironmentManager */ public function getEnvContent() { - if (!file_exists($this->envPath)) { + if (! file_exists($this->envPath)) { if (file_exists($this->envExamplePath)) { copy($this->envExamplePath, $this->envPath); } else { @@ -95,7 +95,7 @@ class EnvironmentManager $results = trans('installer::installer_messages.environment.success'); $scheme = is_secure() ? 'https' : 'http'; - $appUrl = $scheme . "://" . $_SERVER["HTTP_HOST"]; + $appUrl = $scheme . '://' . $_SERVER['HTTP_HOST']; $envFileData = 'APP_NAME=\'' . ($request->app_name ?: 'BeikeShop') . "'\n" . diff --git a/beike/Installer/Helpers/FinalInstallManager.php b/beike/Installer/Helpers/FinalInstallManager.php index 0b05190b..ffcf4716 100644 --- a/beike/Installer/Helpers/FinalInstallManager.php +++ b/beike/Installer/Helpers/FinalInstallManager.php @@ -33,7 +33,7 @@ class FinalInstallManager { try { if (config('installer.final.key')) { - Artisan::call('key:generate', ['--force'=> true], $outputLog); + Artisan::call('key:generate', ['--force' => true], $outputLog); } } catch (Exception $e) { return static::response($e->getMessage(), $outputLog); @@ -71,8 +71,8 @@ class FinalInstallManager private static function response($message, BufferedOutput $outputLog) { return [ - 'status' => 'error', - 'message' => $message, + 'status' => 'error', + 'message' => $message, 'dbOutputLog' => $outputLog->fetch(), ]; } diff --git a/beike/Installer/Helpers/InstalledFileManager.php b/beike/Installer/Helpers/InstalledFileManager.php index e2c31dff..68795d8c 100644 --- a/beike/Installer/Helpers/InstalledFileManager.php +++ b/beike/Installer/Helpers/InstalledFileManager.php @@ -16,13 +16,13 @@ class InstalledFileManager $dateStamp = date('Y/m/d h:i:sa'); if (! file_exists($installedLogFile)) { - $message = trans('installer::installer_messages.installed.success_log_message').$dateStamp."\n"; + $message = trans('installer::installer_messages.installed.success_log_message') . $dateStamp . "\n"; file_put_contents($installedLogFile, $message); } else { - $message = trans('installer::installer_messages.updater.log.success_message').$dateStamp; + $message = trans('installer::installer_messages.updater.log.success_message') . $dateStamp; - file_put_contents($installedLogFile, $message.PHP_EOL, FILE_APPEND | LOCK_EX); + file_put_contents($installedLogFile, $message . PHP_EOL, FILE_APPEND | LOCK_EX); } return $message; diff --git a/beike/Installer/Helpers/MigrationsHelper.php b/beike/Installer/Helpers/MigrationsHelper.php index 96ddb100..4ed717b5 100644 --- a/beike/Installer/Helpers/MigrationsHelper.php +++ b/beike/Installer/Helpers/MigrationsHelper.php @@ -13,7 +13,7 @@ trait MigrationsHelper */ public function getMigrations() { - $migrations = glob(database_path().DIRECTORY_SEPARATOR.'migrations'.DIRECTORY_SEPARATOR.'*.php'); + $migrations = glob(database_path() . DIRECTORY_SEPARATOR . 'migrations' . DIRECTORY_SEPARATOR . '*.php'); return str_replace('.php', '', $migrations); } diff --git a/beike/Installer/Helpers/PermissionsChecker.php b/beike/Installer/Helpers/PermissionsChecker.php index 873973ad..dd064d6b 100644 --- a/beike/Installer/Helpers/PermissionsChecker.php +++ b/beike/Installer/Helpers/PermissionsChecker.php @@ -61,9 +61,9 @@ class PermissionsChecker private function addFile($folder, $permission, $isSet) { array_push($this->results['permissions'], [ - 'folder' => $folder, + 'folder' => $folder, 'permission' => $permission, - 'isSet' => $isSet, + 'isSet' => $isSet, ]); } diff --git a/beike/Installer/Helpers/RequirementsChecker.php b/beike/Installer/Helpers/RequirementsChecker.php index fe6b158b..d215c9ed 100644 --- a/beike/Installer/Helpers/RequirementsChecker.php +++ b/beike/Installer/Helpers/RequirementsChecker.php @@ -34,6 +34,7 @@ class RequirementsChecker $results['errors'] = true; } } + break; // check apache requirements case 'apache': @@ -49,6 +50,7 @@ class RequirementsChecker } } } + break; } } @@ -63,9 +65,9 @@ class RequirementsChecker */ public function checkPHPversion(string $minPhpVersion = null) { - $minVersionPhp = $minPhpVersion; + $minVersionPhp = $minPhpVersion; $currentPhpVersion = $this->getPhpVersionInfo(); - $supported = false; + $supported = false; if ($minPhpVersion == null) { $minVersionPhp = $this->getMinPhpVersion(); @@ -76,9 +78,9 @@ class RequirementsChecker } $phpStatus = [ - 'full' => $currentPhpVersion['full'], - 'current' => $currentPhpVersion['version'], - 'minimum' => $minVersionPhp, + 'full' => $currentPhpVersion['full'], + 'current' => $currentPhpVersion['version'], + 'minimum' => $minVersionPhp, 'supported' => $supported, ]; @@ -97,7 +99,7 @@ class RequirementsChecker $currentVersion = $filtered[0]; return [ - 'full' => $currentVersionFull, + 'full' => $currentVersionFull, 'version' => $currentVersion, ]; } diff --git a/beike/Installer/Helpers/functions.php b/beike/Installer/Helpers/functions.php index c3634e2b..121c4efe 100644 --- a/beike/Installer/Helpers/functions.php +++ b/beike/Installer/Helpers/functions.php @@ -4,8 +4,8 @@ if (! function_exists('isActive')) { /** * Set the active class to the current opened menu. * - * @param string|array $route - * @param string $className + * @param string|array $route + * @param string $className * @return string */ function isActive($route, $className = 'active') diff --git a/beike/Installer/Lang/en/installer_messages.php b/beike/Installer/Lang/en/installer_messages.php index 24f61c7f..c2eba213 100644 --- a/beike/Installer/Lang/en/installer_messages.php +++ b/beike/Installer/Lang/en/installer_messages.php @@ -7,12 +7,12 @@ return [ * Shared translations. * */ - 'title' => 'Laravel Installer', - 'next' => 'Next Step', - 'back' => 'Previous', - 'finish' => 'Install', - 'status' => 'Status', - 'forms' => [ + 'title' => 'Laravel Installer', + 'next' => 'Next Step', + 'back' => 'Previous', + 'finish' => 'Install', + 'status' => 'Status', + 'forms' => [ 'errorTitle' => 'The Following errors occurred:', ], @@ -21,14 +21,14 @@ return [ * Home page translations. * */ - 'welcome' => [ - 'template_title' => 'Welcome', - 'title' => 'Welcome', - 'describe' => 'Welcome to install BeikeShop. Easy Installation and Setup Wizard.', - 'message' => 'Easy Installation and Setup Wizard.', - 'next' => 'Check Requirements', - 'copyright_btn' => 'I have read the agreement and agree', - 'copyright_title' => 'Copyright Description', + 'welcome' => [ + 'template_title' => 'Welcome', + 'title' => 'Welcome', + 'describe' => 'Welcome to install BeikeShop. Easy Installation and Setup Wizard.', + 'message' => 'Easy Installation and Setup Wizard.', + 'next' => 'Check Requirements', + 'copyright_btn' => 'I have read the agreement and agree', + 'copyright_title' => 'Copyright Description', 'copyright_list_1' => '1. The copyright of this system belongs to Chengdu GuangDa Network Technology Co., Ltd. ', 'copyright_list_2' => '2. Except for the written permission of the company, no individual, unit or organization may profit from the sale of this system and its derivatives as commodities. ', 'copyright_list_3' => '3. This system can be downloaded, forwarded, installed, modified and used freely without authorization from our company. ', @@ -41,9 +41,9 @@ return [ */ 'requirements' => [ 'template_title' => 'Step 1 | Server Requirements', - 'environment' => 'Environmen', - 'title' => 'Server Requirements', - 'next' => 'Check Permissions', + 'environment' => 'Environmen', + 'title' => 'Server Requirements', + 'next' => 'Check Permissions', ], /* @@ -51,11 +51,11 @@ return [ * Permissions page translations. * */ - 'permissions' => [ + 'permissions' => [ 'template_title' => 'Step 2 | Directory Permission', - 'title' => 'Directory permission detection', - 'next' => 'Configure Environment', - 'table' => 'Table of contents', + 'title' => 'Directory permission detection', + 'next' => 'Configure Environment', + 'table' => 'Table of contents', ], /* @@ -63,58 +63,57 @@ return [ * Environment page translations. * */ - 'environment' => [ - 'template_title' => 'Step 3 | System Parameters', - 'title' => 'System parameter configuration', - 'name_required' => 'An environment name is required.', - 'database_link' => 'Database link', - 'admin_info' => 'Set admin account password', - 'app_name_label' => 'App Name', - 'app_name_placeholder' => 'App Name', - 'app_environment_label' => 'App Environment', - 'db_connection_failed_host_port' => 'Database host or port error!', - 'db_connection_failed_user_password' => 'Database username or password error!', - 'db_connection_failed_database_name' => 'Database name not exist!', + 'environment' => [ + 'template_title' => 'Step 3 | System Parameters', + 'title' => 'System parameter configuration', + 'name_required' => 'An environment name is required.', + 'database_link' => 'Database link', + 'admin_info' => 'Set admin account password', + 'app_name_label' => 'App Name', + 'app_name_placeholder' => 'App Name', + 'app_environment_label' => 'App Environment', + 'db_connection_failed_host_port' => 'Database host or port error!', + 'db_connection_failed_user_password' => 'Database username or password error!', + 'db_connection_failed_database_name' => 'Database name not exist!', 'db_connection_failed_invalid_version' => 'MySQL version must grater than 5.7!', - 'app_environment_label_local' => 'Local', - 'app_environment_label_developement' => 'Development', - 'app_environment_label_qa' => 'Qa', - 'app_environment_label_production' => 'Production', - 'app_environment_label_other' => 'Other', - 'app_environment_placeholder_other' => 'Enter your environment...', - 'app_url_label' => 'App Url', - 'app_url_placeholder' => 'App Url', - 'db_connection_failed' => 'Could not connect to the database.', - 'db_connection_label' => 'Database Connection', - 'db_connection_label_mysql' => 'mysql', - 'db_connection_label_sqlite' => 'sqlite', - 'db_connection_label_pgsql' => 'pgsql', - 'db_connection_label_sqlsrv' => 'sqlsrv', - 'db_host_label' => 'Database Host', - 'db_host_placeholder' => 'Database Host', - 'db_port_label' => 'Database Port', - 'db_port_placeholder' => 'Database Port', - 'db_name_label' => 'Database Name', - 'db_name_placeholder' => 'Database Name', - 'db_username_label' => 'Database User Name', - 'db_username_placeholder' => 'Database User Name', - 'db_password_label' => 'Database Password', - 'db_password_placeholder' => 'Database Password', - 'admin_email' => 'Admin User Account', - 'admin_password' => 'Admin Password', - 'install' => 'Install', - 'ajax_database_parameters' => 'Check database parameters...', - 'ajax_database_success' => 'Database connection succeeded', - 'error_email' => 'Please fill in the correct email address', + 'app_environment_label_local' => 'Local', + 'app_environment_label_developement' => 'Development', + 'app_environment_label_qa' => 'Qa', + 'app_environment_label_production' => 'Production', + 'app_environment_label_other' => 'Other', + 'app_environment_placeholder_other' => 'Enter your environment...', + 'app_url_label' => 'App Url', + 'app_url_placeholder' => 'App Url', + 'db_connection_failed' => 'Could not connect to the database.', + 'db_connection_label' => 'Database Connection', + 'db_connection_label_mysql' => 'mysql', + 'db_connection_label_sqlite' => 'sqlite', + 'db_connection_label_pgsql' => 'pgsql', + 'db_connection_label_sqlsrv' => 'sqlsrv', + 'db_host_label' => 'Database Host', + 'db_host_placeholder' => 'Database Host', + 'db_port_label' => 'Database Port', + 'db_port_placeholder' => 'Database Port', + 'db_name_label' => 'Database Name', + 'db_name_placeholder' => 'Database Name', + 'db_username_label' => 'Database User Name', + 'db_username_placeholder' => 'Database User Name', + 'db_password_label' => 'Database Password', + 'db_password_placeholder' => 'Database Password', + 'admin_email' => 'Admin User Account', + 'admin_password' => 'Admin Password', + 'install' => 'Install', + 'ajax_database_parameters' => 'Check database parameters...', + 'ajax_database_success' => 'Database connection succeeded', + 'error_email' => 'Please fill in the correct email address', ], - /* * * Installed Log translations. * */ - 'installed' => [ + 'installed' => [ 'success_log_message' => 'Laravel Installer successfully INSTALLED on ', ], @@ -123,17 +122,17 @@ return [ * Final page translations. * */ - 'final' => [ - 'title' => 'Installation Finished', + 'final' => [ + 'title' => 'Installation Finished', 'template_title' => 'Installation Finished', - 'migration' => 'Migration & Seed Console Output:', - 'console' => 'Application Console Output:', - 'log' => 'Installation Log Entry:', - 'env' => 'Final .env File:', - 'exit' => 'Click here to exit', - 'finished' => 'Congratulations, the system is successfully installed, let\'s experience it now', - 'to_front' => 'Shop', - 'to_admin' => 'Admin Panel', + 'migration' => 'Migration & Seed Console Output:', + 'console' => 'Application Console Output:', + 'log' => 'Installation Log Entry:', + 'env' => 'Final .env File:', + 'exit' => 'Click here to exit', + 'finished' => 'Congratulations, the system is successfully installed, let\'s experience it now', + 'to_front' => 'Shop', + 'to_admin' => 'Admin Panel', ], /* @@ -141,21 +140,21 @@ return [ * Update specific translations * */ - 'updater' => [ + 'updater' => [ /* * * Shared translations. * */ - 'title' => 'Laravel Updater', + 'title' => 'Laravel Updater', /* * * Welcome page translations for update feature. * */ - 'welcome' => [ - 'title' => 'Welcome To The Updater', + 'welcome' => [ + 'title' => 'Welcome To The Updater', 'message' => 'Welcome to the update wizard.', ], @@ -165,8 +164,8 @@ return [ * */ 'overview' => [ - 'title' => 'Overview', - 'message' => 'There is 1 update.|There are :number updates.', + 'title' => 'Overview', + 'message' => 'There is 1 update.|There are :number updates.', 'install_updates' => 'Install Updates', ], @@ -175,13 +174,13 @@ return [ * Final page translations. * */ - 'final' => [ - 'title' => 'Finished', + 'final' => [ + 'title' => 'Finished', 'finished' => 'Application\'s database has been successfully updated.', - 'exit' => 'Click here to exit', + 'exit' => 'Click here to exit', ], - 'log' => [ + 'log' => [ 'success_message' => 'Laravel Installer successfully UPDATED on ', ], ], diff --git a/beike/Installer/Lang/zh_cn/installer_messages.php b/beike/Installer/Lang/zh_cn/installer_messages.php index 9ac436d5..a62bc0ad 100644 --- a/beike/Installer/Lang/zh_cn/installer_messages.php +++ b/beike/Installer/Lang/zh_cn/installer_messages.php @@ -7,25 +7,24 @@ return [ * Shared translations. * */ - 'title' => 'Laravel安装程序', - 'next' => '下一步', - 'finish' => '安装', - 'status' => '状态', - + 'title' => 'Laravel安装程序', + 'next' => '下一步', + 'finish' => '安装', + 'status' => '状态', /* * * Home page translations. * */ - 'welcome' => [ - 'template_title' => '欢迎', - 'title' => '欢迎来到安装引导程序', - 'describe' => '欢迎使用安装引导，在后面的步骤中我们将检测您的系统环境和安装条件是否达标，请根据每一步中的提示信息操作，谢谢。', - 'message' => '欢迎来到安装向导.', - 'next' => '检测系统环境', - 'copyright_title' => '版权说明', - 'copyright_btn' => '已阅读协议并同意', + 'welcome' => [ + 'template_title' => '欢迎', + 'title' => '欢迎来到安装引导程序', + 'describe' => '欢迎使用安装引导，在后面的步骤中我们将检测您的系统环境和安装条件是否达标，请根据每一步中的提示信息操作，谢谢。', + 'message' => '欢迎来到安装向导.', + 'next' => '检测系统环境', + 'copyright_title' => '版权说明', + 'copyright_btn' => '已阅读协议并同意', 'copyright_list_1' => '1、本系统版权归属成都光大网络科技有限公司所有。', 'copyright_list_2' => '2、除本公司书面许可外，任何个人、单位、组织不得将本系统及其衍生品作为商品贩卖销售获利。', 'copyright_list_3' => '3、本系统可自由下载，转发，安装，修改和使用，不需要我公司授权。', @@ -38,9 +37,9 @@ return [ */ 'requirements' => [ 'template_title' => '第一步 | 服务器环境', - 'title' => '系统环境要求检测', - 'environment' => '环境', - 'next' => '检测权限', + 'title' => '系统环境要求检测', + 'environment' => '环境', + 'next' => '检测权限', ], /* @@ -48,11 +47,11 @@ return [ * Permissions page translations. * */ - 'permissions' => [ + 'permissions' => [ 'template_title' => '第二步 | 目录权限', - 'title' => '目录权限检测', - 'table' => '目录', - 'next' => '配置环境参数', + 'title' => '目录权限检测', + 'table' => '目录', + 'next' => '配置环境参数', ], /* @@ -60,39 +59,39 @@ return [ * Environment page translations. * */ - 'environment' => [ - 'template_title' => '第三步 | 系统参数', - 'title' => '系统参数配置', - 'app_url_label' => '您的应用URL', - 'database_link' => '数据库链接', - 'admin_info' => '设置后台账号密码', - 'app_url_placeholder' => '输入您的应用URL', - 'db_connection_failed' => '无法连接到数据库！', - 'db_connection_label' => '数据库类型', - 'db_connection_failed_host_port' => '数据库主机或端口错误！', - 'db_connection_failed_user_password' => '数据库账号或密码错误！', - 'db_connection_failed_database_name' => '数据库名不存在！', + 'environment' => [ + 'template_title' => '第三步 | 系统参数', + 'title' => '系统参数配置', + 'app_url_label' => '您的应用URL', + 'database_link' => '数据库链接', + 'admin_info' => '设置后台账号密码', + 'app_url_placeholder' => '输入您的应用URL', + 'db_connection_failed' => '无法连接到数据库！', + 'db_connection_label' => '数据库类型', + 'db_connection_failed_host_port' => '数据库主机或端口错误！', + 'db_connection_failed_user_password' => '数据库账号或密码错误！', + 'db_connection_failed_database_name' => '数据库名不存在！', 'db_connection_failed_invalid_version' => '数据库版本必须大于5.7！', - 'db_connection_label_mysql' => 'MySQL', - 'db_connection_label_sqlite' => 'SQLite', - 'db_connection_label_pgsql' => 'PostgreSQL', - 'db_connection_label_sqlsrv' => 'SQL Server', - 'db_host_label' => '数据库主机', - 'db_host_placeholder' => '输入数据库主机ip或url', - 'db_port_label' => '数据库端口', - 'db_port_placeholder' => '输入数据库端口', - 'db_name_label' => '数据库名', - 'db_name_placeholder' => '输入数据库名', - 'db_username_label' => '数据库账号', - 'db_username_placeholder' => '输入数据库账号', - 'db_password_label' => '数据库账号密码', - 'db_password_placeholder' => '输入数据库账号密码', - 'admin_email' => '后台账号', - 'admin_password' => '后台密码', - 'install' => '安装', - 'ajax_database_parameters' => '检测数据库参数...', - 'ajax_database_success' => '数据库连接成功', - 'error_email' => '请填写正确的邮箱地址', + 'db_connection_label_mysql' => 'MySQL', + 'db_connection_label_sqlite' => 'SQLite', + 'db_connection_label_pgsql' => 'PostgreSQL', + 'db_connection_label_sqlsrv' => 'SQL Server', + 'db_host_label' => '数据库主机', + 'db_host_placeholder' => '输入数据库主机ip或url', + 'db_port_label' => '数据库端口', + 'db_port_placeholder' => '输入数据库端口', + 'db_name_label' => '数据库名', + 'db_name_placeholder' => '输入数据库名', + 'db_username_label' => '数据库账号', + 'db_username_placeholder' => '输入数据库账号', + 'db_password_label' => '数据库账号密码', + 'db_password_placeholder' => '输入数据库账号密码', + 'admin_email' => '后台账号', + 'admin_password' => '后台密码', + 'install' => '安装', + 'ajax_database_parameters' => '检测数据库参数...', + 'ajax_database_success' => '数据库连接成功', + 'error_email' => '请填写正确的邮箱地址', ], /* @@ -100,11 +99,11 @@ return [ * Final page translations. * */ - 'final' => [ + 'final' => [ 'template_title' => '安装完成', - 'title' => '获取安装结果', - 'finished' => '恭喜您，系统安装成功，赶快体验吧', - 'to_front' => '访问前台', - 'to_admin' => '访问后台', + 'title' => '获取安装结果', + 'finished' => '恭喜您，系统安装成功，赶快体验吧', + 'to_front' => '访问前台', + 'to_admin' => '访问后台', ], ]; diff --git a/beike/Installer/Providers/InstallerServiceProvider.php b/beike/Installer/Providers/InstallerServiceProvider.php index 258062b9..c141812a 100644 --- a/beike/Installer/Providers/InstallerServiceProvider.php +++ b/beike/Installer/Providers/InstallerServiceProvider.php @@ -4,8 +4,6 @@ namespace Beike\Installer\Providers; use Illuminate\Support\Facades\Schema; use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Str; - class InstallerServiceProvider extends ServiceProvider { @@ -16,7 +14,7 @@ class InstallerServiceProvider extends ServiceProvider { $this->loadRoutesFrom(__DIR__ . '/../Routes/installer.php'); - if (!is_installer()) { + if (! is_installer()) { return; } diff --git a/beike/Installer/Routes/installer.php b/beike/Installer/Routes/installer.php index 61cd1932..59f31cdd 100644 --- a/beike/Installer/Routes/installer.php +++ b/beike/Installer/Routes/installer.php @@ -8,7 +8,6 @@ use Beike\Installer\Controllers\RequirementsController; use Beike\Installer\Controllers\WelcomeController; use Illuminate\Support\Facades\Route; - Route::prefix('installer') ->name('installer.') ->middleware(\App\Http\Middleware\SetLocaleInstaller::class) diff --git a/beike/Installer/config.php b/beike/Installer/config.php index 9408cf7a..62086026 100644 --- a/beike/Installer/config.php +++ b/beike/Installer/config.php @@ -12,15 +12,15 @@ return [ | by looping through the array and run "extension_loaded" on it. | */ - 'core' => [ + 'core' => [ 'minPhpVersion' => '8.0.2', ], - 'final' => [ - 'key' => true, + 'final' => [ + 'key' => true, 'publish' => false, ], - 'requirements' => [ - 'php' => [ + 'requirements' => [ + 'php' => [ 'BCMath', 'Ctype', 'cURL', @@ -49,11 +49,11 @@ return [ | requires more permissions just add them to the array list bellow. | */ - 'permissions' => [ + 'permissions' => [ 'storage/framework/' => '755', - 'storage/logs/' => '755', - 'bootstrap/cache/' => '755', - '.env' => '755', + 'storage/logs/' => '755', + 'bootstrap/cache/' => '755', + '.env' => '755', ], /* @@ -65,17 +65,17 @@ return [ | https://laravel.com/docs/5.4/validation#available-validation-rules | */ - 'environment' => [ + 'environment' => [ 'form' => [ 'rules' => [ 'database_connection' => 'required|string|max:50', - 'database_hostname' => 'required|string|max:50', - 'database_port' => 'required|numeric', - 'database_name' => 'required|string|max:50', - 'database_username' => 'required|string|max:50', - 'database_password' => 'nullable|string|max:50', - 'admin_email' => 'required|email:rfc', - 'admin_password' => 'required|string|max:50', + 'database_hostname' => 'required|string|max:50', + 'database_port' => 'required|numeric', + 'database_name' => 'required|string|max:50', + 'database_username' => 'required|string|max:50', + 'database_password' => 'nullable|string|max:50', + 'admin_email' => 'required|email:rfc', + 'admin_password' => 'required|string|max:50', ], ], ], @@ -88,7 +88,7 @@ return [ | canInstall middleware located in `canInstall.php`. | */ - 'installed' => [ + 'installed' => [ 'redirectOptions' => [ 'route' => [ 'name' => 'welcome', @@ -97,7 +97,7 @@ return [ 'abort' => [ 'type' => '404', ], - 'dump' => [ + 'dump' => [ 'data' => 'Dumping a not found message.', ], ], @@ -124,6 +124,6 @@ return [ | Boolean value | */ - 'updaterEnabled' => 'true', + 'updaterEnabled' => 'true', ]; diff --git a/beike/Libraries/Notification.php b/beike/Libraries/Notification.php index 8fdba917..8b226927 100644 --- a/beike/Libraries/Notification.php +++ b/beike/Libraries/Notification.php @@ -11,13 +11,12 @@ namespace Beike\Libraries; - class Notification { /** * @param string $code * @param string $message - * @param string $type email|telephone + * @param string $type email|telephone * @return bool */ public static function verifyCode(string $code, string $message, string $type): bool diff --git a/beike/Libraries/Tax.php b/beike/Libraries/Tax.php index 3d7ffd65..507ea3ed 100644 --- a/beike/Libraries/Tax.php +++ b/beike/Libraries/Tax.php @@ -18,17 +18,18 @@ use Beike\Models\TaxRule; class Tax { private array $taxRates = []; + private static array $taxRules = []; - const AVAILABLE_TYPES = ['shipping', 'payment', 'store']; + public const AVAILABLE_TYPES = ['shipping', 'payment', 'store']; - public function __construct($data = array()) + public function __construct($data = []) { - $countryId = (int)system_setting('base.country_id'); - $zoneId = (int)system_setting('base.zone_id'); + $countryId = (int) system_setting('base.country_id'); + $zoneId = (int) system_setting('base.zone_id'); $shippingAddress = $data['shipping_address'] ?? null; - $paymentAddress = $data['payment_address'] ?? null; + $paymentAddress = $data['payment_address'] ?? null; if ($shippingAddress) { if ($shippingAddress instanceof Address) { @@ -57,7 +58,7 @@ class Tax $this->setStoreAddress($countryId, $zoneId); } - public static function getInstance($data = array()) + public static function getInstance($data = []) { return new self($data); } @@ -78,36 +79,37 @@ class Tax ->where('rz.country_id', $countryId) ->where(function ($query) use ($zoneId) { $query->where('rz.zone_id', '=', 0) - ->orWhere('rz.zone_id', '=', (int)$zoneId); + ->orWhere('rz.zone_id', '=', (int) $zoneId); }) ->orderBy('rule.priority'); - $data = $sqlBuilder->get(); + $data = $sqlBuilder->get(); self::$taxRules["$type-$countryId-$zoneId"] = $data; + return $data; } private function setAddress($type, $countryId, $zoneId) { - if (!in_array($type, self::AVAILABLE_TYPES)) { + if (! in_array($type, self::AVAILABLE_TYPES)) { throw new \Exception('invalid tax types'); } $data = $this->getTaxRules($type, $countryId, $zoneId); foreach ($data as $result) { - $this->taxRates[$result->tax_class_id][$result->tax_rate_id] = array( + $this->taxRates[$result->tax_class_id][$result->tax_rate_id] = [ 'tax_rate_id' => $result->tax_rate_id, - 'name' => $result->name, - 'rate' => $result->rate, - 'type' => $result->type, - 'priority' => $result->priority - ); + 'name' => $result->name, + 'rate' => $result->rate, + 'type' => $result->type, + 'priority' => $result->priority, + ]; } } public function unsetRates() { - $this->taxRates = array(); + $this->taxRates = []; } public function setShippingAddress($countryId, $zoneId) @@ -138,7 +140,7 @@ class Tax public function calculate($value, $taxClassId, bool $calculate = true) { if ($taxClassId && $calculate) { - $amount = 0; + $amount = 0; $taxRates = $this->getRates($value, $taxClassId); foreach ($taxRates as $taxRate) { if ($calculate != 'P' && $calculate != 'F') { @@ -147,19 +149,22 @@ class Tax $amount += $taxRate['amount']; } } + return $value + $amount; - } else { - return $value; } + + return $value; + } public function getTax($value, $taxClassId) { - $amount = 0; + $amount = 0; $taxRates = $this->getRates($value, $taxClassId); foreach ($taxRates as $taxRate) { $amount += $taxRate['amount']; } + return $amount; } @@ -168,14 +173,15 @@ class Tax $taxRate = TaxRate::query()->find($taxRateId); if ($taxRate) { return $taxRate->name; - } else { - return false; } + + return false; + } public function getRates($value, $taxClassId) { - $taxRateData = array(); + $taxRateData = []; if (isset($this->taxRates[$taxClassId])) { foreach ($this->taxRates[$taxClassId] as $taxRate) { @@ -191,13 +197,13 @@ class Tax $amount += ($value / 100 * $taxRate['rate']); } - $taxRateData[$taxRate['tax_rate_id']] = array( + $taxRateData[$taxRate['tax_rate_id']] = [ 'tax_rate_id' => $taxRate['tax_rate_id'], - 'name' => $taxRate['name'], - 'rate' => $taxRate['rate'], - 'type' => $taxRate['type'], - 'amount' => $amount - ); + 'name' => $taxRate['name'], + 'rate' => $taxRate['rate'], + 'type' => $taxRate['type'], + 'amount' => $amount, + ]; } } diff --git a/beike/Mail/CustomerForgotten.php b/beike/Mail/CustomerForgotten.php index 8e6353cf..118e420a 100644 --- a/beike/Mail/CustomerForgotten.php +++ b/beike/Mail/CustomerForgotten.php @@ -12,15 +12,16 @@ namespace Beike\Mail; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; class CustomerForgotten extends Mailable implements ShouldQueue { use Queueable, SerializesModels; private string $code; + private string $email; /** @@ -30,7 +31,7 @@ class CustomerForgotten extends Mailable implements ShouldQueue */ public function __construct(string $code, string $email) { - $this->code = $code; + $this->code = $code; $this->email = $email; } diff --git a/beike/Mail/CustomerNewOrder.php b/beike/Mail/CustomerNewOrder.php index 88f9344f..93ae6715 100644 --- a/beike/Mail/CustomerNewOrder.php +++ b/beike/Mail/CustomerNewOrder.php @@ -13,9 +13,9 @@ namespace Beike\Mail; use Beike\Models\Order; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\App; class CustomerNewOrder extends Mailable implements ShouldQueue @@ -43,6 +43,7 @@ class CustomerNewOrder extends Mailable implements ShouldQueue { $orderLocale = $this->order->locale; App::setLocale($orderLocale); + return $this->view('mails.order_new', ['order' => $this->order]); } } diff --git a/beike/Mail/CustomerRegistration.php b/beike/Mail/CustomerRegistration.php index 6a1e975b..3b008342 100644 --- a/beike/Mail/CustomerRegistration.php +++ b/beike/Mail/CustomerRegistration.php @@ -13,9 +13,9 @@ namespace Beike\Mail; use Beike\Models\Customer; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; class CustomerRegistration extends Mailable implements ShouldQueue { diff --git a/beike/Mail/CustomerUpdateOrder.php b/beike/Mail/CustomerUpdateOrder.php index c4773150..8887729d 100644 --- a/beike/Mail/CustomerUpdateOrder.php +++ b/beike/Mail/CustomerUpdateOrder.php @@ -13,9 +13,9 @@ namespace Beike\Mail; use Beike\Models\Order; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Support\Facades\App; class CustomerUpdateOrder extends Mailable implements ShouldQueue @@ -23,6 +23,7 @@ class CustomerUpdateOrder extends Mailable implements ShouldQueue use Queueable, SerializesModels; private Order $order; + private string $fromCode; /** @@ -32,7 +33,7 @@ class CustomerUpdateOrder extends Mailable implements ShouldQueue */ public function __construct(Order $order, string $fromCode) { - $this->order = $order; + $this->order = $order; $this->fromCode = $fromCode; } @@ -45,6 +46,7 @@ class CustomerUpdateOrder extends Mailable implements ShouldQueue { $orderLocale = $this->order->locale; App::setLocale($orderLocale); + return $this->view('mails.order_update', ['order' => $this->order, 'from_code' => $this->fromCode]); } } diff --git a/beike/Mail/UserForgotten.php b/beike/Mail/UserForgotten.php index b5e8f768..ff82702d 100644 --- a/beike/Mail/UserForgotten.php +++ b/beike/Mail/UserForgotten.php @@ -12,15 +12,16 @@ namespace Beike\Mail; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; class UserForgotten extends Mailable implements ShouldQueue { use Queueable, SerializesModels; private string $code; + private string $email; /** @@ -30,7 +31,7 @@ class UserForgotten extends Mailable implements ShouldQueue */ public function __construct(string $code, string $email) { - $this->code = $code; + $this->code = $code; $this->email = $email; } diff --git a/beike/Models/Address.php b/beike/Models/Address.php index 053d153e..59a62385 100644 --- a/beike/Models/Address.php +++ b/beike/Models/Address.php @@ -11,8 +11,8 @@ namespace Beike\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class Address extends Base { @@ -30,4 +30,3 @@ class Address extends Base return $this->belongsTo(Zone::class); } } - diff --git a/beike/Models/AdminUser.php b/beike/Models/AdminUser.php index 5288c27d..596d23e7 100644 --- a/beike/Models/AdminUser.php +++ b/beike/Models/AdminUser.php @@ -3,21 +3,20 @@ namespace Beike\Models; use Beike\Notifications\AdminForgottenNotification; +use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Foundation\Auth\User as AuthUser; use Illuminate\Notifications\Notifiable; use Spatie\Permission\Traits\HasRoles; -use Illuminate\Foundation\Auth\User as AuthUser; -use Illuminate\Database\Eloquent\Factories\HasFactory; class AdminUser extends AuthUser { use HasFactory, HasRoles; use Notifiable; - const AUTH_GUARD = 'web_admin'; + public const AUTH_GUARD = 'web_admin'; protected $fillable = ['name', 'email', 'locale', 'password', 'active']; - public function notifyVerifyCodeForForgotten($code) { $useQueue = system_setting('base.use_queue', true); diff --git a/beike/Models/Attribute.php b/beike/Models/Attribute.php index 53ad748d..28607344 100644 --- a/beike/Models/Attribute.php +++ b/beike/Models/Attribute.php @@ -21,14 +21,14 @@ class Attribute extends Base protected $fillable = ['attribute_group_id', 'sort_order']; - public function attributeGroup() : BelongsTo + public function attributeGroup(): BelongsTo { - return $this->belongsTo(AttributeGroup::Class); + return $this->belongsTo(AttributeGroup::class); } - public function values() :HasMany + public function values(): HasMany { - return $this->hasMany(AttributeValue::Class); + return $this->hasMany(AttributeValue::class); } public function description() @@ -36,9 +36,8 @@ class Attribute extends Base return $this->hasOne(AttributeDescription::class)->where('locale', locale()); } - public function descriptions() :HasMany + public function descriptions(): HasMany { - return $this->hasMany(AttributeDescription::Class); + return $this->hasMany(AttributeDescription::class); } } - diff --git a/beike/Models/AttributeDescription.php b/beike/Models/AttributeDescription.php index 60916846..26a0a171 100644 --- a/beike/Models/AttributeDescription.php +++ b/beike/Models/AttributeDescription.php @@ -12,14 +12,10 @@ namespace Beike\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasMany; class AttributeDescription extends Base { use HasFactory; protected $fillable = ['attribute_id', 'locale', 'name']; - } - diff --git a/beike/Models/AttributeGroup.php b/beike/Models/AttributeGroup.php index b10bfb6a..c38b6697 100644 --- a/beike/Models/AttributeGroup.php +++ b/beike/Models/AttributeGroup.php @@ -25,14 +25,13 @@ class AttributeGroup extends Base return $this->hasOne(AttributeGroupDescription::class)->where('locale', locale()); } - public function descriptions() :HasMany + public function descriptions(): HasMany { - return $this->hasMany(AttributeGroupDescription::Class); + return $this->hasMany(AttributeGroupDescription::class); } - public function attributes() :HasMany + public function attributes(): HasMany { - return $this->hasMany(Attribute::Class); + return $this->hasMany(Attribute::class); } } - diff --git a/beike/Models/AttributeGroupDescription.php b/beike/Models/AttributeGroupDescription.php index 2dc25790..c23ceea0 100644 --- a/beike/Models/AttributeGroupDescription.php +++ b/beike/Models/AttributeGroupDescription.php @@ -12,13 +12,10 @@ namespace Beike\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Relations\HasMany; class AttributeGroupDescription extends Base { use HasFactory; protected $fillable = ['attribute_group_id', 'locale', 'name']; - } - diff --git a/beike/Models/AttributeValue.php b/beike/Models/AttributeValue.php index 3b55dff8..7ceccc58 100644 --- a/beike/Models/AttributeValue.php +++ b/beike/Models/AttributeValue.php @@ -26,14 +26,13 @@ class AttributeValue extends Base return $this->hasOne(AttributeValueDescription::class)->where('locale', locale()); } - public function descriptions() :HasMany + public function descriptions(): HasMany { - return $this->hasMany(AttributeValueDescription::Class); + return $this->hasMany(AttributeValueDescription::class); } - public function attribute() :BelongsTo + public function attribute(): BelongsTo { - return $this->belongsTo(Attribute::Class); + return $this->belongsTo(Attribute::class); } } - diff --git a/beike/Models/AttributeValueDescription.php b/beike/Models/AttributeValueDescription.php index 6b870816..8c79bf0d 100644 --- a/beike/Models/AttributeValueDescription.php +++ b/beike/Models/AttributeValueDescription.php @@ -12,14 +12,10 @@ namespace Beike\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Relations\HasMany; class AttributeValueDescription extends Base { use HasFactory; protected $fillable = ['attribute_value_id', 'locale', 'name']; - - } - diff --git a/beike/Models/Brand.php b/beike/Models/Brand.php index 8acd8ab3..97a6d2c2 100644 --- a/beike/Models/Brand.php +++ b/beike/Models/Brand.php @@ -20,9 +20,8 @@ class Brand extends Base protected $fillable = ['name', 'first', 'logo', 'sort_order', 'status']; - public function products() :HasMany + public function products(): HasMany { - return $this->hasMany(Product::Class); + return $this->hasMany(Product::class); } } - diff --git a/beike/Models/Cart.php b/beike/Models/Cart.php index 8a7a32de..d28feac7 100644 --- a/beike/Models/Cart.php +++ b/beike/Models/Cart.php @@ -2,15 +2,15 @@ namespace Beike\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\BelongsTo; class Cart extends Base { use HasFactory; protected $fillable = [ - 'customer_id', 'session_id', 'shipping_address_id', 'guest_shipping_address', 'shipping_method_code', 'payment_address_id', 'guest_payment_address', 'payment_method_code', 'extra' + 'customer_id', 'session_id', 'shipping_address_id', 'guest_shipping_address', 'shipping_method_code', 'payment_address_id', 'guest_payment_address', 'payment_method_code', 'extra', ]; public function customer(): BelongsTo diff --git a/beike/Models/Category.php b/beike/Models/Category.php index 6ef8f355..9ff95262 100644 --- a/beike/Models/Category.php +++ b/beike/Models/Category.php @@ -2,10 +2,10 @@ namespace Beike\Models; -use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasOne; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\HasOne; class Category extends Base { @@ -23,12 +23,12 @@ class Category extends Base public function parent(): BelongsTo { - return $this->belongsTo(Category::class, 'parent_id'); + return $this->belongsTo(self::class, 'parent_id'); } public function children(): HasMany { - return $this->hasMany(Category::class, 'parent_id'); + return $this->hasMany(self::class, 'parent_id'); } public function descriptions(): HasMany diff --git a/beike/Models/Country.php b/beike/Models/Country.php index 7bf37540..58385d79 100644 --- a/beike/Models/Country.php +++ b/beike/Models/Country.php @@ -25,4 +25,3 @@ class Country extends Base return $this->hasMany(Zone::class); } } - diff --git a/beike/Models/Currency.php b/beike/Models/Currency.php index a545b0c2..3ac2392b 100644 --- a/beike/Models/Currency.php +++ b/beike/Models/Currency.php @@ -18,6 +18,4 @@ class Currency extends Base use HasFactory; protected $fillable = ['name', 'code', 'symbol_left', 'symbol_right', 'decimal_place', 'value', 'status']; - } - diff --git a/beike/Models/Customer.php b/beike/Models/Customer.php index 7b53421d..dea03edc 100644 --- a/beike/Models/Customer.php +++ b/beike/Models/Customer.php @@ -3,14 +3,14 @@ namespace Beike\Models; use Beike\Notifications\ForgottenNotification; -use Carbon\Carbon; -use Illuminate\Notifications\Notifiable; -use Illuminate\Database\Eloquent\SoftDeletes; use Beike\Notifications\RegistrationNotification; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; class Customer extends Authenticatable { @@ -18,7 +18,7 @@ class Customer extends Authenticatable use SoftDeletes; use Notifiable; - const AUTH_GUARD = 'web_shop'; + public const AUTH_GUARD = 'web_shop'; protected $fillable = ['name', 'email', 'password', 'status', 'avatar', 'customer_group_id', 'locale', 'status', 'from']; diff --git a/beike/Models/CustomerGroup.php b/beike/Models/CustomerGroup.php index e3f3da00..3a91c550 100644 --- a/beike/Models/CustomerGroup.php +++ b/beike/Models/CustomerGroup.php @@ -10,7 +10,6 @@ class CustomerGroup extends Base protected $fillable = ['total', 'reward_point_factor', 'use_point_factor', 'discount_factor', 'level']; - public function description() { return $this->hasOne(CustomerGroupDescription::class)->where('locale', locale()); @@ -20,5 +19,4 @@ class CustomerGroup extends Base { return $this->hasMany(CustomerGroupDescription::class); } - } diff --git a/beike/Models/Language.php b/beike/Models/Language.php index 53816848..5036c914 100644 --- a/beike/Models/Language.php +++ b/beike/Models/Language.php @@ -18,6 +18,4 @@ class Language extends Base use HasFactory; protected $fillable = ['name', 'code', 'locale', 'image', 'sort_order', 'status']; - } - diff --git a/beike/Models/Order.php b/beike/Models/Order.php index bb08dcec..269feffa 100644 --- a/beike/Models/Order.php +++ b/beike/Models/Order.php @@ -11,11 +11,11 @@ namespace Beike\Models; -use Illuminate\Notifications\Notifiable; use Beike\Notifications\NewOrderNotification; use Beike\Notifications\UpdateOrderNotification; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Notifications\Notifiable; class Order extends Base { @@ -68,7 +68,6 @@ class Order extends Base return currency_format($this->total, $this->currency_code, $this->currency_value); } - /** * 新订单通知 */ @@ -82,7 +81,6 @@ class Order extends Base } } - /** * 订单状态更新通知 */ diff --git a/beike/Models/OrderHistory.php b/beike/Models/OrderHistory.php index c883cb6c..1fdb976f 100644 --- a/beike/Models/OrderHistory.php +++ b/beike/Models/OrderHistory.php @@ -14,7 +14,7 @@ namespace Beike\Models; class OrderHistory extends Base { protected $fillable = [ - 'order_id', 'status', 'notify', 'comment' + 'order_id', 'status', 'notify', 'comment', ]; protected $appends = ['status_format']; diff --git a/beike/Models/OrderProduct.php b/beike/Models/OrderProduct.php index 441a803b..3aa9a9db 100644 --- a/beike/Models/OrderProduct.php +++ b/beike/Models/OrderProduct.php @@ -35,5 +35,4 @@ class OrderProduct extends Base { return currency_format($this->price); } - } diff --git a/beike/Models/OrderShipment.php b/beike/Models/OrderShipment.php index 164e29ac..0c75cd04 100644 --- a/beike/Models/OrderShipment.php +++ b/beike/Models/OrderShipment.php @@ -11,10 +11,9 @@ namespace Beike\Models; - class OrderShipment extends Base { protected $fillable = [ - 'order_id', 'express_code', 'express_company', 'express_number' + 'order_id', 'express_code', 'express_company', 'express_number', ]; } diff --git a/beike/Models/OrderTotal.php b/beike/Models/OrderTotal.php index 8b856ae3..3288067a 100644 --- a/beike/Models/OrderTotal.php +++ b/beike/Models/OrderTotal.php @@ -14,7 +14,7 @@ namespace Beike\Models; class OrderTotal extends Base { protected $fillable = [ - 'order_id', 'code', 'value', 'title', 'reference' + 'order_id', 'code', 'value', 'title', 'reference', ]; protected $appends = ['value_format']; diff --git a/beike/Models/Page.php b/beike/Models/Page.php index aa365d09..9deb65e9 100644 --- a/beike/Models/Page.php +++ b/beike/Models/Page.php @@ -11,14 +11,13 @@ namespace Beike\Models; -use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\HasMany; - +use Illuminate\Database\Eloquent\Relations\HasOne; class Page extends Base { protected $fillable = [ - 'position', 'active' + 'position', 'active', ]; public function description(): HasOne diff --git a/beike/Models/PageDescription.php b/beike/Models/PageDescription.php index 8da230e5..d3ea0d1f 100644 --- a/beike/Models/PageDescription.php +++ b/beike/Models/PageDescription.php @@ -14,6 +14,6 @@ namespace Beike\Models; class PageDescription extends Base { protected $fillable = [ - 'page_id', 'locale', 'title', 'content', 'meta_title', 'meta_description', 'meta_keywords' + 'page_id', 'locale', 'title', 'content', 'meta_title', 'meta_description', 'meta_keywords', ]; } diff --git a/beike/Models/Plugin.php b/beike/Models/Plugin.php index f9030cb1..2c88d605 100644 --- a/beike/Models/Plugin.php +++ b/beike/Models/Plugin.php @@ -13,12 +13,12 @@ namespace Beike\Models; class Plugin extends Base { - const TYPES = [ + public const TYPES = [ 'shipping', // 配送方式 'payment', // 支付方式 'total', // 订单金额 'social', // 第三方登录 - 'view' // 其他UI更改 + 'view', // 其他UI更改 ]; protected $fillable = ['type', 'code']; diff --git a/beike/Models/Product.php b/beike/Models/Product.php index b1123e91..93b7f17a 100644 --- a/beike/Models/Product.php +++ b/beike/Models/Product.php @@ -2,9 +2,9 @@ namespace Beike\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Database\Eloquent\Factories\HasFactory; class Product extends Base { @@ -12,10 +12,11 @@ class Product extends Base use SoftDeletes; protected $fillable = ['images', 'video', 'position', 'brand_id', 'tax_class_id', 'active', 'variables']; + protected $casts = [ - 'active' => 'boolean', + 'active' => 'boolean', 'variables' => 'array', - 'images' => 'array', + 'images' => 'array', ]; protected $appends = ['image']; @@ -45,30 +46,31 @@ class Product extends Base return $this->hasMany(ProductSku::class); } - public function attributes() : HasMany + public function attributes(): HasMany { return $this->hasMany(ProductAttribute::class); } public function master_sku() { - return $this->hasOne(ProductSku::Class)->where('is_default', 1); + return $this->hasOne(ProductSku::class)->where('is_default', 1); } public function brand() { - return $this->belongsTo(Brand::Class, 'brand_id', 'id'); + return $this->belongsTo(Brand::class, 'brand_id', 'id'); } public function relations() { - return $this->belongsToMany(Product::class, ProductRelation::class, 'product_id', 'relation_id')->withTimestamps(); + return $this->belongsToMany(self::class, ProductRelation::class, 'product_id', 'relation_id')->withTimestamps(); } public function inCurrentWishlist() { - $customer = current_customer(); + $customer = current_customer(); $customerId = $customer ? $customer->id : 0; + return $this->hasOne(CustomerWishlist::class)->where('customer_id', $customerId); } @@ -80,6 +82,7 @@ class Product extends Base public function getImageAttribute() { $images = $this->images ?? []; + return $images[0] ?? ''; } } diff --git a/beike/Models/ProductAttribute.php b/beike/Models/ProductAttribute.php index 1d2b045d..9c7337ce 100644 --- a/beike/Models/ProductAttribute.php +++ b/beike/Models/ProductAttribute.php @@ -13,7 +13,6 @@ namespace Beike\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasMany; class ProductAttribute extends Base { @@ -21,14 +20,13 @@ class ProductAttribute extends Base protected $fillable = ['product_id', 'attribute_id', 'attribute_value_id']; - public function attribute() : BelongsTo + public function attribute(): BelongsTo { - return $this->belongsTo(Attribute::Class); + return $this->belongsTo(Attribute::class); } - public function attributeValue() : BelongsTo + public function attributeValue(): BelongsTo { - return $this->belongsTo(AttributeValue::Class); + return $this->belongsTo(AttributeValue::class); } } - diff --git a/beike/Models/ProductCategory.php b/beike/Models/ProductCategory.php index 86c98655..c5c4afef 100644 --- a/beike/Models/ProductCategory.php +++ b/beike/Models/ProductCategory.php @@ -14,11 +14,11 @@ namespace Beike\Models; class ProductCategory extends Base { protected $table = 'product_categories'; + protected $fillable = ['product_id', 'category_id']; public function product() { return $this->hasMany(Product::class); } - } diff --git a/beike/Models/ProductRelation.php b/beike/Models/ProductRelation.php index c81fa31f..a08e4118 100644 --- a/beike/Models/ProductRelation.php +++ b/beike/Models/ProductRelation.php @@ -14,11 +14,11 @@ namespace Beike\Models; class ProductRelation extends Base { protected $table = 'product_relations'; + protected $fillable = ['product_id', 'relation_id']; public function product() { return $this->hasMany(Product::class); } - } diff --git a/beike/Models/ProductSku.php b/beike/Models/ProductSku.php index abb65979..21f5be12 100644 --- a/beike/Models/ProductSku.php +++ b/beike/Models/ProductSku.php @@ -12,7 +12,7 @@ class ProductSku extends Base protected $casts = [ 'variants' => 'array', - 'images' => 'array', + 'images' => 'array', ]; protected $appends = ['image']; @@ -25,22 +25,24 @@ class ProductSku extends Base public function getImageAttribute() { $images = $this->images ?? []; + return $images[0] ?? ''; } public function getVariantLabel(): string { - $product = $this->product; - $localeCode = locale(); + $product = $this->product; + $localeCode = locale(); $variantLabel = ''; foreach ($product->variables as $index => $variable) { - $valueIndex = $this->variants[$index]; - $variantName = $variable['name'][$localeCode] ?? ''; + $valueIndex = $this->variants[$index]; + $variantName = $variable['name'][$localeCode] ?? ''; $variantValue = $variable['values'][$valueIndex]['name'][$localeCode] ?? ''; if ($variantName && $variantValue) { $variantLabel .= $variantName . ': ' . $variantValue . '; '; } } + return $variantLabel; } } diff --git a/beike/Models/Region.php b/beike/Models/Region.php index f451ff85..a8d07d64 100644 --- a/beike/Models/Region.php +++ b/beike/Models/Region.php @@ -11,8 +11,8 @@ namespace Beike\Models; -use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany; +use Illuminate\Database\Eloquent\Relations\HasMany; class Region extends Base { @@ -23,7 +23,6 @@ class Region extends Base return $this->belongsToMany(Zone::class, 'region_zones'); } - public function regionZones(): HasMany { return $this->hasMany(RegionZone::class); diff --git a/beike/Models/Rma.php b/beike/Models/Rma.php index 836ba789..0f996594 100644 --- a/beike/Models/Rma.php +++ b/beike/Models/Rma.php @@ -19,29 +19,29 @@ class Rma extends Base { use HasFactory; - protected $fillable = ['order_id','order_product_id','customer_id','name','email','telephone','product_name','sku','quantity','opened','rma_reason_id','type','status','comment']; + protected $fillable = ['order_id', 'order_product_id', 'customer_id', 'name', 'email', 'telephone', 'product_name', 'sku', 'quantity', 'opened', 'rma_reason_id', 'type', 'status', 'comment']; - public function order() :BelongsTo + public function order(): BelongsTo { - return $this->belongsTo(Order::Class); + return $this->belongsTo(Order::class); } - public function orderProduct() :BelongsTo + public function orderProduct(): BelongsTo { return $this->belongsTo(OrderProduct::class); } - public function customer() :BelongsTo + public function customer(): BelongsTo { return $this->belongsTo(Customer::class); } - public function reason() :BelongsTo + public function reason(): BelongsTo { return $this->belongsTo(RmaReason::class, 'rma_reason_id', 'id'); } - public function histories() :HasMany + public function histories(): HasMany { return $this->hasMany(RmaHistory::class); } diff --git a/beike/Models/RmaHistory.php b/beike/Models/RmaHistory.php index 11b5f9f6..1ac0e497 100644 --- a/beike/Models/RmaHistory.php +++ b/beike/Models/RmaHistory.php @@ -19,4 +19,3 @@ class RmaHistory extends Base protected $fillable = ['rma_id', 'status', 'notify', 'comment']; } - diff --git a/beike/Models/RmaReason.php b/beike/Models/RmaReason.php index 89be1e2f..6e18ce0a 100644 --- a/beike/Models/RmaReason.php +++ b/beike/Models/RmaReason.php @@ -17,6 +17,5 @@ class RmaReason extends Base { use HasFactory; - protected $fillable = ['locale','name']; + protected $fillable = ['locale', 'name']; } - diff --git a/beike/Models/Setting.php b/beike/Models/Setting.php index 8adefcf6..16ac8af2 100644 --- a/beike/Models/Setting.php +++ b/beike/Models/Setting.php @@ -8,8 +8,9 @@ class Setting extends Base { use HasFactory; - const TYPES = ['system', 'plugin']; + public const TYPES = ['system', 'plugin']; protected $table = 'settings'; + protected $fillable = ['type', 'space', 'name', 'value', 'json']; } diff --git a/beike/Models/VerifyCode.php b/beike/Models/VerifyCode.php index db9735f6..6bcc3ae0 100644 --- a/beike/Models/VerifyCode.php +++ b/beike/Models/VerifyCode.php @@ -21,4 +21,3 @@ class VerifyCode extends Base protected $fillable = ['account', 'code']; } - diff --git a/beike/Models/Zone.php b/beike/Models/Zone.php index 0ccd235f..c612867c 100644 --- a/beike/Models/Zone.php +++ b/beike/Models/Zone.php @@ -19,4 +19,3 @@ class Zone extends Base protected $fillable = ['country_id', 'name', 'code', 'sort_order', 'status']; } - diff --git a/beike/Notifications/AdminForgottenNotification.php b/beike/Notifications/AdminForgottenNotification.php index 8ae90dd5..c501052a 100644 --- a/beike/Notifications/AdminForgottenNotification.php +++ b/beike/Notifications/AdminForgottenNotification.php @@ -11,17 +11,18 @@ namespace Beike\Notifications; +use Beike\Mail\UserForgotten; use Beike\Models\AdminUser; use Illuminate\Bus\Queueable; -use Beike\Mail\UserForgotten; -use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Notifications\Notification; class AdminForgottenNotification extends Notification implements ShouldQueue { use Queueable; private AdminUser $user; + private string $code; /** @@ -78,7 +79,7 @@ class AdminForgottenNotification extends Notification implements ShouldQueue public function toDatabase() { return [ - 'user' => $this->user + 'user' => $this->user, ]; } } diff --git a/beike/Notifications/ForgottenNotification.php b/beike/Notifications/ForgottenNotification.php index 00f29d28..6ca9b376 100644 --- a/beike/Notifications/ForgottenNotification.php +++ b/beike/Notifications/ForgottenNotification.php @@ -11,17 +11,18 @@ namespace Beike\Notifications; +use Beike\Mail\CustomerForgotten; use Beike\Models\Customer; use Illuminate\Bus\Queueable; -use Beike\Mail\CustomerForgotten; -use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Notifications\Notification; class ForgottenNotification extends Notification implements ShouldQueue { use Queueable; private Customer $customer; + private string $code; /** @@ -32,7 +33,7 @@ class ForgottenNotification extends Notification implements ShouldQueue public function __construct(Customer $customer, string $code) { $this->customer = $customer; - $this->code = $code; + $this->code = $code; } /** @@ -78,7 +79,7 @@ class ForgottenNotification extends Notification implements ShouldQueue public function toDatabase() { return [ - 'customer' => $this->customer + 'customer' => $this->customer, ]; } } diff --git a/beike/Notifications/NewOrderNotification.php b/beike/Notifications/NewOrderNotification.php index 3357891b..77389ff5 100644 --- a/beike/Notifications/NewOrderNotification.php +++ b/beike/Notifications/NewOrderNotification.php @@ -11,11 +11,11 @@ namespace Beike\Notifications; +use Beike\Mail\CustomerNewOrder; use Beike\Models\Order; use Illuminate\Bus\Queueable; -use Beike\Mail\CustomerNewOrder; -use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Notifications\Notification; class NewOrderNotification extends Notification implements ShouldQueue { @@ -76,7 +76,7 @@ class NewOrderNotification extends Notification implements ShouldQueue public function toDatabase() { return [ - 'order' => $this->order + 'order' => $this->order, ]; } } diff --git a/beike/Notifications/RegistrationNotification.php b/beike/Notifications/RegistrationNotification.php index bebdb6e3..71e55037 100644 --- a/beike/Notifications/RegistrationNotification.php +++ b/beike/Notifications/RegistrationNotification.php @@ -11,11 +11,11 @@ namespace Beike\Notifications; +use Beike\Mail\CustomerRegistration; use Beike\Models\Customer; use Illuminate\Bus\Queueable; -use Beike\Mail\CustomerRegistration; -use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Notifications\Notification; class RegistrationNotification extends Notification implements ShouldQueue { @@ -76,7 +76,7 @@ class RegistrationNotification extends Notification implements ShouldQueue public function toDatabase() { return [ - 'customer' => $this->customer + 'customer' => $this->customer, ]; } } diff --git a/beike/Notifications/UpdateOrderNotification.php b/beike/Notifications/UpdateOrderNotification.php index 6702c0ee..6e143b36 100644 --- a/beike/Notifications/UpdateOrderNotification.php +++ b/beike/Notifications/UpdateOrderNotification.php @@ -11,17 +11,18 @@ namespace Beike\Notifications; +use Beike\Mail\CustomerUpdateOrder; use Beike\Models\Order; use Illuminate\Bus\Queueable; -use Beike\Mail\CustomerUpdateOrder; -use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Notifications\Notification; class UpdateOrderNotification extends Notification implements ShouldQueue { use Queueable; private Order $order; + private string $fromCode; /** @@ -31,7 +32,7 @@ class UpdateOrderNotification extends Notification implements ShouldQueue */ public function __construct(Order $order, $fromCode) { - $this->order = $order; + $this->order = $order; $this->fromCode = $fromCode; } @@ -78,7 +79,7 @@ class UpdateOrderNotification extends Notification implements ShouldQueue public function toDatabase() { return [ - 'order' => $this->order + 'order' => $this->order, ]; } } diff --git a/beike/Plugin/Manager.php b/beike/Plugin/Manager.php index 08ea964b..bee1f006 100644 --- a/beike/Plugin/Manager.php +++ b/beike/Plugin/Manager.php @@ -11,16 +11,17 @@ namespace Beike\Plugin; -use ZanySoft\Zip\Zip; -use Illuminate\Support\Arr; -use Illuminate\Http\UploadedFile; -use Illuminate\Support\Collection; -use Illuminate\Filesystem\Filesystem; use Illuminate\Contracts\Filesystem\FileNotFoundException; +use Illuminate\Filesystem\Filesystem; +use Illuminate\Http\UploadedFile; +use Illuminate\Support\Arr; +use Illuminate\Support\Collection; +use ZanySoft\Zip\Zip; class Manager { protected $plugins; + protected Filesystem $filesystem; public function __construct() @@ -44,8 +45,8 @@ class Manager $plugins = new Collection(); foreach ($existed as $dirname => $package) { $pluginPath = $this->getPluginsDir() . DIRECTORY_SEPARATOR . $dirname; - $plugin = new Plugin($pluginPath, $package); - $status = $plugin->getStatus(); + $plugin = new Plugin($pluginPath, $package); + $status = $plugin->getStatus(); $plugin->setDirname($dirname); $plugin->setName(Arr::get($package, 'name')); $plugin->setDescription(Arr::get($package, 'description')); @@ -68,7 +69,6 @@ class Manager return $this->plugins; } - /** * 获取已开启的插件 * @@ -78,6 +78,7 @@ class Manager public function getEnabledPlugins(): Collection { $allPlugins = $this->getPlugins(); + return $allPlugins->filter(function (Plugin $plugin) { return $plugin->getInstalled() && $plugin->getEnabled(); }); @@ -97,7 +98,7 @@ class Manager if ($this->filesystem->exists($file = $plugin->getBootFile())) { $bootstraps->push([ 'code' => $plugin->getDirName(), - 'file' => $file + 'file' => $file, ]); } } @@ -113,6 +114,7 @@ class Manager public function getPlugin($code): ?Plugin { $plugins = $this->getPlugins(); + return $plugins[$code] ?? null; } @@ -128,6 +130,7 @@ class Manager throw new \Exception('无效的插件'); } $plugin->handleLabel(); + return $plugin; } @@ -140,7 +143,7 @@ class Manager protected function getPluginsConfig(): array { $installed = []; - $resource = opendir($this->getPluginsDir()); + $resource = opendir($this->getPluginsDir()); while ($filename = @readdir($resource)) { if ($filename == '.' || $filename == '..') { continue; @@ -154,6 +157,7 @@ class Manager } } closedir($resource); + return $installed; } @@ -167,7 +171,6 @@ class Manager return config('plugins.directory') ?: base_path('plugins'); } - /** * 上传插件并解压 * @throws \Exception @@ -175,8 +178,8 @@ class Manager public function import(UploadedFile $file) { $originalName = $file->getClientOriginalName(); - $destPath = storage_path('upload'); - $newFilePath = $destPath . '/' . $originalName; + $destPath = storage_path('upload'); + $newFilePath = $destPath . '/' . $originalName; $file->move($destPath, $originalName); $zipFile = Zip::open($newFilePath); diff --git a/beike/Plugin/Plugin.php b/beike/Plugin/Plugin.php index 9b992a60..5d0d6d0f 100644 --- a/beike/Plugin/Plugin.php +++ b/beike/Plugin/Plugin.php @@ -11,29 +11,36 @@ namespace Beike\Plugin; -use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Str; use Beike\Repositories\PluginRepo; use Beike\Repositories\SettingRepo; use Illuminate\Contracts\Support\Arrayable; +use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Validator; +use Illuminate\Support\Str; class Plugin implements Arrayable, \ArrayAccess { protected $path; - protected $name; - protected $description; - protected $packageInfo; - protected $dirName; - protected $installed; - protected $enabled; - protected $version; - protected $columns; + protected $name; + + protected $description; + + protected $packageInfo; + + protected $dirName; + + protected $installed; + + protected $enabled; + + protected $version; + + protected $columns; public function __construct(string $path, array $packageInfo) { - $this->path = $path; + $this->path = $path; $this->packageInfo = $packageInfo; } @@ -52,55 +59,59 @@ class Plugin implements Arrayable, \ArrayAccess return Arr::get($this->packageInfo, $name); } - - public function setDirname(string $dirName): Plugin + public function setDirname(string $dirName): self { $this->dirName = $dirName; + return $this; } - public function setName(string $name): Plugin + public function setName(string $name): self { $this->name = $name; + return $this; } - public function setDescription(string $description): Plugin + public function setDescription(string $description): self { $this->description = $description; + return $this; } - - public function setInstalled(bool $installed): Plugin + public function setInstalled(bool $installed): self { $this->installed = $installed; + return $this; } - public function setEnabled(bool $enabled): Plugin + public function setEnabled(bool $enabled): self { $this->enabled = $enabled; + return $this; } - public function setVersion(string $version): Plugin + public function setVersion(string $version): self { $this->version = $version; + return $this; } - public function setColumns(): Plugin + public function setColumns(): self { $columnsPath = $this->path . DIRECTORY_SEPARATOR . 'columns.php'; - if (!file_exists($columnsPath)) { + if (! file_exists($columnsPath)) { return $this; } $this->columns = require_once $columnsPath; + return $this; } - /** * 处理插件后台设置字段多语言 优先级: label > label_key * 有label字段则直接返回, label_key 则翻译 @@ -114,6 +125,7 @@ class Plugin implements Arrayable, \ArrayAccess return $this->transLabel($option); })->toArray(); } + return $item; })->toArray(); } @@ -126,15 +138,15 @@ class Plugin implements Arrayable, \ArrayAccess private function transLabel($item) { $labelKey = $item['label_key'] ?? ''; - $label = $item['label'] ?? ''; + $label = $item['label'] ?? ''; if (empty($label) && $labelKey) { - $languageKey = "{$this->dirName}::{$labelKey}"; + $languageKey = "{$this->dirName}::{$labelKey}"; $item['label'] = trans($languageKey); } + return $item; } - public function getName(): string { return $this->name; @@ -185,10 +197,10 @@ class Plugin implements Arrayable, \ArrayAccess if ($name) { return plugin_setting("{$this->code}.{$name}"); } + return plugin_setting($this->code); } - /** * 获取插件对应的设置字段, 并获取已存储在DB的字段值 * @@ -197,19 +209,19 @@ class Plugin implements Arrayable, \ArrayAccess public function getColumns(): array { $this->columns[] = SettingRepo::getPluginStatusColumn(); - $existValues = SettingRepo::getPluginColumns($this->code); + $existValues = SettingRepo::getPluginColumns($this->code); foreach ($this->columns as $index => $column) { $dbColumn = $existValues[$column['name']] ?? null; - $value = $dbColumn ? $dbColumn->value : null; + $value = $dbColumn ? $dbColumn->value : null; if ($column['name'] == 'status') { - $value = (int)$value; + $value = (int) $value; } $this->columns[$index]['value'] = $value; } + return $this->columns; } - /** * 字段验证 * @param $requestData @@ -218,6 +230,7 @@ class Plugin implements Arrayable, \ArrayAccess public function validate($requestData): \Illuminate\Contracts\Validation\Validator { $rules = array_column($this->columns, 'rules', 'name'); + return Validator::make($requestData, $rules); } @@ -231,6 +244,7 @@ class Plugin implements Arrayable, \ArrayAccess if (file_exists($viewFile)) { return "{$this->dirName}::admin.config"; } + return ''; } @@ -244,13 +258,12 @@ class Plugin implements Arrayable, \ArrayAccess return $this->getPath() . '/Bootstrap.php'; } - public function toArray(): array { - return (array)array_merge([ - 'name' => $this->name, + return (array) array_merge([ + 'name' => $this->name, 'version' => $this->getVersion(), - 'path' => $this->path + 'path' => $this->path, ], $this->packageInfo); } diff --git a/beike/Repositories/AddressRepo.php b/beike/Repositories/AddressRepo.php index ef1f5cc0..acff7702 100644 --- a/beike/Repositories/AddressRepo.php +++ b/beike/Repositories/AddressRepo.php @@ -33,13 +33,14 @@ class AddressRepo */ public static function update($address, $data) { - if (!$address instanceof Address) { + if (! $address instanceof Address) { $address = Address::query()->find($address); } - if (!$address) { + if (! $address) { throw new \Exception("地址id {$address} 不存在"); } $address->update($data); + return $address; } @@ -64,7 +65,6 @@ class AddressRepo } } - /** * 获取某个客户地址列表 * @@ -78,8 +78,9 @@ class AddressRepo } if ($customer) { return $customer->addresses()->with('country')->get(); - } else { - return collect(); } + + return collect(); + } } diff --git a/beike/Repositories/BrandRepo.php b/beike/Repositories/BrandRepo.php index 8d7a8850..241c229f 100644 --- a/beike/Repositories/BrandRepo.php +++ b/beike/Repositories/BrandRepo.php @@ -17,7 +17,6 @@ use Exception; use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Database\Eloquent\HigherOrderBuilderProxy; use Illuminate\Database\Eloquent\Model; class BrandRepo @@ -32,12 +31,13 @@ class BrandRepo public static function create($data) { $brandData = [ - 'name' => $data['name'] ?? '', - 'first' => $data['first'] ?? '', - 'logo' => $data['logo'] ?? '', - 'sort_order' => (int)($data['sort_order'] ?? 0), - 'status' => (bool)($data['status'] ?? 1), + 'name' => $data['name'] ?? '', + 'first' => $data['first'] ?? '', + 'logo' => $data['logo'] ?? '', + 'sort_order' => (int) ($data['sort_order'] ?? 0), + 'status' => (bool) ($data['status'] ?? 1), ]; + return Brand::query()->create($brandData); } @@ -49,21 +49,22 @@ class BrandRepo */ public static function update($brand, $data) { - if (!$brand instanceof Brand) { + if (! $brand instanceof Brand) { $brand = Brand::query()->find($brand); } - if (!$brand) { + if (! $brand) { throw new Exception("品牌id $brand 不存在"); } $brandData = [ - 'name' => $data['name'] ?? '', - 'first' => $data['first'] ?? '', - 'logo' => $data['logo'] ?? '', - 'sort_order' => (int)($data['sort_order'] ?? 0), - 'status' => (bool)($data['status'] ?? 1), + 'name' => $data['name'] ?? '', + 'first' => $data['first'] ?? '', + 'logo' => $data['logo'] ?? '', + 'sort_order' => (int) ($data['sort_order'] ?? 0), + 'status' => (bool) ($data['status'] ?? 1), ]; $brand->update($brandData); + return $brand; } @@ -95,10 +96,10 @@ class BrandRepo public static function list($filters): LengthAwarePaginator { $builder = self::getBuilder($filters); + return $builder->paginate(perPage())->withQueryString(); } - /** * 获取商品品牌筛选builder * @param array $filters @@ -117,10 +118,10 @@ class BrandRepo $builder->where('status', $filters['status']); } $builder->orderByDesc('created_at'); + return $builder; } - public static function listGroupByFirst(): array { $brands = Brand::query()->where('status', true)->get(); @@ -130,6 +131,7 @@ class BrandRepo $results[$brand->first][] = (new BrandDetail($brand))->jsonSerialize(); } ksort($results); + return $results; } @@ -145,7 +147,6 @@ class BrandRepo return $builder->limit(10)->get(); } - /** * @param $ids * @return array @@ -153,10 +154,11 @@ class BrandRepo public static function getNames($ids): array { $brands = self::getListByIds($ids); + return $brands->map(function ($brand) { return [ - 'id' => $brand->id, - 'name' => $brand->name ?? '' + 'id' => $brand->id, + 'name' => $brand->name ?? '', ]; })->toArray(); } @@ -170,12 +172,12 @@ class BrandRepo if (empty($ids)) { return []; } + return Brand::query() ->whereIn('id', $ids) ->get(); } - /** * 通过品牌ID获取品牌名称 * @param $brand @@ -183,12 +185,12 @@ class BrandRepo */ public static function getName($brand) { - $id = is_int($brand) ? $brand : $brand->id; + $id = is_int($brand) ? $brand : $brand->id; $categories = self::getAllBrandsWithName(); + return $categories[$id]['name'] ?? ''; } - /** * 获取所有商品分类ID和名称列表 * @return array|null @@ -199,14 +201,15 @@ class BrandRepo return self::$allBrandsWithName; } - $items = []; + $items = []; $brands = self::getBuilder()->select(['id', 'name'])->get(); foreach ($brands as $brand) { $items[$brand->id] = [ - 'id' => $brand->id, + 'id' => $brand->id, 'name' => $brand->name ?? '', ]; } + return self::$allBrandsWithName = $items; } } diff --git a/beike/Repositories/CartRepo.php b/beike/Repositories/CartRepo.php index 0d4eb857..907311e0 100644 --- a/beike/Repositories/CartRepo.php +++ b/beike/Repositories/CartRepo.php @@ -12,9 +12,8 @@ namespace Beike\Repositories; use Beike\Models\Cart; -use Beike\Models\Customer; use Beike\Models\CartProduct; -use Illuminate\Database\Eloquent\Model; +use Beike\Models\Customer; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; @@ -32,26 +31,26 @@ class CartRepo $customer = Customer::query()->find($customer); } $customerId = $customer->id ?? 0; - $sessionId = session()->getId(); + $sessionId = session()->getId(); if ($customerId) { $cart = Cart::query()->where('customer_id', $customerId)->first(); } else { $cart = Cart::query()->where('session_id', $sessionId)->first(); } - $defaultAddress = AddressRepo::listByCustomer($customer)->first(); + $defaultAddress = AddressRepo::listByCustomer($customer)->first(); $defaultAddressId = $defaultAddress->id ?? 0; if (empty($cart)) { - $shippingMethod = PluginRepo::getShippingMethods()->first(); - $paymentMethod = PluginRepo::getPaymentMethods()->first(); + $shippingMethod = PluginRepo::getShippingMethods()->first(); + $paymentMethod = PluginRepo::getPaymentMethods()->first(); $shippingMethodCode = $shippingMethod->code ?? ''; - $cart = Cart::query()->create([ - 'customer_id' => $customerId, - 'session_id' => $sessionId, - 'shipping_address_id' => $defaultAddressId, + $cart = Cart::query()->create([ + 'customer_id' => $customerId, + 'session_id' => $sessionId, + 'shipping_address_id' => $defaultAddressId, 'shipping_method_code' => $shippingMethodCode ? $shippingMethodCode . '.0' : '', - 'payment_address_id' => $defaultAddressId, - 'payment_method_code' => $paymentMethod->code ?? '' + 'payment_address_id' => $defaultAddressId, + 'payment_method_code' => $paymentMethod->code ?? '', ]); } else { if ($cart->shipping_address_id == 0 || empty(AddressRepo::find($cart->shipping_address_id))) { @@ -63,13 +62,13 @@ class CartRepo $cart->save(); } $cart->loadMissing(['shippingAddress', 'paymentAddress']); - $cart->extra = json_decode($cart->extra, true); + $cart->extra = json_decode($cart->extra, true); $cart->guest_shipping_address = json_decode($cart->guest_shipping_address, true); - $cart->guest_payment_address = json_decode($cart->guest_payment_address, true); + $cart->guest_payment_address = json_decode($cart->guest_payment_address, true); + return $cart; } - /** * 清空购物车以及购物车已选中商品 * @@ -89,7 +88,6 @@ class CartRepo self::selectedCartProductsBuilder($customerId)->delete(); } - /** * 获取已选中购物车商品列表 * @@ -101,7 +99,6 @@ class CartRepo return self::selectedCartProductsBuilder($customerId)->get(); } - /** * 已选中购物车商品 builder * @@ -113,7 +110,6 @@ class CartRepo return self::allCartProductsBuilder($customerId)->where('selected', true); } - /** * 获取所有购物车商品列表 * @@ -125,7 +121,6 @@ class CartRepo return self::allCartProductsBuilder($customerId)->get(); } - /** * 当前购物车所有商品 builder * diff --git a/beike/Repositories/CategoryRepo.php b/beike/Repositories/CategoryRepo.php index c54e7a6d..b2dc85e0 100644 --- a/beike/Repositories/CategoryRepo.php +++ b/beike/Repositories/CategoryRepo.php @@ -12,16 +12,15 @@ namespace Beike\Repositories; use Beike\Models\Category; -use Illuminate\Support\Facades\DB; -use Illuminate\Database\Eloquent\Builder; use Beike\Shop\Http\Resources\CategoryDetail; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Support\Facades\DB; class CategoryRepo { private static $allCategoryWithName = null; - /** * 后台获取分类列表 * @return Builder[]|Collection @@ -29,12 +28,12 @@ class CategoryRepo public static function getAdminList() { self::cleanCategories(); + return Category::with(['description', 'children.description', 'children.children.description']) ->where('parent_id', 0) ->get(); } - /** * 清理分类数据 */ @@ -56,15 +55,15 @@ class CategoryRepo } } - public static function flatten(string $locale, $separator = ' > '): array { $sql = "SELECT cp.category_id AS id, TRIM(LOWER(GROUP_CONCAT(cd1.name ORDER BY cp.level SEPARATOR '{$separator}'))) AS name, c1.parent_id, c1.position"; - $sql .= " FROM category_paths cp"; - $sql .= " LEFT JOIN categories c1 ON (cp.category_id = c1.id)"; - $sql .= " LEFT JOIN categories c2 ON (cp.path_id = c2.id)"; - $sql .= " LEFT JOIN category_descriptions cd1 ON (cp.path_id = cd1.category_id)"; + $sql .= ' FROM category_paths cp'; + $sql .= ' LEFT JOIN categories c1 ON (cp.category_id = c1.id)'; + $sql .= ' LEFT JOIN categories c2 ON (cp.path_id = c2.id)'; + $sql .= ' LEFT JOIN category_descriptions cd1 ON (cp.path_id = cd1.category_id)'; $sql .= " WHERE cd1.locale = '" . $locale . "' GROUP BY cp.category_id ORDER BY name ASC"; + return DB::select($sql); } @@ -83,10 +82,10 @@ class CategoryRepo ->get(); $categoryList = CategoryDetail::collection($topCategories); + return json_decode($categoryList->toJson(), true); } - /** * 获取商品分类列表 * @@ -96,10 +95,10 @@ class CategoryRepo public static function list(array $filters = []) { $builder = self::getBuilder($filters); + return $builder->get(); } - /** * 获取筛选builder * @@ -115,10 +114,10 @@ class CategoryRepo return $query->where('name', 'like', "%$keyword%"); }); } + return $builder; } - /** * 自动完成 * @@ -145,20 +144,21 @@ class CategoryRepo } if (empty($path->pathCategory)) { $path->delete(); + continue; } $pathName .= $path->pathCategory->description->name; } $results[] = [ - 'id' => $category->id, + 'id' => $category->id, 'status' => $category->active, - 'name' => $pathName, + 'name' => $pathName, ]; } + return $results; } - /** * 删除商品分类 * @throws \Exception @@ -167,7 +167,7 @@ class CategoryRepo { if (is_int($category)) { $category = Category::query()->findOrFail($category); - } elseif (!($category instanceof Category)) { + } elseif (! ($category instanceof Category)) { throw new \Exception('invalid category'); } $category->descriptions()->delete(); @@ -176,7 +176,6 @@ class CategoryRepo $category->delete(); } - /** * 通过分类ID获取商品名称 * @param $category @@ -184,12 +183,12 @@ class CategoryRepo */ public static function getName($category) { - $id = is_int($category) ? $category : $category->id; + $id = is_int($category) ? $category : $category->id; $categories = self::getAllCategoriesWithName(); + return $categories[$id]['name'] ?? ''; } - /** * 获取所有商品分类ID和名称列表 * @return array|null @@ -200,15 +199,15 @@ class CategoryRepo return self::$allCategoryWithName; } - $items = []; + $items = []; $categories = self::getBuilder()->select('id')->get(); foreach ($categories as $category) { $items[$category->id] = [ - 'id' => $category->id, + 'id' => $category->id, 'name' => $category->description->name ?? '', ]; } + return self::$allCategoryWithName = $items; } } - diff --git a/beike/Repositories/CountryRepo.php b/beike/Repositories/CountryRepo.php index 9b543d54..c03e33b6 100644 --- a/beike/Repositories/CountryRepo.php +++ b/beike/Repositories/CountryRepo.php @@ -25,10 +25,10 @@ class CountryRepo private static function handleParams($data) { return [ - 'name' => $data['name'] ?? '', - 'code' => $data['code'] ?? '', - 'sort_order' => (int)$data['sort_order'] ?? 0, - 'status' => (bool)$data['status'] ?? 0, + 'name' => $data['name'] ?? '', + 'code' => $data['code'] ?? '', + 'sort_order' => (int) $data['sort_order'] ?? 0, + 'status' => (bool) $data['status'] ?? 0, ]; } @@ -40,6 +40,7 @@ class CountryRepo public static function create($data) { $data = self::handleParams($data); + return Country::query()->create($data); } @@ -51,12 +52,13 @@ class CountryRepo */ public static function update($id, $data) { - $data = self::handleParams($data); + $data = self::handleParams($data); $country = Country::query()->find($id); - if (!$country) { + if (! $country) { throw new \Exception("国家id {$id} 不存在"); } $country->update($data); + return $country; } @@ -102,7 +104,6 @@ class CountryRepo return $builder->paginate(perPage())->withQueryString(); } - /** * 获取已启用国家列表 * @return Builder[]|Collection @@ -112,7 +113,6 @@ class CountryRepo return Country::query()->where('status', true)->select('id', 'name')->get(); } - /** * 获取所有国家列表 * @return Builder[]|Collection diff --git a/beike/Repositories/CurrencyRepo.php b/beike/Repositories/CurrencyRepo.php index 0d9303bf..b4f96919 100644 --- a/beike/Repositories/CurrencyRepo.php +++ b/beike/Repositories/CurrencyRepo.php @@ -38,10 +38,11 @@ class CurrencyRepo public static function update($id, $data) { $item = Currency::query()->find($id); - if (!$item) { + if (! $item) { throw new \Exception("货币id {$id} 不存在"); } $item->update($data); + return $item; } @@ -66,7 +67,6 @@ class CurrencyRepo } } - /** * 获取所有货币列表 * @@ -77,7 +77,6 @@ class CurrencyRepo return Currency::query()->get(); } - /** * 查找所有已开启货币 * @@ -88,10 +87,10 @@ class CurrencyRepo if (self::$enabledCurrencies !== null) { return self::$enabledCurrencies; } + return self::$enabledCurrencies = Currency::query()->where('status', true)->get(); } - /** * 根据code查找货币 * @return Builder[]|Collection diff --git a/beike/Repositories/CustomerGroupRepo.php b/beike/Repositories/CustomerGroupRepo.php index c77152ca..7a3143e0 100644 --- a/beike/Repositories/CustomerGroupRepo.php +++ b/beike/Repositories/CustomerGroupRepo.php @@ -12,9 +12,9 @@ namespace Beike\Repositories; use Beike\Models\CustomerGroup; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Model; use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; class CustomerGroupRepo @@ -29,7 +29,6 @@ class CustomerGroupRepo return CustomerGroup::query()->create($data); } - /** * @param $id * @param $data @@ -39,14 +38,14 @@ class CustomerGroupRepo public static function update($id, $data): Model|Collection|Builder|array { $group = CustomerGroup::query()->find($id); - if (!$group) { + if (! $group) { throw new \Exception("Customer Group id {$id} 不存在"); } $group->update($data); + return $group; } - /** * @param $id * @return Builder|Builder[]|Collection|Model|null @@ -56,7 +55,6 @@ class CustomerGroupRepo return CustomerGroup::query()->findOrFail($id); } - /** * @param $id * @return mixed @@ -73,7 +71,6 @@ class CustomerGroupRepo } } - /** * 获取用户组列表 * @@ -82,6 +79,7 @@ class CustomerGroupRepo public static function list(): Collection|array { $builder = CustomerGroup::query()->with('description', 'descriptions'); + return $builder->get(); } } diff --git a/beike/Repositories/CustomerRepo.php b/beike/Repositories/CustomerRepo.php index 8e4ea868..0c74d1d4 100644 --- a/beike/Repositories/CustomerRepo.php +++ b/beike/Repositories/CustomerRepo.php @@ -29,8 +29,9 @@ class CustomerRepo */ public static function create($customerData): Customer { - $customerData['email'] = $customerData['email'] ?? ''; + $customerData['email'] = $customerData['email'] ?? ''; $customerData['password'] = Hash::make($customerData['password'] ?? ''); + return Customer::query()->create($customerData); } @@ -41,12 +42,13 @@ class CustomerRepo */ public static function update($customer, $data) { - if (!$customer instanceof Customer) { + if (! $customer instanceof Customer) { $customer = Customer::query()->findOrFail($customer); } if (isset($data['password'])) { $data['password'] = Hash::make($data['password']); } + return $customer->update($data); } @@ -81,10 +83,10 @@ class CustomerRepo public static function list($data): LengthAwarePaginator { $builder = self::getListBuilder($data); + return $builder->paginate(perPage())->withQueryString(); } - /** * 获取筛选对象 * @@ -93,7 +95,7 @@ class CustomerRepo */ public static function getListBuilder(array $filters = []): Builder { - $builder = Customer::query()->with("customerGroup.description"); + $builder = Customer::query()->with('customerGroup.description'); if (isset($filters['name'])) { $builder->where('customers.name', 'like', "%{$filters['name']}%"); @@ -102,7 +104,7 @@ class CustomerRepo $builder->where('customers.email', 'like', "%{$filters['email']}%"); } if (isset($filters['status'])) { - $builder->where('customers.status', (int)$filters['status']); + $builder->where('customers.status', (int) $filters['status']); } if (isset($filters['from'])) { $builder->where('customers.from', $filters['from']); @@ -151,11 +153,11 @@ class CustomerRepo */ public static function addToWishlist($customer, $productId) { - if (!$customer instanceof Customer) { + if (! $customer instanceof Customer) { $customer = Customer::query()->findOrFail($customer); } - if (!$customer->wishlists()->where('product_id', $productId)->first()) { + if (! $customer->wishlists()->where('product_id', $productId)->first()) { $wishlist = $customer->wishlists()->save(new CustomerWishlist(['product_id' => $productId])); } @@ -169,7 +171,7 @@ class CustomerRepo */ public static function removeFromWishlist($customer, $id) { - if (!$customer instanceof Customer) { + if (! $customer instanceof Customer) { $customer = Customer::query()->findOrFail($customer); } $customer->wishlists()->where('id', $id)->delete(); @@ -179,7 +181,7 @@ class CustomerRepo public static function wishlists($customer): LengthAwarePaginator { - if (!$customer instanceof Customer) { + if (! $customer instanceof Customer) { $customer = Customer::query()->findOrFail($customer); } $builder = $customer->wishlists() @@ -195,16 +197,16 @@ class CustomerRepo */ public static function inWishlist($product, $customer) { - if (!$customer) { + if (! $customer) { return false; } if ($product instanceof Product) { $product = $product->id; } - if (!$customer instanceof Customer) { + if (! $customer instanceof Customer) { $customer = Customer::query()->findOrFail($customer); } + return $customer->wishlists()->where('product_id', $product)->count(); } } - diff --git a/beike/Repositories/FooterRepo.php b/beike/Repositories/FooterRepo.php index 77aa1d6b..b530edc5 100644 --- a/beike/Repositories/FooterRepo.php +++ b/beike/Repositories/FooterRepo.php @@ -11,8 +11,6 @@ namespace Beike\Repositories; -use Beike\Models\Page; - class FooterRepo { /** @@ -26,7 +24,7 @@ class FooterRepo $footerSetting = system_setting('base.footer_setting'); } - $content = $footerSetting['content']; + $content = $footerSetting['content']; $contentLinkKeys = ['link1', 'link2', 'link3']; foreach ($contentLinkKeys as $contentLinkKey) { $links = $content[$contentLinkKey]['links']; @@ -35,6 +33,7 @@ class FooterRepo })->toArray(); $footerSetting['content'][$contentLinkKey]['links'] = $links; } + return $footerSetting; } } diff --git a/beike/Repositories/LanguageRepo.php b/beike/Repositories/LanguageRepo.php index f7fac03b..e907fb30 100644 --- a/beike/Repositories/LanguageRepo.php +++ b/beike/Repositories/LanguageRepo.php @@ -12,9 +12,9 @@ namespace Beike\Repositories; use Beike\Models\Language; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Model; class LanguageRepo { @@ -26,13 +26,14 @@ class LanguageRepo public static function create($data) { $languageData = [ - 'name' => $data['name'] ?? '', - 'code' => $data['code'] ?? '', - 'locale' => $data['locale'] ?? '', - 'image' => $data['image'] ?? '', - 'sort_order' => (int)($data['sort_order'] ?? 0), - 'status' => (bool)($data['status'] ?? 1), + 'name' => $data['name'] ?? '', + 'code' => $data['code'] ?? '', + 'locale' => $data['locale'] ?? '', + 'image' => $data['image'] ?? '', + 'sort_order' => (int) ($data['sort_order'] ?? 0), + 'status' => (bool) ($data['status'] ?? 1), ]; + return Language::query()->create($languageData); } @@ -45,18 +46,19 @@ class LanguageRepo public static function update($id, $data) { $item = Language::query()->find($id); - if (!$item) { + if (! $item) { throw new \Exception("语言id {$id} 不存在"); } $languageData = [ - 'name' => $data['name'] ?? '', - 'code' => $data['code'] ?? '', - 'locale' => $data['locale'] ?? '', - 'image' => $data['image'] ?? '', - 'sort_order' => (int)($data['sort_order'] ?? 0), - 'status' => (bool)($data['status'] ?? 1), + 'name' => $data['name'] ?? '', + 'code' => $data['code'] ?? '', + 'locale' => $data['locale'] ?? '', + 'image' => $data['image'] ?? '', + 'sort_order' => (int) ($data['sort_order'] ?? 0), + 'status' => (bool) ($data['status'] ?? 1), ]; $item->update($languageData); + return $item; } diff --git a/beike/Repositories/MenuRepo.php b/beike/Repositories/MenuRepo.php index bae54655..c0e8755c 100644 --- a/beike/Repositories/MenuRepo.php +++ b/beike/Repositories/MenuRepo.php @@ -27,13 +27,13 @@ class MenuRepo } $locale = locale(); - $menus = $menuSetting['menus']; + $menus = $menuSetting['menus']; foreach ($menus as $index => $menu) { - $menu['new_window'] = $menu['link']['new_window'] ?? false; - $menu['link'] = handle_link($menu['link'])['link'] ?? ''; - $menu['name'] = $menu['name'][$locale] ?? ''; - $menu['badge']['name'] = $menu['badge']['name'][$locale] ?? ''; + $menu['new_window'] = $menu['link']['new_window'] ?? false; + $menu['link'] = handle_link($menu['link'])['link'] ?? ''; + $menu['name'] = $menu['name'][$locale] ?? ''; + $menu['badge']['name'] = $menu['badge']['name'][$locale] ?? ''; if ($menu['childrenGroup']) { $menu['children_group'] = self::handleChildrenGroup($menu['childrenGroup']); @@ -44,7 +44,6 @@ class MenuRepo return $menus; } - /** * 处理头部 menu 子菜单数据 * @@ -59,15 +58,16 @@ class MenuRepo $childrenGroup['name'] = $childrenGroup['name'][$locale] ?? ''; if ($childrenGroup['type'] == 'image') { $childrenGroup['image']['image'] = image_origin($childrenGroup['image']['image'][$locale] ?? ''); - $childrenGroup['image']['link'] = type_route($childrenGroup['image']['link']['type'], $childrenGroup['image']['link']['value']); + $childrenGroup['image']['link'] = type_route($childrenGroup['image']['link']['type'], $childrenGroup['image']['link']['value']); } elseif ($childrenGroup['children']) { foreach ($childrenGroup['children'] as $childrenIndex => $children) { - $children['link'] = handle_link($children['link']); + $children['link'] = handle_link($children['link']); $childrenGroup['children'][$childrenIndex] = $children; } } $childrenGroups[$groupIndex] = $childrenGroup; } + return $childrenGroups; } } diff --git a/beike/Repositories/OrderHistoryRepo.php b/beike/Repositories/OrderHistoryRepo.php index fc5f71c1..730df2f3 100644 --- a/beike/Repositories/OrderHistoryRepo.php +++ b/beike/Repositories/OrderHistoryRepo.php @@ -13,5 +13,4 @@ namespace Beike\Repositories; class OrderHistoryRepo { - } diff --git a/beike/Repositories/OrderProductRepo.php b/beike/Repositories/OrderProductRepo.php index c24cb297..5360c587 100644 --- a/beike/Repositories/OrderProductRepo.php +++ b/beike/Repositories/OrderProductRepo.php @@ -13,9 +13,9 @@ namespace Beike\Repositories; use Beike\Models\Order; use Beike\Models\OrderProduct; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Model; class OrderProductRepo { @@ -29,25 +29,24 @@ class OrderProductRepo { $orderProducts = []; foreach ($cartProducts as $cartProduct) { - $productName = $cartProduct['name']; + $productName = $cartProduct['name']; $variantLabels = $cartProduct['variant_labels'] ?? ''; if ($variantLabels) { $productName .= " - {$variantLabels}"; } $orderProducts[] = [ - 'product_id' => $cartProduct['product_id'], + 'product_id' => $cartProduct['product_id'], 'order_number' => $order->number, - 'product_sku' => $cartProduct['product_sku'], - 'name' => $productName, - 'image' => $cartProduct['image'], - 'quantity' => $cartProduct['quantity'], - 'price' => $cartProduct['price'], + 'product_sku' => $cartProduct['product_sku'], + 'name' => $productName, + 'image' => $cartProduct['image'], + 'quantity' => $cartProduct['quantity'], + 'price' => $cartProduct['price'], ]; } $order->orderProducts()->createMany($orderProducts); } - /** * 查找单条商品明细数据 * diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index dedc7654..def7097c 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -11,14 +11,14 @@ namespace Beike\Repositories; -use Carbon\Carbon; -use Beike\Models\Order; use Beike\Models\Address; +use Beike\Models\Order; use Beike\Services\StateMachineService; -use Illuminate\Database\Eloquent\Model; +use Carbon\Carbon; +use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; +use Illuminate\Database\Eloquent\Model; class OrderRepo { @@ -31,10 +31,10 @@ class OrderRepo public static function filterAll(array $filters = []) { $builder = self::getListBuilder($filters)->orderByDesc('created_at'); + return $builder->get(); } - /** * 获取特定客户订单列表 * @@ -44,10 +44,10 @@ class OrderRepo public static function getListByCustomer($customer): LengthAwarePaginator { $builder = self::getListBuilder(['customer' => $customer])->orderByDesc('created_at'); + return $builder->paginate(perPage()); } - /** * @param $customer * @param $limit @@ -61,7 +61,6 @@ class OrderRepo ->get(); } - /** * @param array $filters * @return LengthAwarePaginator @@ -69,10 +68,10 @@ class OrderRepo public static function filterOrders(array $filters = []): LengthAwarePaginator { $builder = self::getListBuilder($filters)->orderByDesc('created_at'); + return $builder->paginate(perPage()); } - /** * @param array $filters * @return Builder @@ -121,7 +120,6 @@ class OrderRepo $builder->where('status', $status); } - return $builder; } @@ -140,11 +138,10 @@ class OrderRepo if ($customer) { $builder->where('customer_id', $customer->id); } - ; + return $builder->first(); } - /** * 通过订单ID或者订单号获取订单 * @@ -161,10 +158,10 @@ class OrderRepo }) ->where('customer_id', $customer->id) ->first(); + return $order; } - /** * @param array $data * @return Order @@ -172,73 +169,73 @@ class OrderRepo */ public static function create(array $data): Order { - $customer = $data['customer'] ?? null; - $current = $data['current'] ?? []; - $carts = $data['carts'] ?? []; - $totals = $data['totals'] ?? []; + $customer = $data['customer'] ?? null; + $current = $data['current'] ?? []; + $carts = $data['carts'] ?? []; + $totals = $data['totals'] ?? []; $orderTotal = collect($totals)->where('code', 'order_total')->first(); if (current_customer()) { $shippingAddressId = $current['shipping_address_id'] ?? 0; - $paymentAddressId = $current['payment_address_id'] ?? 0; + $paymentAddressId = $current['payment_address_id'] ?? 0; $shippingAddress = Address::query()->findOrFail($shippingAddressId); - $paymentAddress = Address::query()->findOrFail($paymentAddressId); + $paymentAddress = Address::query()->findOrFail($paymentAddressId); } else { - $shippingAddress = (Object)($current['guest_shipping_address'] ?? []); - $paymentAddress = (Object)($current['guest_payment_address'] ?? []); + $shippingAddress = (Object) ($current['guest_shipping_address'] ?? []); + $paymentAddress = (Object) ($current['guest_payment_address'] ?? []); } $shippingMethodCode = $current['shipping_method_code'] ?? ''; - $paymentMethodCode = $current['payment_method_code'] ?? ''; + $paymentMethodCode = $current['payment_method_code'] ?? ''; - $currencyCode = current_currency_code(); - $currency = CurrencyRepo::findByCode($currencyCode); + $currencyCode = current_currency_code(); + $currency = CurrencyRepo::findByCode($currencyCode); $currencyValue = $currency->value ?? 1; $order = new Order([ - 'number' => self::generateOrderNumber(), - 'customer_id' => $customer->id ?? 0, - 'customer_group_id' => $customer->customer_group_id ?? 0, - 'shipping_address_id' => $shippingAddress->id ?? 0, - 'payment_address_id' => $paymentAddress->id ?? 0, - 'customer_name' => $customer->name ?? '', - 'email' => $customer ? $customer->email : $shippingAddress->email, - 'calling_code' => $customer->calling_code ?? 0, - 'telephone' => $customer->telephone ?? '', - 'total' => $orderTotal['amount'], - 'locale' => locale(), - 'currency_code' => $currencyCode, - 'currency_value' => $currencyValue, - 'ip' => request()->getClientIp(), - 'user_agent' => request()->userAgent(), - 'status' => StateMachineService::CREATED, - 'shipping_method_code' => $shippingMethodCode, - 'shipping_method_name' => trans($shippingMethodCode), + 'number' => self::generateOrderNumber(), + 'customer_id' => $customer->id ?? 0, + 'customer_group_id' => $customer->customer_group_id ?? 0, + 'shipping_address_id' => $shippingAddress->id ?? 0, + 'payment_address_id' => $paymentAddress->id ?? 0, + 'customer_name' => $customer->name ?? '', + 'email' => $customer ? $customer->email : $shippingAddress->email, + 'calling_code' => $customer->calling_code ?? 0, + 'telephone' => $customer->telephone ?? '', + 'total' => $orderTotal['amount'], + 'locale' => locale(), + 'currency_code' => $currencyCode, + 'currency_value' => $currencyValue, + 'ip' => request()->getClientIp(), + 'user_agent' => request()->userAgent(), + 'status' => StateMachineService::CREATED, + 'shipping_method_code' => $shippingMethodCode, + 'shipping_method_name' => trans($shippingMethodCode), 'shipping_customer_name' => $shippingAddress->name, - 'shipping_calling_code' => $shippingAddress->calling_code ?? 0, - 'shipping_telephone' => $shippingAddress->phone ?? '', - 'shipping_country' => $shippingAddress->country->name ?? '', - 'shipping_country_id' => $shippingAddress->country->id ?? 0, - 'shipping_zone' => $shippingAddress->zone, - 'shipping_zone_id' => $shippingAddress->zone_id ?? 0, - 'shipping_city' => $shippingAddress->city, - 'shipping_address_1' => $shippingAddress->address_1, - 'shipping_address_2' => $shippingAddress->address_2, - 'shipping_zipcode' => $shippingAddress->zipcode, - 'payment_method_code' => $paymentMethodCode, - 'payment_method_name' => trans($paymentMethodCode), - 'payment_customer_name' => $paymentAddress->name, - 'payment_calling_code' => $paymentAddress->calling_code ?? 0, - 'payment_telephone' => $paymentAddress->phone ?? '', - 'payment_country' => $paymentAddress->country->name ?? '', - 'payment_country_id' => $paymentAddress->country->id ?? 0, - 'payment_zone' => $paymentAddress->zone, - 'payment_zone_id' => $paymentAddress->zone_id ?? 0, - 'payment_city' => $paymentAddress->city, - 'payment_address_1' => $paymentAddress->address_1, - 'payment_address_2' => $paymentAddress->address_2, - 'payment_zipcode' => $paymentAddress->zipcode, + 'shipping_calling_code' => $shippingAddress->calling_code ?? 0, + 'shipping_telephone' => $shippingAddress->phone ?? '', + 'shipping_country' => $shippingAddress->country->name ?? '', + 'shipping_country_id' => $shippingAddress->country->id ?? 0, + 'shipping_zone' => $shippingAddress->zone, + 'shipping_zone_id' => $shippingAddress->zone_id ?? 0, + 'shipping_city' => $shippingAddress->city, + 'shipping_address_1' => $shippingAddress->address_1, + 'shipping_address_2' => $shippingAddress->address_2, + 'shipping_zipcode' => $shippingAddress->zipcode, + 'payment_method_code' => $paymentMethodCode, + 'payment_method_name' => trans($paymentMethodCode), + 'payment_customer_name' => $paymentAddress->name, + 'payment_calling_code' => $paymentAddress->calling_code ?? 0, + 'payment_telephone' => $paymentAddress->phone ?? '', + 'payment_country' => $paymentAddress->country->name ?? '', + 'payment_country_id' => $paymentAddress->country->id ?? 0, + 'payment_zone' => $paymentAddress->zone, + 'payment_zone_id' => $paymentAddress->zone_id ?? 0, + 'payment_city' => $paymentAddress->city, + 'payment_address_1' => $paymentAddress->address_1, + 'payment_address_2' => $paymentAddress->address_2, + 'payment_zipcode' => $paymentAddress->zipcode, ]); $order->saveOrFail(); @@ -248,7 +245,6 @@ class OrderRepo return $order; } - /** * 生成订单号 * @@ -257,10 +253,11 @@ class OrderRepo public static function generateOrderNumber(): string { $orderNumber = Carbon::now()->format('Ymd') . rand(10000, 99999); - $exist = Order::query()->where('number', $orderNumber)->exists(); + $exist = Order::query()->where('number', $orderNumber)->exists(); if ($exist) { return self::generateOrderNumber(); } + return $orderNumber; } } diff --git a/beike/Repositories/OrderTotalRepo.php b/beike/Repositories/OrderTotalRepo.php index f47148c1..cb5fbc6a 100644 --- a/beike/Repositories/OrderTotalRepo.php +++ b/beike/Repositories/OrderTotalRepo.php @@ -20,9 +20,9 @@ class OrderTotalRepo $items = []; foreach ($totals as $total) { $items[] = [ - 'code' => $total['code'], - 'value' => $total['amount'], - 'title' => $total['title'], + 'code' => $total['code'], + 'value' => $total['amount'], + 'title' => $total['title'], 'reference' => json_encode($total['reference'] ?? ''), ]; } diff --git a/beike/Repositories/PageRepo.php b/beike/Repositories/PageRepo.php index 2fc7ce83..7da41c6e 100644 --- a/beike/Repositories/PageRepo.php +++ b/beike/Repositories/PageRepo.php @@ -31,10 +31,10 @@ class PageRepo public static function getName($id) { $categories = self::getAllPagesWithName(); + return $categories[$id]['name'] ?? ''; } - /** * 获取所有单页ID和名称列表 * @return array|null @@ -49,10 +49,11 @@ class PageRepo $pages = self::getBuilder()->select('id')->get(); foreach ($pages as $brand) { $items[$brand->id] = [ - 'id' => $brand->id, + 'id' => $brand->id, 'name' => $brand->description->title ?? '', ]; } + return self::$allPagesWithName = $items; } } diff --git a/beike/Repositories/PluginRepo.php b/beike/Repositories/PluginRepo.php index 5ccc65a6..c0fe632c 100644 --- a/beike/Repositories/PluginRepo.php +++ b/beike/Repositories/PluginRepo.php @@ -13,29 +13,28 @@ namespace Beike\Repositories; use Beike\Models\Plugin; use Beike\Plugin\Plugin as BPlugin; +use Beike\Shop\Services\TotalServices\ShippingService; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\File; -use Illuminate\Database\Eloquent\Collection; -use Beike\Shop\Services\TotalServices\ShippingService; class PluginRepo { public static $installedPlugins; - public static function getTypes(): array { $types = []; foreach (Plugin::TYPES as $item) { $types[] = [ 'value' => $item, - 'label' => trans("admin/plugin.{$item}") + 'label' => trans("admin/plugin.{$item}"), ]; } + return $types; } - /** * 安装插件到系统: 插入数据 * @param BPlugin $bPlugin @@ -44,8 +43,8 @@ class PluginRepo { self::publishStaticFiles($bPlugin); self::migrateDatabase($bPlugin); - $type = $bPlugin->type; - $code = $bPlugin->code; + $type = $bPlugin->type; + $code = $bPlugin->code; $plugin = Plugin::query() ->where('type', $type) ->where('code', $code) @@ -58,22 +57,20 @@ class PluginRepo } } - /** * 发布静态资源到 public * @param BPlugin $bPlugin */ public static function publishStaticFiles(BPlugin $bPlugin) { - $code = $bPlugin->code; - $path = $bPlugin->getPath(); + $code = $bPlugin->code; + $path = $bPlugin->getPath(); $staticPath = $path . '/Static'; if (is_dir($staticPath)) { File::copyDirectory($staticPath, public_path('plugin/' . $code)); } } - /** * 数据库迁移 */ @@ -82,12 +79,11 @@ class PluginRepo $migrationPath = "{$bPlugin->getPath()}/Migrations"; if (is_dir($migrationPath)) { Artisan::call('migrate', [ - '--force' => true + '--force' => true, ]); } } - /** * 从系统卸载插件: 删除数据 * @param BPlugin $bPlugin @@ -103,22 +99,20 @@ class PluginRepo ->delete(); } - /** * 从 public 删除静态资源 * @param BPlugin $bPlugin */ public static function removeStaticFiles(BPlugin $bPlugin) { - $code = $bPlugin->code; - $path = $bPlugin->getPath(); + $code = $bPlugin->code; + $path = $bPlugin->getPath(); $staticPath = $path . '/static'; if (is_dir($staticPath)) { File::deleteDirectory(public_path('plugin/' . $code)); } } - /** * 判断插件是否安装 * @@ -128,10 +122,10 @@ class PluginRepo public static function installed($code): bool { $plugins = self::getPluginsByCode(); + return $plugins->has($code); } - /** * 获取所有已安装插件列表 * @@ -142,10 +136,10 @@ class PluginRepo if (self::$installedPlugins !== null) { return self::$installedPlugins; } + return self::$installedPlugins = Plugin::all(); } - /** * 获取所有已安装插件 * @return Plugin[]|Collection @@ -153,42 +147,44 @@ class PluginRepo public static function getPluginsByCode() { $allPlugins = self::allPlugins(); + return $allPlugins->keyBy('code'); } - /** * 获取所有配送方式 */ public static function getShippingMethods(): Collection { $allPlugins = self::allPlugins(); + return $allPlugins->where('type', 'shipping')->filter(function ($item) { $plugin = app('plugin')->getPlugin($item->code); if ($plugin) { $item->plugin = $plugin; } + return $plugin && $plugin->getEnabled(); }); } - /** * 获取所有支付方式 */ public static function getPaymentMethods(): Collection { $allPlugins = self::allPlugins(); + return $allPlugins->where('type', 'payment')->filter(function ($item) { $plugin = app('plugin')->getPlugin($item->code); if ($plugin) { $item->plugin = $plugin; } + return $plugin && $plugin->getEnabled(); }); } - /** * 检测对应配送方式是否可用 * @@ -197,12 +193,12 @@ class PluginRepo */ public static function shippingEnabled($code): bool { - $code = ShippingService::parseShippingPluginCode($code); + $code = ShippingService::parseShippingPluginCode($code); $shippingMethods = self::getShippingMethods(); + return $shippingMethods->where('code', $code)->count() > 0; } - /** * 检测对应支付方式是否可用 * @@ -212,6 +208,7 @@ class PluginRepo public static function paymentEnabled($code): bool { $paymentMethods = self::getPaymentMethods(); + return $paymentMethods->where('code', $code)->count() > 0; } } diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php index f1afae82..6c44b7b6 100644 --- a/beike/Repositories/ProductRepo.php +++ b/beike/Repositories/ProductRepo.php @@ -12,11 +12,8 @@ namespace Beike\Repositories; use Beike\Models\Product; -use Beike\Models\ProductCategory; -use Beike\Models\ProductDescription; -use Beike\Models\ProductSku; -use Illuminate\Database\Eloquent\Builder; use Beike\Shop\Http\Resources\ProductSimple; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\HigherOrderBuilderProxy; use Illuminate\Http\Resources\Json\AnonymousResourceCollection; @@ -25,7 +22,6 @@ class ProductRepo { private static $allProductsWithName; - /** * 获取商品详情 */ @@ -35,10 +31,10 @@ class ProductRepo $product = Product::query()->findOrFail($product); } $product->load('description', 'skus', 'master_sku', 'brand', 'relations'); + return $product; } - /** * 通过单个或多个商品分类获取商品列表 * @@ -47,12 +43,12 @@ class ProductRepo */ public static function getProductsByCategory($categoryId): AnonymousResourceCollection { - $builder = self::getBuilder(['category_id' => $categoryId, 'active' => 1]); + $builder = self::getBuilder(['category_id' => $categoryId, 'active' => 1]); $products = $builder->with('inCurrentWishlist')->paginate(perPage()); + return ProductSimple::collection($products); } - /** * 通过商品ID获取商品列表 * @param $productIds @@ -60,15 +56,15 @@ class ProductRepo */ public static function getProductsByIds($productIds): AnonymousResourceCollection { - if (!$productIds) { + if (! $productIds) { return ProductSimple::collection(new Collection()); } - $builder = self::getBuilder(['product_ids' => $productIds])->whereHas('master_sku'); + $builder = self::getBuilder(['product_ids' => $productIds])->whereHas('master_sku'); $products = $builder->with('inCurrentWishlist')->get(); + return ProductSimple::collection($products); } - /** * 获取商品筛选对象 * @@ -126,7 +122,7 @@ class ProductRepo } if (isset($data['active'])) { - $builder->where('active', (int)$data['active']); + $builder->where('active', (int) $data['active']); } // 回收站 @@ -134,14 +130,13 @@ class ProductRepo $builder->onlyTrashed(); } - $sort = $data['sort'] ?? 'products.updated_at'; + $sort = $data['sort'] ?? 'products.updated_at'; $order = $data['order'] ?? 'desc'; $builder->orderBy($sort, $order); return $builder; } - public static function list($data = []) { return self::getBuilder($data)->paginate($data['per_page'] ?? perPage()); @@ -156,12 +151,13 @@ class ProductRepo $results = []; foreach ($products as $product) { $results[] = [ - 'id' => $product->id, - 'name' => $product->description->name, + 'id' => $product->id, + 'name' => $product->description->name, 'status' => $product->active, - 'image' => $product->image, + 'image' => $product->image, ]; } + return $results; } @@ -177,10 +173,10 @@ class ProductRepo if ($product) { return $product->description->name; } + return ''; } - /** * 通过商品ID获取商品名称 * @param $id @@ -191,7 +187,6 @@ class ProductRepo return self::getNameById($id); } - /** * 获取所有商品ID和名称列表 * @@ -203,18 +198,18 @@ class ProductRepo return self::$allProductsWithName; } - $items = []; + $items = []; $products = self::getBuilder()->select('id')->get(); foreach ($products as $product) { $items[$product->id] = [ - 'id' => $product->id, + 'id' => $product->id, 'name' => $product->description->name ?? '', ]; } + return self::$allProductsWithName = $items; } - /** * @param $productIds * @return array @@ -222,15 +217,15 @@ class ProductRepo public static function getNames($productIds): array { $products = self::getListByProductIds($productIds); + return $products->map(function ($product) { return [ - 'id' => $product->id, - 'name' => $product->description->name ?? '' + 'id' => $product->id, + 'name' => $product->description->name ?? '', ]; })->toArray(); } - /** * 通过商品ID获取商品列表 * @return array|Builder[]|Collection @@ -244,6 +239,7 @@ class ProductRepo ->with(['description']) ->whereIn('id', $productIds) ->get(); + return $products; } diff --git a/beike/Repositories/RmaReasonRepo.php b/beike/Repositories/RmaReasonRepo.php index 77e76dd0..4359c152 100644 --- a/beike/Repositories/RmaReasonRepo.php +++ b/beike/Repositories/RmaReasonRepo.php @@ -11,13 +11,10 @@ namespace Beike\Repositories; -use Beike\Models\Rma; use Beike\Models\RmaReason; use Exception; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Collection; -use Illuminate\Database\Eloquent\HigherOrderBuilderProxy; use Illuminate\Database\Eloquent\Model; class RmaReasonRepo @@ -30,7 +27,8 @@ class RmaReasonRepo public static function create($data) { $data['name'] = json_encode($data['name']); - $item = RmaReason::query()->create($data); + $item = RmaReason::query()->create($data); + return $item; } @@ -42,14 +40,15 @@ class RmaReasonRepo */ public static function update($reason, $data) { - if (!$reason instanceof RmaReason) { + if (! $reason instanceof RmaReason) { $reason = RmaReason::query()->find($reason); } - if (!$reason) { + if (! $reason) { throw new Exception("退换货原因id $reason 不存在"); } $data['name'] = json_encode($data['name']); $reason->update($data); + return $reason; } diff --git a/beike/Repositories/RmaRepo.php b/beike/Repositories/RmaRepo.php index fe903a44..78733dd2 100644 --- a/beike/Repositories/RmaRepo.php +++ b/beike/Repositories/RmaRepo.php @@ -11,8 +11,8 @@ namespace Beike\Repositories; -use Beike\Models\Rma; use Beike\Models\Customer; +use Beike\Models\Rma; use Beike\Shop\Http\Resources\RmaDetail; use Exception; use Illuminate\Contracts\Pagination\LengthAwarePaginator; @@ -29,9 +29,10 @@ class RmaRepo */ public static function create($data) { - $item = Rma::query()->create($data); + $item = Rma::query()->create($data); $data['notify'] = 0; self::addHistory($item, $data); + return $item; } @@ -43,13 +44,14 @@ class RmaRepo */ public static function update($rma, $data) { - if (!$rma instanceof Rma) { + if (! $rma instanceof Rma) { $rma = Rma::query()->find($rma); } - if (!$rma) { + if (! $rma) { throw new Exception("退还/售后id $rma 不存在"); } $rma->update($data); + return $rma; } @@ -67,14 +69,15 @@ class RmaRepo * @param array $data * @return Rma */ - public static function addHistory($rma, Array $data) + public static function addHistory($rma, array $data) { - if (!$rma instanceof Rma) { + if (! $rma instanceof Rma) { $rma = self::find($rma); } $rma->histories()->create($data); $rma->status = $data['status']; $rma->saveOrFail(); + return $rma; } @@ -130,7 +133,7 @@ class RmaRepo */ public static function listByCustomer($customer): array { - if (!$customer instanceof Customer) { + if (! $customer instanceof Customer) { $customer = CustomerRepo::find($customer->id); } @@ -146,22 +149,22 @@ class RmaRepo public static function getStatuses(): array { return [ - 'pending' => trans('rma.status_pending'), - 'rejected' => trans('rma.status_rejected'), - 'approved' => trans('rma.status_approved'), - 'shipped' => trans('rma.status_shipped'), - 'completed' => trans('rma.status_completed') + 'pending' => trans('rma.status_pending'), + 'rejected' => trans('rma.status_rejected'), + 'approved' => trans('rma.status_approved'), + 'shipped' => trans('rma.status_shipped'), + 'completed' => trans('rma.status_completed'), ]; } public static function getTypes(): array { return [ - 'return' => trans('rma.type_return'), + 'return' => trans('rma.type_return'), 'exchange' => trans('rma.type_exchange'), - 'repair' => trans('rma.type_repair'), - 'reissue' => trans('rma.type_reissue'), - 'refund' => trans('rma.type_refund') + 'repair' => trans('rma.type_repair'), + 'reissue' => trans('rma.type_reissue'), + 'refund' => trans('rma.type_refund'), ]; } } diff --git a/beike/Repositories/SettingRepo.php b/beike/Repositories/SettingRepo.php index 9418f3cd..81675dd7 100644 --- a/beike/Repositories/SettingRepo.php +++ b/beike/Repositories/SettingRepo.php @@ -11,8 +11,8 @@ namespace Beike\Repositories; -use Carbon\Carbon; use Beike\Models\Setting; +use Carbon\Carbon; class SettingRepo { @@ -26,12 +26,12 @@ class SettingRepo $result = []; foreach ($settings as $setting) { $type = $setting->type; - if (!in_array($type, Setting::TYPES)) { + if (! in_array($type, Setting::TYPES)) { continue; } $space = $setting->space; - $name = $setting->name; + $name = $setting->name; $value = $setting->value; if ($setting->json) { $result[$type][$space][$name] = json_decode($value, true); @@ -39,10 +39,10 @@ class SettingRepo $result[$type][$space][$name] = $value; } } + return $result; } - /** * 获取插件默认字段 * @@ -51,14 +51,13 @@ class SettingRepo public static function getPluginStatusColumn(): array { return [ - 'name' => 'status', - 'label' => trans('common.whether_open'), - 'type' => 'bool', + 'name' => 'status', + 'label' => trans('common.whether_open'), + 'type' => 'bool', 'required' => true, ]; } - /** * 获取单个插件所有字段 * @param $pluginCode @@ -73,7 +72,6 @@ class SettingRepo ->keyBy('name'); } - /** * 获取单个插件状态 * @@ -83,9 +81,9 @@ class SettingRepo public static function getPluginStatus($pluginCode): bool { $status = plugin_setting("{$pluginCode}.status"); - return (bool)$status; - } + return (bool) $status; + } /** * 批量更新设置 @@ -109,11 +107,11 @@ class SettingRepo continue; } $rows[] = [ - 'type' => $type, - 'space' => $code, - 'name' => $name, - 'value' => (string)$value, - 'json' => 0, + 'type' => $type, + 'space' => $code, + 'name' => $name, + 'value' => (string) $value, + 'json' => 0, 'created_at' => Carbon::now(), 'updated_at' => Carbon::now(), ]; @@ -121,14 +119,13 @@ class SettingRepo Setting::query()->insert($rows); } - /** * 创建或更新单条记录 * * @param $name * @param $value - * @param string $space - * @param string $type + * @param string $space + * @param string $type * @throws \Throwable */ public static function storeValue($name, $value, string $space = 'base', string $type = 'system') @@ -144,11 +141,11 @@ class SettingRepo ->first(); $settingData = [ - 'type' => $type, + 'type' => $type, 'space' => $space, - 'name' => $name, + 'name' => $name, 'value' => is_array($value) ? json_encode($value) : $value, - 'json' => is_array($value), + 'json' => is_array($value), ]; if (empty($setting)) { diff --git a/beike/Repositories/SystemSettingRepo.php b/beike/Repositories/SystemSettingRepo.php index 24af0467..578832ee 100644 --- a/beike/Repositories/SystemSettingRepo.php +++ b/beike/Repositories/SystemSettingRepo.php @@ -13,5 +13,4 @@ namespace Beike\Repositories; class SystemSettingRepo { - } diff --git a/beike/Repositories/UserRepo.php b/beike/Repositories/UserRepo.php index dbd02131..e8e21e13 100644 --- a/beike/Repositories/UserRepo.php +++ b/beike/Repositories/UserRepo.php @@ -24,6 +24,7 @@ class UserRepo public static function create($data) { $data['password'] = Hash::make($data['password']); + return AdminUser::query()->create($data); } @@ -34,12 +35,13 @@ class UserRepo */ public static function update($user, $data) { - if (!$user instanceof AdminUser) { + if (! $user instanceof AdminUser) { $user = AdminUser::query()->findOrFail($user); } if (isset($data['password'])) { $data['password'] = Hash::make($data['password']); } + return $user->update($data); } @@ -91,4 +93,3 @@ class UserRepo return $builder->paginate(perPage())->withQueryString(); } } - diff --git a/beike/Repositories/VerifyCodeRepo.php b/beike/Repositories/VerifyCodeRepo.php index 9abdfb9b..58809166 100644 --- a/beike/Repositories/VerifyCodeRepo.php +++ b/beike/Repositories/VerifyCodeRepo.php @@ -11,7 +11,6 @@ namespace Beike\Repositories; - use Beike\Models\VerifyCode; class VerifyCodeRepo @@ -24,6 +23,7 @@ class VerifyCodeRepo public static function create($data) { $verifyCode = VerifyCode::query()->create($data); + return $verifyCode; } diff --git a/beike/Repositories/ZoneRepo.php b/beike/Repositories/ZoneRepo.php index c474ce32..f44505dc 100644 --- a/beike/Repositories/ZoneRepo.php +++ b/beike/Repositories/ZoneRepo.php @@ -22,11 +22,11 @@ class ZoneRepo private static function handleParams($data) { return [ - 'country_id' => $data['country_id'] ?? 0, - 'name' => $data['name'] ?? '', - 'code' => $data['code'] ?? '', - 'sort_order' => (int)$data['sort_order'] ?? 0, - 'status' => (bool)$data['status'] ?? 0, + 'country_id' => $data['country_id'] ?? 0, + 'name' => $data['name'] ?? '', + 'code' => $data['code'] ?? '', + 'sort_order' => (int) $data['sort_order'] ?? 0, + 'status' => (bool) $data['status'] ?? 0, ]; } @@ -38,6 +38,7 @@ class ZoneRepo public static function create($data) { $data = self::handleParams($data); + return Zone::query()->create($data); } @@ -50,11 +51,12 @@ class ZoneRepo public static function update($id, $data) { $zone = Zone::query()->find($id); - if (!$zone) { + if (! $zone) { throw new \Exception("省份/地区id {$id} 不存在"); } $data = self::handleParams($data); $zone->update($data); + return $zone; } @@ -115,7 +117,6 @@ class ZoneRepo } } - /** * 通过国家ID获取省份拉下选项 * @@ -129,9 +130,10 @@ class ZoneRepo foreach ($zones as $zone) { $items[] = [ 'value' => $zone->id, - 'label' => $zone->name + 'label' => $zone->name, ]; } + return $items; } } diff --git a/beike/Services/CurrencyService.php b/beike/Services/CurrencyService.php index 5e032ad4..4d848543 100644 --- a/beike/Services/CurrencyService.php +++ b/beike/Services/CurrencyService.php @@ -16,9 +16,11 @@ use Beike\Repositories\CurrencyRepo; class CurrencyService { private static $instance; - private $currencies = array(); - public function __construct() { + private $currencies = []; + + public function __construct() + { foreach (CurrencyRepo::listEnabled() as $result) { $this->currencies[$result->code] = $result; } @@ -26,9 +28,10 @@ class CurrencyService public static function getInstance() { - if (!self::$instance) { + if (! self::$instance) { self::$instance = new self(); } + return self::$instance; } @@ -38,19 +41,19 @@ class CurrencyService return $amount; } - $symbol_left = $this->currencies[$currency]->symbol_left; - $symbol_right = $this->currencies[$currency]->symbol_right; + $symbol_left = $this->currencies[$currency]->symbol_left; + $symbol_right = $this->currencies[$currency]->symbol_right; $decimal_place = $this->currencies[$currency]->decimal_place; - if (!$value) { + if (! $value) { $value = $this->currencies[$currency]->value; } - $amount = $value ? (float)$amount * $value : (float)$amount; + $amount = $value ? (float) $amount * $value : (float) $amount; - $amount = round($amount, (int)$decimal_place); + $amount = round($amount, (int) $decimal_place); - if (!$format) { + if (! $format) { return $amount; } @@ -63,7 +66,7 @@ class CurrencyService $string .= $symbol_left; } - $string .= number_format(abs($amount), (int)$decimal_place, __('currency.decimal_point'), __('currency.thousand_point')); + $string .= number_format(abs($amount), (int) $decimal_place, __('currency.decimal_point'), __('currency.thousand_point')); if ($symbol_right) { $string .= $symbol_right; @@ -72,8 +75,8 @@ class CurrencyService return $string; } - - public function convert($value, $from, $to) { + public function convert($value, $from, $to) + { if (isset($this->currencies[$from])) { $from = $this->currencies[$from]->value; } else { @@ -88,5 +91,4 @@ class CurrencyService return $value * ($to / $from); } - } diff --git a/beike/Services/DesignService.php b/beike/Services/DesignService.php index 6da1e645..643dc63f 100644 --- a/beike/Services/DesignService.php +++ b/beike/Services/DesignService.php @@ -11,10 +11,10 @@ namespace Beike\Services; -use Illuminate\Support\Str; use Beike\Repositories\BrandRepo; use Beike\Repositories\ProductRepo; use Beike\Shop\Http\Resources\BrandDetail; +use Illuminate\Support\Str; class DesignService { @@ -32,10 +32,10 @@ class DesignService } $modulesData[$index] = $moduleData; } + return ['modules' => $modulesData]; } - /** * @throws \Exception */ @@ -50,10 +50,10 @@ class DesignService } elseif ($moduleCode == 'tab_product') { return self::handleTabProducts($content); } + return $content; } - /** * 处理 SlideShow 模块 * @@ -69,6 +69,7 @@ class DesignService } $content['images'] = self::handleImages($images); + return $content; } @@ -82,14 +83,14 @@ class DesignService private static function handleBrand($content): array { $brandIds = $content['brands'] ?? []; - $brands = BrandDetail::collection(BrandRepo::getListByIds($brandIds))->jsonSerialize(); + $brands = BrandDetail::collection(BrandRepo::getListByIds($brandIds))->jsonSerialize(); $content['brands'] = $brands; - $content['title'] = $content['title'][locale()] ?? ''; + $content['title'] = $content['title'][locale()] ?? ''; + return $content; } - /** * 处理 SlideShow 模块 * @@ -105,11 +106,11 @@ class DesignService } $content['images'] = self::handleImages($images); - $content['full'] = $content['full'] ?? false; + $content['full'] = $content['full'] ?? false; + return $content; } - /** * 处理选项卡商品列表模块 * @@ -125,17 +126,17 @@ class DesignService foreach ($tabs as $index => $tab) { $tabs[$index]['title'] = $tab['title'][locale()] ?? ''; - $productsIds = $tab['products']; + $productsIds = $tab['products']; if ($productsIds) { $tabs[$index]['products'] = ProductRepo::getProductsByIds($productsIds)->jsonSerialize(); } } - $content['tabs'] = $tabs; + $content['tabs'] = $tabs; $content['title'] = $content['title'][locale()] ?? ''; + return $content; } - /** * 处理图片以及链接 * @throws \Exception @@ -147,7 +148,7 @@ class DesignService } foreach ($images as $index => $image) { - $imagePath = $image['image'][locale()] ?? ''; + $imagePath = $image['image'][locale()] ?? ''; $images[$index]['image'] = image_origin($imagePath); $link = $image['link']; @@ -155,15 +156,14 @@ class DesignService continue; } - $type = $link['type'] ?? ''; - $value = $link['type'] == 'custom' ? $link['value'] : ((int)$link['value'] ?? 0); + $type = $link['type'] ?? ''; + $value = $link['type'] == 'custom' ? $link['value'] : ((int) $link['value'] ?? 0); $images[$index]['link']['link'] = self::handleLink($type, $value); } return $images; } - /** * 处理链接 * diff --git a/beike/Services/ImageService.php b/beike/Services/ImageService.php index 5e0b1f45..cef1f053 100644 --- a/beike/Services/ImageService.php +++ b/beike/Services/ImageService.php @@ -11,15 +11,16 @@ namespace Beike\Services; -use Intervention\Image\Facades\Image; use Intervention\Image\Exception\NotReadableException; +use Intervention\Image\Facades\Image; class ImageService { private $image; + private $imagePath; - const PLACEHOLDER_IMAGE = 'catalog/placeholder.png'; + public const PLACEHOLDER_IMAGE = 'catalog/placeholder.png'; /** * @param $image @@ -27,11 +28,10 @@ class ImageService */ public function __construct($image) { - $this->image = $image ?: self::PLACEHOLDER_IMAGE; + $this->image = $image ?: self::PLACEHOLDER_IMAGE; $this->imagePath = public_path($this->image); } - /** * 设置插件目录名称 * @param $dirName @@ -48,7 +48,7 @@ class ImageService if (file_exists($this->imagePath)) { $this->image = strtolower('plugin/' . $dirName . $originImage); } else { - $this->image = self::PLACEHOLDER_IMAGE; + $this->image = self::PLACEHOLDER_IMAGE; $this->imagePath = public_path($this->image); } @@ -64,20 +64,20 @@ class ImageService public function resize(int $width = 100, int $height = 100): string { try { - if (!file_exists($this->imagePath)) { - $this->image = self::PLACEHOLDER_IMAGE; + if (! file_exists($this->imagePath)) { + $this->image = self::PLACEHOLDER_IMAGE; $this->imagePath = public_path($this->image); } - if (!file_exists($this->imagePath)) { + if (! file_exists($this->imagePath)) { return ''; } $extension = pathinfo($this->imagePath, PATHINFO_EXTENSION); - $newImage = 'cache/' . mb_substr($this->image, 0, mb_strrpos($this->image, '.')) . '-' . $width . 'x' . $height . '.' . $extension; + $newImage = 'cache/' . mb_substr($this->image, 0, mb_strrpos($this->image, '.')) . '-' . $width . 'x' . $height . '.' . $extension; $newImagePath = public_path($newImage); - if (!is_file($newImagePath) || (filemtime($this->imagePath) > filemtime($newImagePath))) { - ini_set("memory_limit", "-1"); + if (! is_file($newImagePath) || (filemtime($this->imagePath) > filemtime($newImagePath))) { + ini_set('memory_limit', '-1'); create_directories(dirname($newImage)); $img = Image::make($this->imagePath); @@ -89,13 +89,13 @@ class ImageService $canvas->insert($img, 'center'); $canvas->save($newImagePath); } + return asset($newImage); } catch (NotReadableException $e) { return $this->originUrl(); } } - /** * 获取原图地址 */ diff --git a/beike/Services/ShipmentService.php b/beike/Services/ShipmentService.php index a1a969c5..c646f9f5 100644 --- a/beike/Services/ShipmentService.php +++ b/beike/Services/ShipmentService.php @@ -11,7 +11,6 @@ namespace Beike\Services; - class ShipmentService { /** @@ -33,13 +32,12 @@ class ShipmentService } return [ - 'express_code' => $expressCode, + 'express_code' => $expressCode, 'express_company' => $expressCompany, - 'express_number' => $expressNumber, + 'express_number' => $expressNumber, ]; } - /** * 根据快递公司编号获取快递公司名称 * @@ -53,6 +51,7 @@ class ShipmentService return ''; } $company = collect($expressCompanies)->where('code', $expressCode)->first(); + return $company ? $company['name'] ?? '' : ''; } } diff --git a/beike/Services/ShippingMethodService.php b/beike/Services/ShippingMethodService.php index 6db6eb7e..4d891e08 100644 --- a/beike/Services/ShippingMethodService.php +++ b/beike/Services/ShippingMethodService.php @@ -11,9 +11,9 @@ namespace Beike\Services; -use Illuminate\Support\Str; use Beike\Repositories\PluginRepo; use Beike\Shop\Services\CheckoutService; +use Illuminate\Support\Str; class ShippingMethodService { @@ -30,23 +30,24 @@ class ShippingMethodService $shippingMethods = []; foreach ($shippingPlugins as $shippingPlugin) { - $plugin = $shippingPlugin->plugin; + $plugin = $shippingPlugin->plugin; $pluginCode = $shippingPlugin->code; $pluginName = Str::studly($pluginCode); - $className = "Plugin\\{$pluginName}\\Bootstrap"; + $className = "Plugin\\{$pluginName}\\Bootstrap"; - if (!method_exists($className, 'getQuotes')) { + if (! method_exists($className, 'getQuotes')) { throw new \Exception("请在插件 {$className} 实现方法: public function getQuotes(\$currentCart)"); } $quotes = (new $className)->getQuotes($checkout, $plugin); if ($quotes) { $shippingMethods[] = [ - 'code' => $pluginCode, - 'name' => $plugin->name, - 'quotes' => $quotes + 'code' => $pluginCode, + 'name' => $plugin->name, + 'quotes' => $quotes, ]; } } + return $shippingMethods; } } diff --git a/beike/Services/SitemapService.php b/beike/Services/SitemapService.php index 98a810dd..eb1b636f 100644 --- a/beike/Services/SitemapService.php +++ b/beike/Services/SitemapService.php @@ -11,7 +11,6 @@ namespace Beike\Services; - use Beike\Models\Brand; use Beike\Models\Category; use Beike\Models\Page; @@ -21,7 +20,7 @@ class SitemapService { public static function gen(): void { - $sitemap = resolve("sitemap"); + $sitemap = resolve('sitemap'); $sitemap->add(shop_route('brands.index'), date('c')); $sitemap->add(shop_route('categories.index'), date('c')); @@ -32,22 +31,22 @@ class SitemapService $products = Product::query()->where('active', 1)->orderBy('updated_at', 'desc')->get(); foreach ($products as $item) { - $sitemap->add(shop_route('products.show', ['product'=>$item->id]), $item->updated_at->format('c')); + $sitemap->add(shop_route('products.show', ['product' => $item->id]), $item->updated_at->format('c')); } $brands = Brand::query()->where('status', 1)->orderBy('updated_at', 'desc')->get(); foreach ($brands as $item) { - $sitemap->add(shop_route('brands.show', ['id'=>$item->id]), $item->updated_at->format('c')); + $sitemap->add(shop_route('brands.show', ['id' => $item->id]), $item->updated_at->format('c')); } $categories = Category::query()->where('active', 1)->orderBy('updated_at', 'desc')->get(); foreach ($categories as $item) { - $sitemap->add(shop_route('categories.show', ['category'=>$item->id]), $item->updated_at->format('c')); + $sitemap->add(shop_route('categories.show', ['category' => $item->id]), $item->updated_at->format('c')); } $pages = Page::query()->where('active', 1)->orderBy('updated_at', 'desc')->get(); foreach ($pages as $item) { - $sitemap->add(shop_route('pages.show', ['page'=>$item->id]), $item->updated_at->format('c')); + $sitemap->add(shop_route('pages.show', ['page' => $item->id]), $item->updated_at->format('c')); } $sitemap->store('xml', 'sitemap'); diff --git a/beike/Services/StateMachineService.php b/beike/Services/StateMachineService.php index 7955cadb..1844e1e7 100644 --- a/beike/Services/StateMachineService.php +++ b/beike/Services/StateMachineService.php @@ -11,27 +11,36 @@ namespace Beike\Services; -use Throwable; use Beike\Models\Order; use Beike\Models\OrderHistory; use Beike\Models\OrderShipment; +use Throwable; class StateMachineService { private Order $order; + private int $orderId; + private string $comment; + private bool $notify; + private array $shipment; - const CREATED = 'created'; // 已创建 - const UNPAID = 'unpaid'; // 待支付 - const PAID = 'paid'; // 已支付 - const SHIPPED = 'shipped'; // 已发货 - const COMPLETED = 'completed'; // 已完成 - const CANCELLED = 'cancelled'; // 已取消 + public const CREATED = 'created'; // 已创建 - const ORDER_STATUS = [ + public const UNPAID = 'unpaid'; // 待支付 + + public const PAID = 'paid'; // 已支付 + + public const SHIPPED = 'shipped'; // 已发货 + + public const COMPLETED = 'completed'; // 已完成 + + public const CANCELLED = 'cancelled'; // 已取消 + + public const ORDER_STATUS = [ self::CREATED, self::UNPAID, self::PAID, @@ -40,27 +49,27 @@ class StateMachineService self::CANCELLED, ]; - const MACHINES = [ + public const MACHINES = [ self::CREATED => [ self::UNPAID => ['updateStatus', 'addHistory', 'notifyNewOrder'], ], - self::UNPAID => [ - self::PAID => ['updateStatus', 'addHistory', 'subStock', 'notifyUpdateOrder'], + self::UNPAID => [ + self::PAID => ['updateStatus', 'addHistory', 'subStock', 'notifyUpdateOrder'], self::CANCELLED => ['updateStatus', 'addHistory', 'notifyUpdateOrder'], ], - self::PAID => [ + self::PAID => [ self::CANCELLED => ['updateStatus', 'addHistory', 'notifyUpdateOrder'], - self::SHIPPED => ['updateStatus', 'addHistory', 'addShipment', 'notifyUpdateOrder'], - self::COMPLETED => ['updateStatus', 'addHistory', 'notifyUpdateOrder'] + self::SHIPPED => ['updateStatus', 'addHistory', 'addShipment', 'notifyUpdateOrder'], + self::COMPLETED => ['updateStatus', 'addHistory', 'notifyUpdateOrder'], ], self::SHIPPED => [ - self::COMPLETED => ['updateStatus', 'addHistory', 'notifyUpdateOrder'] - ] + self::COMPLETED => ['updateStatus', 'addHistory', 'notifyUpdateOrder'], + ], ]; public function __construct(Order $order) { - $this->order = $order; + $this->order = $order; $this->orderId = $order->id; } @@ -77,6 +86,7 @@ class StateMachineService public function setComment($comment): self { $this->comment = $comment; + return $this; } @@ -87,7 +97,8 @@ class StateMachineService */ public function setNotify($flag): self { - $this->notify = (bool)$flag; + $this->notify = (bool) $flag; + return $this; } @@ -100,10 +111,10 @@ class StateMachineService public function setShipment(array $shipment = []): self { $this->shipment = $shipment; + return $this; } - /** * 获取所有订单状态列表 * @@ -112,7 +123,7 @@ class StateMachineService */ public static function getAllStatuses(): array { - $result = []; + $result = []; $statuses = self::ORDER_STATUS; foreach ($statuses as $status) { if ($status == self::CREATED) { @@ -120,9 +131,10 @@ class StateMachineService } $result[] = [ 'status' => $status, - 'name' => trans("order.{$status}") + 'name' => trans("order.{$status}"), ]; } + return $result; } @@ -135,31 +147,32 @@ class StateMachineService public function nextBackendStatuses(): array { $currentStatusCode = $this->order->status; - $nextStatus = self::MACHINES[$currentStatusCode] ?? []; + $nextStatus = self::MACHINES[$currentStatusCode] ?? []; if (empty($nextStatus)) { return []; } $nextStatusCodes = array_keys($nextStatus); - $result = []; + $result = []; foreach ($nextStatusCodes as $status) { $result[] = [ 'status' => $status, - 'name' => trans("order.{$status}") + 'name' => trans("order.{$status}"), ]; } + return $result; } /** * @param $status - * @param string $comment - * @param bool $notify + * @param string $comment + * @param bool $notify * @throws \Exception */ public function changeStatus($status, string $comment = '', bool $notify = false) { - $order = $this->order; + $order = $this->order; $oldStatusCode = $order->status; $newStatusCode = $status; @@ -171,7 +184,7 @@ class StateMachineService return; } foreach ($functions as $function) { - if (!method_exists($this, $function)) { + if (! method_exists($this, $function)) { throw new \Exception("{$function} not exist in StateMachine!"); } $this->{$function}($oldStatusCode, $status); @@ -179,7 +192,6 @@ class StateMachineService } /** - * * 检测当前订单是否可以变更为某个状态 * * @param $statusCode @@ -187,16 +199,17 @@ class StateMachineService */ private function validStatusCode($statusCode) { - if (!in_array($statusCode, self::ORDER_STATUS)) { + if (! in_array($statusCode, self::ORDER_STATUS)) { $statusCodeString = implode(', ', self::ORDER_STATUS); + throw new \Exception("Invalid order status, must be one of the '{$statusCodeString}'"); } - $orderId = $this->orderId; - $orderNumber = $this->order->number; + $orderId = $this->orderId; + $orderNumber = $this->order->number; $currentStatusCode = $this->order->status; $nextStatusCodes = collect($this->nextBackendStatuses())->pluck('status')->toArray(); - if (!in_array($statusCode, $nextStatusCodes)) { + if (! in_array($statusCode, $nextStatusCodes)) { throw new \Exception("Order {$orderId}({$orderNumber}) is {$currentStatusCode}, cannot be changed to $statusCode"); } } @@ -213,7 +226,6 @@ class StateMachineService return self::MACHINES[$oldStatus][$newStatus] ?? []; } - /** * 更新订单状态 * @@ -238,14 +250,13 @@ class StateMachineService { $history = new OrderHistory([ 'order_id' => $this->orderId, - 'status' => $newCode, - 'notify' => (int)$this->notify, - 'comment' => (string)$this->comment, + 'status' => $newCode, + 'notify' => (int) $this->notify, + 'comment' => (string) $this->comment, ]); $history->saveOrFail(); } - /** * 减扣库存 * @@ -255,7 +266,7 @@ class StateMachineService private function subStock($oldCode, $newCode) { $this->order->loadMissing([ - 'orderProducts.productSku' + 'orderProducts.productSku', ]); $orderProducts = $this->order->orderProducts; foreach ($orderProducts as $orderProduct) { @@ -267,52 +278,48 @@ class StateMachineService } } - /** * 添加发货单号 */ private function addShipment($oldCode, $newCode) { - $shipment = $this->shipment; - $expressCode = $shipment['express_code'] ?? ''; + $shipment = $this->shipment; + $expressCode = $shipment['express_code'] ?? ''; $expressCompany = $shipment['express_company'] ?? ''; - $expressNumber = $shipment['express_number'] ?? ''; + $expressNumber = $shipment['express_number'] ?? ''; if ($expressCode && $expressCompany && $expressNumber) { $orderShipment = new OrderShipment([ - 'order_id' => $this->orderId, - 'express_code' => $expressCode, + 'order_id' => $this->orderId, + 'express_code' => $expressCode, 'express_company' => $expressCompany, - 'express_number' => $expressNumber, + 'express_number' => $expressNumber, ]); $orderShipment->saveOrFail(); } } - /** * 发送新订单通知 */ private function notifyNewOrder($oldCode, $newCode) { - if (!$this->notify) { + if (! $this->notify) { return; } $this->order->notifyNewOrder(); } - /** * 发送订单状态更新通知 */ private function notifyUpdateOrder($oldCode, $newCode) { - if (!$this->notify) { + if (! $this->notify) { return; } $this->order->notifyUpdateOrder($oldCode); } - /** * 恢复库存 */ diff --git a/beike/Shop/Http/Controllers/Account/AccountController.php b/beike/Shop/Http/Controllers/Account/AccountController.php index 77140252..9d4f4a24 100644 --- a/beike/Shop/Http/Controllers/Account/AccountController.php +++ b/beike/Shop/Http/Controllers/Account/AccountController.php @@ -11,13 +11,13 @@ namespace Beike\Shop\Http\Controllers\Account; -use Beike\Repositories\OrderRepo; -use Illuminate\Support\Facades\Hash; use Beike\Repositories\CustomerRepo; +use Beike\Repositories\OrderRepo; use Beike\Shop\Http\Controllers\Controller; use Beike\Shop\Http\Requests\ForgottenRequest; -use Beike\Shop\Http\Resources\CustomerResource; use Beike\Shop\Http\Resources\Account\OrderList; +use Beike\Shop\Http\Resources\CustomerResource; +use Illuminate\Support\Facades\Hash; class AccountController extends Controller { @@ -29,10 +29,11 @@ class AccountController extends Controller public function index() { $customer = current_customer(); - $data = [ - 'customer' => new CustomerResource($customer), + $data = [ + 'customer' => new CustomerResource($customer), 'latest_orders' => OrderList::collection(OrderRepo::getLatestOrders($customer, 10)), ]; + return view('account/account', $data); } diff --git a/beike/Shop/Http/Controllers/Account/AddressController.php b/beike/Shop/Http/Controllers/Account/AddressController.php index 633ed6a6..f9236420 100644 --- a/beike/Shop/Http/Controllers/Account/AddressController.php +++ b/beike/Shop/Http/Controllers/Account/AddressController.php @@ -11,20 +11,20 @@ namespace Beike\Shop\Http\Controllers\Account; +use Beike\Repositories\AddressRepo; +use Beike\Repositories\CountryRepo; use Beike\Shop\Http\Controllers\Controller; use Beike\Shop\Http\Requests\AddressRequest; use Beike\Shop\Http\Resources\Account\AddressResource; -use Beike\Repositories\AddressRepo; use Beike\Shop\Services\AddressService; use Illuminate\Http\Request; -use Beike\Repositories\CountryRepo; class AddressController extends Controller { public function index(Request $request) { $addresses = AddressRepo::listByCustomer(current_customer()); - $data = [ + $data = [ 'countries' => CountryRepo::all(), 'addresses' => AddressResource::collection($addresses), ]; @@ -41,15 +41,17 @@ class AddressController extends Controller public function store(AddressRequest $request) { - $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'city_id', 'city', 'zipcode', 'address_1', 'address_2', 'default']); + $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'city_id', 'city', 'zipcode', 'address_1', 'address_2', 'default']); $address = AddressService::create($data); + return json_success(trans('common.created_success'), new AddressResource($address)); } public function update(AddressRequest $request, int $id) { - $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'city_id', 'city', 'zipcode', 'address_1', 'address_2', 'default']); + $data = $request->only(['name', 'phone', 'country_id', 'zone_id', 'city_id', 'city', 'zipcode', 'address_1', 'address_2', 'default']); $address = AddressService::update($id, $data); + return json_success(trans('common.updated_success'), new AddressResource($address)); } diff --git a/beike/Shop/Http/Controllers/Account/EditController.php b/beike/Shop/Http/Controllers/Account/EditController.php index 737ab391..e3cdb94d 100644 --- a/beike/Shop/Http/Controllers/Account/EditController.php +++ b/beike/Shop/Http/Controllers/Account/EditController.php @@ -12,20 +12,20 @@ namespace Beike\Shop\Http\Controllers\Account; use Beike\Repositories\CustomerRepo; -use Illuminate\Http\RedirectResponse; -use Beike\Shop\Http\Requests\EditRequest; use Beike\Shop\Http\Controllers\Controller; +use Beike\Shop\Http\Requests\EditRequest; +use Illuminate\Http\RedirectResponse; class EditController extends Controller { public function index() { - $customer = current_customer(); + $customer = current_customer(); $data['customer'] = $customer; + return view('account/edit', $data); } - /** * 顾客修改个人信息 * @param EditRequest $request @@ -34,6 +34,7 @@ class EditController extends Controller public function update(EditRequest $request): RedirectResponse { CustomerRepo::update(current_customer(), $request->only('name', 'email', 'avatar')); + return redirect()->to(shop_route('account.edit.index'))->with('success', trans('common.edit_success')); } } diff --git a/beike/Shop/Http/Controllers/Account/ForgottenController.php b/beike/Shop/Http/Controllers/Account/ForgottenController.php index 9fd91d16..5cd05e0f 100644 --- a/beike/Shop/Http/Controllers/Account/ForgottenController.php +++ b/beike/Shop/Http/Controllers/Account/ForgottenController.php @@ -35,6 +35,7 @@ class ForgottenController public function sendVerifyCode(VerifyCodeRequest $request) { AccountService::sendVerifyCodeForForgotten($request->get('email'), 'email'); + return json_success(trans('shop/forgotten.verification_code_sent')); } diff --git a/beike/Shop/Http/Controllers/Account/LoginController.php b/beike/Shop/Http/Controllers/Account/LoginController.php index 41aa11b3..86552e40 100644 --- a/beike/Shop/Http/Controllers/Account/LoginController.php +++ b/beike/Shop/Http/Controllers/Account/LoginController.php @@ -13,13 +13,11 @@ namespace Beike\Shop\Http\Controllers\Account; use Beike\Models\Customer; use Beike\Repositories\CartRepo; -use Illuminate\Support\Facades\Auth; -use Beike\Shop\Http\Requests\LoginRequest; use Beike\Shop\Http\Controllers\Controller; -use Illuminate\Validation\UnauthorizedException; +use Beike\Shop\Http\Requests\LoginRequest; +use Illuminate\Support\Facades\Auth; use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException; class LoginController extends Controller { @@ -31,19 +29,21 @@ class LoginController extends Controller $loginData = [ 'social_buttons' => hook_filter('login.social.buttons', []), ]; + return view('account/login', $loginData); } public function store(LoginRequest $request) { $guestCartProduct = CartRepo::allCartProducts(0); - if (!auth(Customer::AUTH_GUARD)->attempt($request->only('email', 'password'))) { + if (! auth(Customer::AUTH_GUARD)->attempt($request->only('email', 'password'))) { throw new NotAcceptableHttpException(trans('shop/login.email_or_password_error')); } $customer = current_customer(); if ($customer && $customer->status != 1) { Auth::guard(Customer::AUTH_GUARD)->logout(); + throw new NotFoundHttpException(trans('shop/login.customer_inactive')); } diff --git a/beike/Shop/Http/Controllers/Account/LogoutController.php b/beike/Shop/Http/Controllers/Account/LogoutController.php index 796bea85..c80cbfc1 100644 --- a/beike/Shop/Http/Controllers/Account/LogoutController.php +++ b/beike/Shop/Http/Controllers/Account/LogoutController.php @@ -15,10 +15,7 @@ use Beike\Models\Customer; use Beike\Shop\Http\Controllers\Controller; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use function auth; -use function back; use function redirect; -use function view; class LogoutController extends Controller { diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index d79e4d16..5f845c76 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -11,14 +11,14 @@ namespace Beike\Shop\Http\Controllers\Account; -use Beike\Services\StateMachineService; -use Illuminate\Http\Request; use Beike\Repositories\OrderRepo; -use Illuminate\Contracts\View\View; -use Illuminate\Contracts\View\Factory; -use Beike\Shop\Services\PaymentService; +use Beike\Services\StateMachineService; use Beike\Shop\Http\Controllers\Controller; use Beike\Shop\Http\Resources\Account\OrderList; +use Beike\Shop\Services\PaymentService; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View; +use Illuminate\Http\Request; class OrderController extends Controller { @@ -32,10 +32,10 @@ class OrderController extends Controller { $filters = [ 'customer' => current_customer(), - 'status' => $request->get('status') + 'status' => $request->get('status'), ]; $orders = OrderRepo::filterOrders($filters); - $data = [ + $data = [ 'orders' => OrderList::collection($orders), ]; @@ -52,12 +52,12 @@ class OrderController extends Controller public function show(Request $request, $number): View { $customer = current_customer(); - $order = OrderRepo::getOrderByNumber($number, $customer); - $html = hook_filter('account_order_detail', ['order' => $order, 'html_items' => []]); + $order = OrderRepo::getOrderByNumber($number, $customer); + $html = hook_filter('account_order_detail', ['order' => $order, 'html_items' => []]); + return view('account/order_info', $html); } - /** * 订单提交成功页 * @@ -68,11 +68,11 @@ class OrderController extends Controller public function success(Request $request, $number): View { $customer = current_customer(); - $order = OrderRepo::getOrderByNumber($number, $customer); + $order = OrderRepo::getOrderByNumber($number, $customer); + return view('account/order_success', ['order' => $order]); } - /** * 订单支付页面 * @@ -84,11 +84,11 @@ class OrderController extends Controller public function pay(Request $request, $number) { $customer = current_customer(); - $order = OrderRepo::getOrderByNumber($number, $customer); + $order = OrderRepo::getOrderByNumber($number, $customer); + return (new PaymentService($order))->pay(); } - /** * 完成订单 * @@ -100,16 +100,16 @@ class OrderController extends Controller public function complete(Request $request, $number) { $customer = current_customer(); - $order = OrderRepo::getOrderByNumber($number, $customer); + $order = OrderRepo::getOrderByNumber($number, $customer); if (empty($order)) { throw new \Exception(trans('shop/order.invalid_order')); } $comment = trans('shop/order.confirm_order'); StateMachineService::getInstance($order)->changeStatus(StateMachineService::COMPLETED, $comment); + return json_success(trans('shop/account.order.completed')); } - /** * 取消订单 * @@ -121,12 +121,13 @@ class OrderController extends Controller public function cancel(Request $request, $number) { $customer = current_customer(); - $order = OrderRepo::getOrderByNumber($number, $customer); + $order = OrderRepo::getOrderByNumber($number, $customer); if (empty($order)) { throw new \Exception(trans('shop/order.invalid_order')); } $comment = trans('shop/order.cancel_order'); StateMachineService::getInstance($order)->changeStatus(StateMachineService::CANCELLED, $comment); + return json_success(trans('shop/account.order.cancelled')); } } diff --git a/beike/Shop/Http/Controllers/Account/RegisterController.php b/beike/Shop/Http/Controllers/Account/RegisterController.php index 9e3318cb..9781ffd0 100644 --- a/beike/Shop/Http/Controllers/Account/RegisterController.php +++ b/beike/Shop/Http/Controllers/Account/RegisterController.php @@ -12,11 +12,9 @@ namespace Beike\Shop\Http\Controllers\Account; use Beike\Models\Customer; -use Beike\Shop\Services\AccountService; use Beike\Shop\Http\Controllers\Controller; use Beike\Shop\Http\Requests\RegisterRequest; -use Illuminate\Support\Facades\Hash; -use function redirect; +use Beike\Shop\Services\AccountService; use function view; class RegisterController extends Controller diff --git a/beike/Shop/Http/Controllers/Account/RmaController.php b/beike/Shop/Http/Controllers/Account/RmaController.php index a9f6f7a3..4fbb623e 100644 --- a/beike/Shop/Http/Controllers/Account/RmaController.php +++ b/beike/Shop/Http/Controllers/Account/RmaController.php @@ -12,6 +12,7 @@ namespace Beike\Shop\Http\Controllers\Account; use App\Http\Controllers\Controller; +use Beike\Repositories\OrderProductRepo; use Beike\Repositories\RmaReasonRepo; use Beike\Repositories\RmaRepo; use Beike\Shop\Http\Requests\RmaRequest; @@ -20,7 +21,6 @@ use Beike\Shop\Services\RmaService; use Illuminate\Contracts\Foundation\Application; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; -use Beike\Repositories\OrderProductRepo; class RmaController extends Controller { @@ -41,13 +41,13 @@ class RmaController extends Controller */ public function show(int $id) { - $rma = RmaRepo::find($id); + $rma = RmaRepo::find($id); $data = [ - 'rma' => $rma, + 'rma' => $rma, 'orderProduct' => OrderProductRepo::find($rma->order_product_id), - 'statuses' => RmaRepo::getStatuses(), - 'reasons' => RmaReasonDetail::collection(RmaReasonRepo::list())->jsonSerialize(), - 'types' => RmaRepo::getTypes(), + 'statuses' => RmaRepo::getStatuses(), + 'reasons' => RmaReasonDetail::collection(RmaReasonRepo::list())->jsonSerialize(), + 'types' => RmaRepo::getTypes(), ]; return view('account/rmas/info', $data); @@ -57,9 +57,9 @@ class RmaController extends Controller { $data = [ 'orderProduct' => OrderProductRepo::find($orderProductId), - 'statuses' => RmaRepo::getStatuses(), - 'reasons' => RmaReasonDetail::collection(RmaReasonRepo::list())->jsonSerialize(), - 'types' => RmaRepo::getTypes(), + 'statuses' => RmaRepo::getStatuses(), + 'reasons' => RmaReasonDetail::collection(RmaReasonRepo::list())->jsonSerialize(), + 'types' => RmaRepo::getTypes(), ]; return view('account/rmas/form', $data); diff --git a/beike/Shop/Http/Controllers/Account/WishlistController.php b/beike/Shop/Http/Controllers/Account/WishlistController.php index 012bbf73..6371b01b 100644 --- a/beike/Shop/Http/Controllers/Account/WishlistController.php +++ b/beike/Shop/Http/Controllers/Account/WishlistController.php @@ -11,17 +11,17 @@ namespace Beike\Shop\Http\Controllers\Account; -use Illuminate\Http\Request; use Beike\Repositories\CustomerRepo; use Beike\Shop\Http\Controllers\Controller; use Beike\Shop\Http\Resources\Account\WishlistDetail; +use Illuminate\Http\Request; class WishlistController extends Controller { public function index() { $wishlists = CustomerRepo::wishlists(current_customer()); - $data = [ + $data = [ 'wishlist' => WishlistDetail::collection($wishlists)->jsonSerialize(), ]; @@ -31,7 +31,7 @@ class WishlistController extends Controller public function add(Request $request): array { $productId = $request->get('product_id'); - $wishlist = CustomerRepo::addToWishlist(current_customer(), $productId); + $wishlist = CustomerRepo::addToWishlist(current_customer(), $productId); return json_success(trans('shop/wishlist.add_wishlist_success'), $wishlist); } @@ -43,5 +43,4 @@ class WishlistController extends Controller return json_success(trans('shop/wishlist.remove_wishlist_success')); } - } diff --git a/beike/Shop/Http/Controllers/BrandController.php b/beike/Shop/Http/Controllers/BrandController.php index 7b30165b..808be12e 100644 --- a/beike/Shop/Http/Controllers/BrandController.php +++ b/beike/Shop/Http/Controllers/BrandController.php @@ -2,16 +2,16 @@ namespace Beike\Shop\Http\Controllers; -use Illuminate\Http\Request; use Beike\Repositories\BrandRepo; use Beike\Shop\Http\Resources\ProductSimple; +use Illuminate\Http\Request; class BrandController extends Controller { public function index() { $brands = BrandRepo::listGroupByFirst(); - $data = [ + $data = [ 'brands' => $brands, ]; @@ -20,18 +20,18 @@ class BrandController extends Controller public function show(int $id) { - $brand = BrandRepo::find($id); + $brand = BrandRepo::find($id); $products = $brand->products() ->with([ 'master_sku', 'description', - 'inCurrentWishlist' + 'inCurrentWishlist', ]) ->paginate(perPage()); $data = [ - 'brand' => $brand, - 'products' => $products, + 'brand' => $brand, + 'products' => $products, 'products_format' => ProductSimple::collection($products)->jsonSerialize(), ]; diff --git a/beike/Shop/Http/Controllers/CartController.php b/beike/Shop/Http/Controllers/CartController.php index 19572b86..2664f16e 100644 --- a/beike/Shop/Http/Controllers/CartController.php +++ b/beike/Shop/Http/Controllers/CartController.php @@ -4,9 +4,9 @@ namespace Beike\Shop\Http\Controllers; use Beike\Models\ProductSku; use Beike\Shop\Http\Requests\CartRequest; -use Illuminate\Http\Request; -use Illuminate\Contracts\View\View; use Beike\Shop\Services\CartService; +use Illuminate\Contracts\View\View; +use Illuminate\Http\Request; class CartController extends Controller { @@ -16,9 +16,10 @@ class CartController extends Controller public function index(): View { $data = [ - 'data' => CartService::reloadData() + 'data' => CartService::reloadData(), ]; - return view("cart/cart", $data); + + return view('cart/cart', $data); } /** @@ -30,15 +31,15 @@ class CartController extends Controller */ public function select(Request $request): array { - $cartIds = $request->get('cart_ids'); + $cartIds = $request->get('cart_ids'); $customer = current_customer(); CartService::select($customer, $cartIds); $data = CartService::reloadData(); + return json_success(trans('common.updated_success'), $data); } - /** * POST /carts {sku_id:1, quantity: 2} * 创建购物车 @@ -49,9 +50,9 @@ class CartController extends Controller */ public function store(CartRequest $request) { - $skuId = $request->sku_id; - $quantity = $request->quantity ?? 1; - $buyNow = (bool)$request->buy_now ?? false; + $skuId = $request->sku_id; + $quantity = $request->quantity ?? 1; + $buyNow = (bool) $request->buy_now ?? false; $customer = current_customer(); $sku = ProductSku::query() @@ -62,10 +63,10 @@ class CartController extends Controller if ($buyNow) { CartService::select($customer, [$cart->id]); } + return json_success(trans('shop/carts.added_to_cart'), $cart); } - /** * PUT /carts/{cart_id} {sku_id:1, quantity: 2} * @param CartRequest $request @@ -75,14 +76,14 @@ class CartController extends Controller public function update(CartRequest $request, $cartId): array { $customer = current_customer(); - $quantity = (int)$request->get('quantity'); + $quantity = (int) $request->get('quantity'); CartService::updateQuantity($customer, $cartId, $quantity); $data = CartService::reloadData(); + return json_success(trans('common.updated_success'), $data); } - /** * DELETE /carts/{cart_id} * @param Request $request @@ -95,21 +96,21 @@ class CartController extends Controller CartService::delete($customer, $cartId); $data = CartService::reloadData(); + return json_success(trans('common.deleted_success'), $data); } - /** * 右上角购物车 * @return mixed */ public function miniCart() { - $carts = CartService::list(current_customer()); + $carts = CartService::list(current_customer()); $reloadData = CartService::reloadData($carts); - $data['html'] = view('cart/mini', $reloadData)->render(); - $data['quantity'] = $reloadData['quantity']; + $data['html'] = view('cart/mini', $reloadData)->render(); + $data['quantity'] = $reloadData['quantity']; $data['quantity_all'] = $reloadData['quantity_all']; return json_success(trans('common.success'), $data); diff --git a/beike/Shop/Http/Controllers/CategoryController.php b/beike/Shop/Http/Controllers/CategoryController.php index 24e1f937..d44c88cf 100644 --- a/beike/Shop/Http/Controllers/CategoryController.php +++ b/beike/Shop/Http/Controllers/CategoryController.php @@ -3,9 +3,9 @@ namespace Beike\Shop\Http\Controllers; use Beike\Models\Category; -use Illuminate\Http\Request; -use Beike\Repositories\ProductRepo; use Beike\Repositories\CategoryRepo; +use Beike\Repositories\ProductRepo; +use Illuminate\Http\Request; class CategoryController extends Controller { @@ -21,9 +21,9 @@ class CategoryController extends Controller $category->load('description'); $data = [ - 'category' => $category, + 'category' => $category, 'products_format' => $products->jsonSerialize(), - 'products' => $products, + 'products' => $products, ]; return view('category', $data); diff --git a/beike/Shop/Http/Controllers/CheckoutController.php b/beike/Shop/Http/Controllers/CheckoutController.php index 36e3ca75..10497a4b 100644 --- a/beike/Shop/Http/Controllers/CheckoutController.php +++ b/beike/Shop/Http/Controllers/CheckoutController.php @@ -11,8 +11,8 @@ namespace Beike\Shop\Http\Controllers; -use Illuminate\Http\Request; use Beike\Shop\Services\CheckoutService; +use Illuminate\Http\Request; class CheckoutController extends Controller { @@ -20,13 +20,13 @@ class CheckoutController extends Controller { try { $data = (new CheckoutService)->checkoutData(); + return view('checkout', $data); } catch (\Exception $e) { return redirect(shop_route('carts.index'))->withErrors(['error' => $e->getMessage()]); } } - /** * 更改结算信息 * @@ -37,13 +37,13 @@ class CheckoutController extends Controller { try { $requestData = $request->all(); + return (new CheckoutService)->update($requestData); } catch (\Exception $e) { return json_fail($e->getMessage()); } } - /** * 确认提交订单 * diff --git a/beike/Shop/Http/Controllers/Controller.php b/beike/Shop/Http/Controllers/Controller.php index 552054dd..1724858a 100644 --- a/beike/Shop/Http/Controllers/Controller.php +++ b/beike/Shop/Http/Controllers/Controller.php @@ -9,5 +9,4 @@ use Illuminate\Foundation\Validation\ValidatesRequests; class Controller extends \App\Http\Controllers\Controller { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; - } diff --git a/beike/Shop/Http/Controllers/CurrencyController.php b/beike/Shop/Http/Controllers/CurrencyController.php index 60328751..8b2a95f7 100644 --- a/beike/Shop/Http/Controllers/CurrencyController.php +++ b/beike/Shop/Http/Controllers/CurrencyController.php @@ -11,8 +11,8 @@ namespace Beike\Shop\Http\Controllers; -use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\Redirect; +use Illuminate\Support\Facades\Session; class CurrencyController extends Controller { @@ -21,6 +21,7 @@ class CurrencyController extends Controller if (in_array($lang, currencies()->where('status', true)->pluck('code')->toArray())) { Session::put('currency', $lang); } + return Redirect::back(); } } diff --git a/beike/Shop/Http/Controllers/FileController.php b/beike/Shop/Http/Controllers/FileController.php index 188656f4..7025ad68 100644 --- a/beike/Shop/Http/Controllers/FileController.php +++ b/beike/Shop/Http/Controllers/FileController.php @@ -14,7 +14,7 @@ class FileController extends Controller $path = $file->store($type . '/', 'upload'); return json_success(trans('shop/file.uploaded_success'), [ - 'url' => asset('upload/' . $path), + 'url' => asset('upload/' . $path), 'value' => 'upload/' . $path, ]); } diff --git a/beike/Shop/Http/Controllers/HomeController.php b/beike/Shop/Http/Controllers/HomeController.php index ca58df77..cdaec727 100644 --- a/beike/Shop/Http/Controllers/HomeController.php +++ b/beike/Shop/Http/Controllers/HomeController.php @@ -16,20 +16,20 @@ class HomeController extends Controller public function index(): View { $designSettings = system_setting('base.design_setting'); - $modules = $designSettings['modules'] ?? []; + $modules = $designSettings['modules'] ?? []; $moduleItems = []; foreach ($modules as $module) { - $code = $module['code']; + $code = $module['code']; $moduleId = $module['module_id'] ?? ''; - $content = $module['content']; + $content = $module['content']; $viewPath = "design.{$code}"; if (view()->exists($viewPath) && $moduleId) { $moduleItems[] = [ - 'code' => $code, + 'code' => $code, 'module_id' => $moduleId, 'view_path' => $viewPath, - 'content' => DesignService::handleModuleContent($code, $content) + 'content' => DesignService::handleModuleContent($code, $content), ]; } } diff --git a/beike/Shop/Http/Controllers/LanguageController.php b/beike/Shop/Http/Controllers/LanguageController.php index c60d41e2..f4096967 100644 --- a/beike/Shop/Http/Controllers/LanguageController.php +++ b/beike/Shop/Http/Controllers/LanguageController.php @@ -21,6 +21,7 @@ class LanguageController extends Controller if (in_array($lang, languages()->toArray())) { Session::put('locale', $lang); } + return Redirect::back(); } } diff --git a/beike/Shop/Http/Controllers/PageController.php b/beike/Shop/Http/Controllers/PageController.php index 6ee5a7bb..b0665be1 100644 --- a/beike/Shop/Http/Controllers/PageController.php +++ b/beike/Shop/Http/Controllers/PageController.php @@ -11,7 +11,6 @@ namespace Beike\Shop\Http\Controllers; - use Beike\Models\Page; use Beike\Shop\Http\Resources\PageDetail; @@ -21,7 +20,7 @@ class PageController extends Controller { $page->load('description'); $data = [ - 'page' => (new PageDetail($page))->jsonSerialize() + 'page' => (new PageDetail($page))->jsonSerialize(), ]; return view('pages/detail', $data); diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php index 1b255303..061fa7db 100644 --- a/beike/Shop/Http/Controllers/ProductController.php +++ b/beike/Shop/Http/Controllers/ProductController.php @@ -3,10 +3,10 @@ namespace Beike\Shop\Http\Controllers; use Beike\Models\Product; -use Illuminate\Http\Request; use Beike\Repositories\ProductRepo; -use Beike\Shop\Http\Resources\ProductSimple; use Beike\Shop\Http\Resources\ProductDetail; +use Beike\Shop\Http\Resources\ProductSimple; +use Illuminate\Http\Request; class ProductController extends Controller { @@ -19,16 +19,16 @@ class ProductController extends Controller public function show(Request $request, Product $product) { $relationIds = $product->relations->pluck('id')->toArray(); - $product = ProductRepo::getProductDetail($product); - $data = [ - 'product' => (new ProductDetail($product))->jsonSerialize(), + $product = ProductRepo::getProductDetail($product); + $data = [ + 'product' => (new ProductDetail($product))->jsonSerialize(), 'relations' => ProductRepo::getProductsByIds($relationIds)->jsonSerialize(), ]; $data = hook_filter('product.show', $data); + return view('product', $data); } - /** * 通过关键字搜索商品 * @@ -37,7 +37,7 @@ class ProductController extends Controller */ public function search(Request $request) { - $keyword = $request->get('keyword'); + $keyword = $request->get('keyword'); $products = ProductRepo::getBuilder(['keyword' => $keyword]) ->where('active', true) ->paginate(perPage()) @@ -45,7 +45,7 @@ class ProductController extends Controller $data = [ 'products' => $products, - 'items' => ProductSimple::collection($products)->jsonSerialize(), + 'items' => ProductSimple::collection($products)->jsonSerialize(), ]; return view('search', $data); diff --git a/beike/Shop/Http/Requests/AddressRequest.php b/beike/Shop/Http/Requests/AddressRequest.php index d0084539..032ebdfe 100644 --- a/beike/Shop/Http/Requests/AddressRequest.php +++ b/beike/Shop/Http/Requests/AddressRequest.php @@ -24,22 +24,22 @@ class AddressRequest extends FormRequest public function rules() { return [ - 'name' => 'required|min:2|max:16', - 'phone' => 'required|min:6|max:16', + 'name' => 'required|min:2|max:16', + 'phone' => 'required|min:6|max:16', 'country_id' => 'required|exists:countries,id', - 'zone_id' => 'required|exists:zones,id', - 'address_1' => 'required', + 'zone_id' => 'required|exists:zones,id', + 'address_1' => 'required', ]; } public function attributes() { return [ - 'name' => trans('address.name'), - 'phone' => trans('address.phone'), + 'name' => trans('address.name'), + 'phone' => trans('address.phone'), 'country_id' => trans('address.country_id'), - 'zone_id' => trans('address.zone_id'), - 'address_1' => trans('address.address_1'), + 'zone_id' => trans('address.zone_id'), + 'address_1' => trans('address.address_1'), ]; } } diff --git a/beike/Shop/Http/Requests/CartRequest.php b/beike/Shop/Http/Requests/CartRequest.php index fc96e705..2a3ba067 100644 --- a/beike/Shop/Http/Requests/CartRequest.php +++ b/beike/Shop/Http/Requests/CartRequest.php @@ -33,24 +33,24 @@ class CartRequest extends FormRequest */ public function rules() { - $skuId = (int)$this->get('sku_id'); + $skuId = (int) $this->get('sku_id'); return [ - 'sku_id' => 'required|int', + 'sku_id' => 'required|int', 'quantity' => ['required', 'int', function ($attribute, $value, $fail) use ($skuId) { $skuQuantity = ProductSku::query()->where('id', $skuId)->value('quantity'); if ($value > $skuQuantity) { $fail(trans('cart.stock_out')); } }], - 'buy_now' => 'bool' + 'buy_now' => 'bool', ]; } public function attributes() { return [ - 'sku_id' => trans('cart.sku_id'), + 'sku_id' => trans('cart.sku_id'), 'quantity' => trans('cart.quantity'), ]; } diff --git a/beike/Shop/Http/Requests/EditRequest.php b/beike/Shop/Http/Requests/EditRequest.php index 44a5569d..839076b4 100644 --- a/beike/Shop/Http/Requests/EditRequest.php +++ b/beike/Shop/Http/Requests/EditRequest.php @@ -24,7 +24,7 @@ class EditRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|min:2|max:16', + 'name' => 'required|string|min:2|max:16', 'email' => 'required|email:rfc|unique:customers,email,' . current_customer()->id, ]; } @@ -32,7 +32,7 @@ class EditRequest extends FormRequest public function attributes() { return [ - 'name' => trans('shop/account.edit.name'), + 'name' => trans('shop/account.edit.name'), 'email' => trans('shop/account.edit.email'), ]; } diff --git a/beike/Shop/Http/Requests/LoginRequest.php b/beike/Shop/Http/Requests/LoginRequest.php index d0421a74..54b6bff2 100644 --- a/beike/Shop/Http/Requests/LoginRequest.php +++ b/beike/Shop/Http/Requests/LoginRequest.php @@ -24,7 +24,7 @@ class LoginRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc', + 'email' => 'required|email:rfc', 'password' => 'required', ]; } @@ -32,7 +32,7 @@ class LoginRequest extends FormRequest public function attributes() { return [ - 'email' => trans('shop/login.email_address'), + 'email' => trans('shop/login.email_address'), 'password' => trans('shop/login.password'), ]; } diff --git a/beike/Shop/Http/Requests/RegisterRequest.php b/beike/Shop/Http/Requests/RegisterRequest.php index 0212b5a2..cac166bb 100644 --- a/beike/Shop/Http/Requests/RegisterRequest.php +++ b/beike/Shop/Http/Requests/RegisterRequest.php @@ -24,7 +24,7 @@ class RegisterRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc|unique:customers,email', + 'email' => 'required|email:rfc|unique:customers,email', 'password' => 'required|confirmed', ]; } @@ -32,7 +32,7 @@ class RegisterRequest extends FormRequest public function attributes() { return [ - 'email' => trans('shop/login.email_address'), + 'email' => trans('shop/login.email_address'), 'password' => trans('shop/login.password'), ]; } diff --git a/beike/Shop/Http/Requests/RmaRequest.php b/beike/Shop/Http/Requests/RmaRequest.php index e68f06d3..a495cce2 100644 --- a/beike/Shop/Http/Requests/RmaRequest.php +++ b/beike/Shop/Http/Requests/RmaRequest.php @@ -34,11 +34,12 @@ class RmaRequest extends FormRequest { $rules = [ 'order_product_id' => 'required|exists:order_products,id', - 'quantity' => 'required', - 'opened' => 'required', - 'rma_reason_id' => 'required|exists:rma_reasons,id', - 'type' => 'required', + 'quantity' => 'required', + 'opened' => 'required', + 'rma_reason_id' => 'required|exists:rma_reasons,id', + 'type' => 'required', ]; + return $rules; } @@ -46,10 +47,10 @@ class RmaRequest extends FormRequest { return [ 'order_product_id' => trans('rma.order_product_id'), - 'quantity' => trans('rma.quantity'), - 'opened' => trans('rma.opened'), - 'rma_reason_id' => trans('rma.rma_reason_id'), - 'type' => trans('rma.type'), + 'quantity' => trans('rma.quantity'), + 'opened' => trans('rma.opened'), + 'rma_reason_id' => trans('rma.rma_reason_id'), + 'type' => trans('rma.type'), ]; } } diff --git a/beike/Shop/Http/Resources/Account/AddressResource.php b/beike/Shop/Http/Resources/Account/AddressResource.php index 97854291..1a9e04cf 100644 --- a/beike/Shop/Http/Resources/Account/AddressResource.php +++ b/beike/Shop/Http/Resources/Account/AddressResource.php @@ -9,24 +9,24 @@ class AddressResource extends JsonResource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable */ public function toArray($request) { $data = [ - 'id' => $this->id, - 'name' => $this->name, - 'phone' => $this->phone, + 'id' => $this->id, + 'name' => $this->name, + 'phone' => $this->phone, 'country_id' => $this->country_id, - 'country' => $this->country->name, - 'zone_id' => $this->zone_id, - 'zone' => $this->zone, - 'city' => $this->city, - 'zipcode' => $this->zipcode, - 'address_1' => $this->address_1, - 'address_2' => $this->address_2, - 'default' => (current_customer()->address_id == $this->id), + 'country' => $this->country->name, + 'zone_id' => $this->zone_id, + 'zone' => $this->zone, + 'city' => $this->city, + 'zipcode' => $this->zipcode, + 'address_1' => $this->address_1, + 'address_2' => $this->address_2, + 'default' => (current_customer()->address_id == $this->id), ]; return $data; diff --git a/beike/Shop/Http/Resources/Account/OrderList.php b/beike/Shop/Http/Resources/Account/OrderList.php index dc006cc6..f1c905f2 100644 --- a/beike/Shop/Http/Resources/Account/OrderList.php +++ b/beike/Shop/Http/Resources/Account/OrderList.php @@ -18,7 +18,7 @@ class OrderList extends JsonResource public function toArray($request): array { $data = [ - 'id' => $this->id, + 'id' => $this->id, 'number' => $this->number, ]; diff --git a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php index 75648d16..116e91e9 100644 --- a/beike/Shop/Http/Resources/Account/RmaReasonDetail.php +++ b/beike/Shop/Http/Resources/Account/RmaReasonDetail.php @@ -18,7 +18,7 @@ class RmaReasonDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, + 'id' => $this->id, 'name' => json_decode($this->name, true)[locale()] ?? '', ]; } diff --git a/beike/Shop/Http/Resources/Account/WishlistDetail.php b/beike/Shop/Http/Resources/Account/WishlistDetail.php index 0f278e1b..c4335432 100644 --- a/beike/Shop/Http/Resources/Account/WishlistDetail.php +++ b/beike/Shop/Http/Resources/Account/WishlistDetail.php @@ -20,17 +20,17 @@ class WishlistDetail extends JsonResource */ public function toArray($request): array { - $product = $this->product; - $masterSku = $product->master_sku; - $image = $this->product->image ?: $masterSku->image; + $product = $this->product; + $masterSku = $product->master_sku; + $image = $this->product->image ?: $masterSku->image; $productName = $product->description->name ?? ''; $data = [ - 'id' => $this->id, - 'product_id' => $this->product_id, - 'image' => image_resize($image), - 'product_name' => sub_string($productName,24), - 'price' => currency_format($masterSku->price) + 'id' => $this->id, + 'product_id' => $this->product_id, + 'image' => image_resize($image), + 'product_name' => sub_string($productName, 24), + 'price' => currency_format($masterSku->price), ]; return $data; diff --git a/beike/Shop/Http/Resources/BrandDetail.php b/beike/Shop/Http/Resources/BrandDetail.php index bcbbb83b..a5e86222 100644 --- a/beike/Shop/Http/Resources/BrandDetail.php +++ b/beike/Shop/Http/Resources/BrandDetail.php @@ -21,12 +21,12 @@ class BrandDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'name' => $this->name, - 'logo' => image_origin($this->logo), + 'id' => $this->id, + 'name' => $this->name, + 'logo' => image_origin($this->logo), 'sort_order' => $this->sort_order, - 'url'=> shop_route('brands.show', $this->id), - 'first' => $this->first, + 'url' => shop_route('brands.show', $this->id), + 'first' => $this->first, ]; } } diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php index 839ed654..e8645b68 100644 --- a/beike/Shop/Http/Resources/CartDetail.php +++ b/beike/Shop/Http/Resources/CartDetail.php @@ -2,8 +2,8 @@ namespace Beike\Shop\Http\Resources; -use Illuminate\Http\Request; use Illuminate\Contracts\Support\Arrayable; +use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; class CartDetail extends JsonResource @@ -17,32 +17,32 @@ class CartDetail extends JsonResource */ public function toArray($request) { - $sku = $this->sku; - $product = $sku->product; - $price = $sku->price; - $skuCode = $sku->sku; + $sku = $this->sku; + $product = $sku->product; + $price = $sku->price; + $skuCode = $sku->sku; $description = $product->description; $productName = $description->name; - $subTotal = $price * $this->quantity; - $image = $sku->image ?: $product->image; + $subTotal = $price * $this->quantity; + $image = $sku->image ?: $product->image; return [ - 'cart_id' => $this->id, - 'product_id' => $this->product_id, - 'sku_id' => $this->product_sku_id, - 'product_sku' => $skuCode, - 'name' => $productName, - 'name_format' => sub_string($productName), - 'image' => $image, - 'image_url' => image_resize($image), - 'quantity' => $this->quantity, - 'selected' => $this->selected, - 'price' => $price, - 'price_format' => currency_format($price), - 'tax_class_id' => $product->tax_class_id, - 'subtotal' => $subTotal, + 'cart_id' => $this->id, + 'product_id' => $this->product_id, + 'sku_id' => $this->product_sku_id, + 'product_sku' => $skuCode, + 'name' => $productName, + 'name_format' => sub_string($productName), + 'image' => $image, + 'image_url' => image_resize($image), + 'quantity' => $this->quantity, + 'selected' => $this->selected, + 'price' => $price, + 'price_format' => currency_format($price), + 'tax_class_id' => $product->tax_class_id, + 'subtotal' => $subTotal, 'subtotal_format' => currency_format($subTotal), - 'variant_labels' => trim($sku->getVariantLabel()), + 'variant_labels' => trim($sku->getVariantLabel()), ]; } } diff --git a/beike/Shop/Http/Resources/CategoryDetail.php b/beike/Shop/Http/Resources/CategoryDetail.php index 6ce3e36e..8e3901cf 100644 --- a/beike/Shop/Http/Resources/CategoryDetail.php +++ b/beike/Shop/Http/Resources/CategoryDetail.php @@ -16,9 +16,9 @@ class CategoryDetail extends JsonResource public function toArray($request): array { $item = [ - 'id' => $this->id, + 'id' => $this->id, 'name' => $this->description->name ?? '', - 'url' => shop_route('categories.show', ['category' => $this]) + 'url' => shop_route('categories.show', ['category' => $this]), ]; if ($this->relationLoaded('children') && $this->children->count() > 0) { @@ -26,6 +26,7 @@ class CategoryDetail extends JsonResource } else { $item['children'] = []; } + return $item; } } diff --git a/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php b/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php index 0e07948a..39e8acd8 100644 --- a/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php +++ b/beike/Shop/Http/Resources/Checkout/PaymentMethodItem.php @@ -17,12 +17,13 @@ class PaymentMethodItem extends JsonResource public function toArray($request): array { $pluginSetting = $this->plugin; + return [ - 'type' => $this->type, - 'code' => $this->code, - 'name' => $pluginSetting->name, + 'type' => $this->type, + 'code' => $this->code, + 'name' => $pluginSetting->name, 'description' => $pluginSetting->description, - 'icon' => plugin_resize($this->code, $pluginSetting->icon), + 'icon' => plugin_resize($this->code, $pluginSetting->icon), ]; } } diff --git a/beike/Shop/Http/Resources/Checkout/ShippingMethodItem.php b/beike/Shop/Http/Resources/Checkout/ShippingMethodItem.php index a0184511..252c714b 100644 --- a/beike/Shop/Http/Resources/Checkout/ShippingMethodItem.php +++ b/beike/Shop/Http/Resources/Checkout/ShippingMethodItem.php @@ -17,12 +17,13 @@ class ShippingMethodItem extends JsonResource public function toArray($request): array { $pluginSetting = $this->plugin; + return [ - 'type' => $this->type, - 'code' => $this->code, - 'name' => $pluginSetting->name, + 'type' => $this->type, + 'code' => $this->code, + 'name' => $pluginSetting->name, 'description' => $pluginSetting->description, - 'icon' => plugin_resize($this->code, $pluginSetting->icon), + 'icon' => plugin_resize($this->code, $pluginSetting->icon), ]; } } diff --git a/beike/Shop/Http/Resources/CustomerResource.php b/beike/Shop/Http/Resources/CustomerResource.php index 4225e8f2..c8500170 100644 --- a/beike/Shop/Http/Resources/CustomerResource.php +++ b/beike/Shop/Http/Resources/CustomerResource.php @@ -17,12 +17,12 @@ class CustomerResource extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'name' => $this->name, - 'email' => $this->email, - 'status' => $this->status ? trans('common.enable') : trans('common.disable'), - 'avatar' => image_resize($this->avatar), - 'from' => $this->from, + 'id' => $this->id, + 'name' => $this->name, + 'email' => $this->email, + 'status' => $this->status ? trans('common.enable') : trans('common.disable'), + 'avatar' => image_resize($this->avatar), + 'from' => $this->from, 'customer_group_name' => $this->customer_group_name, ]; } diff --git a/beike/Shop/Http/Resources/PageDetail.php b/beike/Shop/Http/Resources/PageDetail.php index ef17bcf2..a8d688fd 100644 --- a/beike/Shop/Http/Resources/PageDetail.php +++ b/beike/Shop/Http/Resources/PageDetail.php @@ -24,17 +24,18 @@ class PageDetail extends JsonResource public function toArray($request): array { $description = $this->description; + return [ - 'id' => $this->id, - 'active' => $this->active, - 'title' => $description->title, - 'title_format' => sub_string($description->title), - 'content' => $description->content, - 'meta_title' => $description->meta_title, + 'id' => $this->id, + 'active' => $this->active, + 'title' => $description->title, + 'title_format' => sub_string($description->title), + 'content' => $description->content, + 'meta_title' => $description->meta_title, 'meta_description' => $description->meta_description, - 'meta_keywords' => $description->meta_keywords, - 'created_at' => time_format($this->created_at), - 'updated_at' => time_format($this->updated_at), + 'meta_keywords' => $description->meta_keywords, + 'created_at' => time_format($this->created_at), + 'updated_at' => time_format($this->updated_at), ]; } } diff --git a/beike/Shop/Http/Resources/ProductDetail.php b/beike/Shop/Http/Resources/ProductDetail.php index 1f70225f..42239dd5 100644 --- a/beike/Shop/Http/Resources/ProductDetail.php +++ b/beike/Shop/Http/Resources/ProductDetail.php @@ -11,7 +11,6 @@ namespace Beike\Shop\Http\Resources; -use Beike\Repositories\CustomerRepo; use Illuminate\Http\Resources\Json\JsonResource; class ProductDetail extends JsonResource @@ -22,36 +21,35 @@ class ProductDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'name' => $this->description->name ?? '', - 'description' => $this->description->content ?? '', - 'meta_title' => $this->description->meta_title ?? '', - 'meta_keywords' => $this->description->meta_keywords ?? '', + 'id' => $this->id, + 'name' => $this->description->name ?? '', + 'description' => $this->description->content ?? '', + 'meta_title' => $this->description->meta_title ?? '', + 'meta_keywords' => $this->description->meta_keywords ?? '', 'meta_description' => $this->description->meta_description ?? '', - 'brand_id' => $this->brand->id ?? 0, - 'brand_name' => $this->brand->name ?? '', - 'images' => array_map(function ($image) { + 'brand_id' => $this->brand->id ?? 0, + 'brand_name' => $this->brand->name ?? '', + 'images' => array_map(function ($image) { return [ 'preview' => image_resize($image, 500, 500), - 'popup' => image_resize($image, 800, 800), - 'thumb' => image_resize($image, 150, 150) + 'popup' => image_resize($image, 800, 800), + 'thumb' => image_resize($image, 150, 150), ]; }, $this->images ?? []), - 'attributes' => $this->attributes->map(function ($attribute) { + 'attributes' => $this->attributes->map(function ($attribute) { return [ - 'attribute' => $attribute->attribute->description->name, + 'attribute' => $attribute->attribute->description->name, 'attribute_value' => $attribute->attributeValue->description->name, ]; })->toArray(), - 'category_id' => $this->category_id ?? null, - 'variables' => $this->decodeVariables($this->variables), - 'skus' => SkuDetail::collection($this->skus)->jsonSerialize(), - 'in_wishlist' => $this->inCurrentWishlist->id ?? 0, - 'active' => (bool)$this->active, + 'category_id' => $this->category_id ?? null, + 'variables' => $this->decodeVariables($this->variables), + 'skus' => SkuDetail::collection($this->skus)->jsonSerialize(), + 'in_wishlist' => $this->inCurrentWishlist->id ?? 0, + 'active' => (bool) $this->active, ]; } - /** * 处理多规格商品数据 * @@ -65,12 +63,13 @@ class ProductDetail extends JsonResource if (empty($variables)) { return []; } + return array_map(function ($item) use ($lang) { return [ - 'name' => $item['name'][$lang] ?? '', + 'name' => $item['name'][$lang] ?? '', 'values' => array_map(function ($item) use ($lang) { return [ - 'name' => $item['name'][$lang] ?? '', + 'name' => $item['name'][$lang] ?? '', 'image' => $item['image'] ? image_resize($item['image']) : '', ]; }, $item['values']), diff --git a/beike/Shop/Http/Resources/ProductSimple.php b/beike/Shop/Http/Resources/ProductSimple.php index 02cca8b0..6c41d190 100644 --- a/beike/Shop/Http/Resources/ProductSimple.php +++ b/beike/Shop/Http/Resources/ProductSimple.php @@ -38,19 +38,19 @@ class ProductSimple extends JsonResource } return [ - 'id' => $this->id, - 'sku_id' => $masterSku->id, - 'name' => $name, - 'name_format' => $name, - 'url' => shop_route('products.show', ['product' => $this]), - 'price' => $masterSku->price, - 'origin_price' => $masterSku->origin_price, - 'price_format' => currency_format($masterSku->price), + 'id' => $this->id, + 'sku_id' => $masterSku->id, + 'name' => $name, + 'name_format' => $name, + 'url' => shop_route('products.show', ['product' => $this]), + 'price' => $masterSku->price, + 'origin_price' => $masterSku->origin_price, + 'price_format' => currency_format($masterSku->price), 'origin_price_format' => currency_format($masterSku->origin_price), - 'category_id' => $this->category_id ?? null, - 'in_wishlist' => $this->inCurrentWishlist->id ?? 0, + 'category_id' => $this->category_id ?? null, + 'in_wishlist' => $this->inCurrentWishlist->id ?? 0, - 'images' => array_map(function ($item) { + 'images' => array_map(function ($item) { return image_resize($item, 400, 400); }, $images), ]; diff --git a/beike/Shop/Http/Resources/RmaDetail.php b/beike/Shop/Http/Resources/RmaDetail.php index e2555f57..7689b541 100644 --- a/beike/Shop/Http/Resources/RmaDetail.php +++ b/beike/Shop/Http/Resources/RmaDetail.php @@ -18,7 +18,7 @@ class RmaDetail extends JsonResource { public function toArray($request): array { - $types = RmaRepo::getTypes(); + $types = RmaRepo::getTypes(); $statuses = RmaRepo::getStatuses(); if ($this->reason) { @@ -26,22 +26,23 @@ class RmaDetail extends JsonResource } else { $reason = ''; } + return [ - 'id' => $this->id, + 'id' => $this->id, 'order_product_id' => $this->order_product_id, - 'quantity' => $this->quantity, - 'opened' => $this->opened, - 'type' => $types[$this->type], - 'comment' => $this->comment, - 'status' => $statuses[$this->status], - 'created_at' => time_format($this->created_at), - 'email' => $this->email, - 'telephone' => $this->telephone, - 'product_name' => $this->product_name, - 'name' => $this->name, - 'sku' => $this->sku, - 'reason' => $reason, - 'type_text' => $this->type_text, + 'quantity' => $this->quantity, + 'opened' => $this->opened, + 'type' => $types[$this->type], + 'comment' => $this->comment, + 'status' => $statuses[$this->status], + 'created_at' => time_format($this->created_at), + 'email' => $this->email, + 'telephone' => $this->telephone, + 'product_name' => $this->product_name, + 'name' => $this->name, + 'sku' => $this->sku, + 'reason' => $reason, + 'type_text' => $this->type_text, ]; } } diff --git a/beike/Shop/Http/Resources/SkuDetail.php b/beike/Shop/Http/Resources/SkuDetail.php index 5faf8fbe..6f315747 100644 --- a/beike/Shop/Http/Resources/SkuDetail.php +++ b/beike/Shop/Http/Resources/SkuDetail.php @@ -18,24 +18,24 @@ class SkuDetail extends JsonResource public function toArray($request): array { return [ - 'id' => $this->id, - 'variants' => $this->variants ?: [], - 'position' => $this->position, - 'images' => array_map(function ($image) { + 'id' => $this->id, + 'variants' => $this->variants ?: [], + 'position' => $this->position, + 'images' => array_map(function ($image) { return [ 'preview' => image_resize($image, 500, 500), - 'popup' => image_resize($image, 800, 800), - 'thumb' => image_resize($image, 150, 150) + 'popup' => image_resize($image, 800, 800), + 'thumb' => image_resize($image, 150, 150), ]; }, $this->images ?? []), - 'model' => $this->model, - 'sku' => $this->sku, - 'price' => $this->price, - 'price_format' => currency_format($this->price), - 'origin_price' => $this->origin_price, + 'model' => $this->model, + 'sku' => $this->sku, + 'price' => $this->price, + 'price_format' => currency_format($this->price), + 'origin_price' => $this->origin_price, 'origin_price_format' => currency_format($this->origin_price), - 'quantity' => $this->quantity, - 'is_default' => $this->is_default, + 'quantity' => $this->quantity, + 'is_default' => $this->is_default, ]; } } diff --git a/beike/Shop/Providers/PluginServiceProvider.php b/beike/Shop/Providers/PluginServiceProvider.php index 59b10347..f76594ea 100644 --- a/beike/Shop/Providers/PluginServiceProvider.php +++ b/beike/Shop/Providers/PluginServiceProvider.php @@ -11,8 +11,8 @@ namespace Beike\Shop\Providers; -use Beike\Plugin\Manager; use Beike\Models\AdminUser; +use Beike\Plugin\Manager; use Illuminate\Support\Facades\Route; use Illuminate\Support\ServiceProvider; @@ -32,17 +32,16 @@ class PluginServiceProvider extends ServiceProvider }); } - /** * Bootstrap Plugin Service Provider */ public function boot() { - if (!installed()) { + if (! installed()) { return; } - $manager = app('plugin'); - $plugins = $manager->getEnabledPlugins(); + $manager = app('plugin'); + $plugins = $manager->getEnabledPlugins(); $this->pluginBasePath = base_path('plugins'); foreach ($plugins as $plugin) { @@ -59,7 +58,6 @@ class PluginServiceProvider extends ServiceProvider } } - /** * 调用插件 Bootstrap::boot() * @@ -67,7 +65,7 @@ class PluginServiceProvider extends ServiceProvider */ private function bootPlugin($plugin) { - $filePath = $plugin->getBootFile(); + $filePath = $plugin->getBootFile(); $pluginCode = $plugin->getDirname(); if (file_exists($filePath)) { $className = "Plugin\\{$pluginCode}\\Bootstrap"; @@ -77,7 +75,6 @@ class PluginServiceProvider extends ServiceProvider } } - /** * 加载插件数据库迁移脚本 * @@ -91,7 +88,6 @@ class PluginServiceProvider extends ServiceProvider } } - /** * 加载插件路由 * @@ -100,7 +96,7 @@ class PluginServiceProvider extends ServiceProvider private function loadRoutes($pluginCode) { $pluginBasePath = $this->pluginBasePath; - $shopRoutePath = "{$pluginBasePath}/{$pluginCode}/Routes/shop.php"; + $shopRoutePath = "{$pluginBasePath}/{$pluginCode}/Routes/shop.php"; if (file_exists($shopRoutePath)) { Route::prefix('plugin') ->middleware('shop') @@ -121,7 +117,6 @@ class PluginServiceProvider extends ServiceProvider } } - /** * 加载多语言 */ @@ -131,7 +126,6 @@ class PluginServiceProvider extends ServiceProvider $this->loadTranslationsFrom("{$pluginBasePath}/{$pluginCode}/Lang", $pluginCode); } - /** * 加载模板目录 * diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php index c0db6efa..d4b86278 100644 --- a/beike/Shop/Providers/ShopServiceProvider.php +++ b/beike/Shop/Providers/ShopServiceProvider.php @@ -4,14 +4,14 @@ namespace Beike\Shop\Providers; use Beike\Libraries\Tax; use Beike\Models\Customer; -use Illuminate\Support\Str; -use Illuminate\View\FileViewFinder; +use Beike\Shop\View\Components\AccountSidebar; use Beike\Shop\View\Components\Alert; +use Beike\Shop\View\Components\Breadcrumb; +use Beike\Shop\View\Components\NoData; use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; -use Beike\Shop\View\Components\Breadcrumb; -use Beike\Shop\View\Components\AccountSidebar; -use Beike\Shop\View\Components\NoData; +use Illuminate\Support\Str; +use Illuminate\View\FileViewFinder; class ShopServiceProvider extends ServiceProvider { @@ -27,7 +27,6 @@ class ShopServiceProvider extends ServiceProvider }); } - /** * @throws \Exception */ @@ -54,53 +53,50 @@ class ShopServiceProvider extends ServiceProvider $this->loadComponents(); } - /** * 注册前端客户 */ protected function registerGuard() { Config::set('auth.guards.' . Customer::AUTH_GUARD, [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'shop_customer', ]); Config::set('auth.providers.shop_customer', [ 'driver' => 'eloquent', - 'model' => Customer::class, + 'model' => Customer::class, ]); } - /** * 注册上传文件系统 */ protected function registerFileSystem() { Config::set('filesystems.disks.upload', [ - 'driver' => 'local', - 'root' => public_path('upload'), + 'driver' => 'local', + 'root' => public_path('upload'), 'permissions' => [ 'file' => [ - 'public' => 0755, + 'public' => 0755, 'private' => 0755, ], - 'dir' => [ - 'public' => 0755, + 'dir' => [ + 'public' => 0755, 'private' => 0755, ], ], ]); } - /** * 加载邮件配置, 从后台 mail 取值, 并覆盖到 config/mail 和 config/services */ protected function loadMailConfig() { $mailEngine = system_setting('base.mail_engine', 'smtp'); - $storeMail = system_setting('base.email', ''); + $storeMail = system_setting('base.email', ''); Config::set('mail.default', $mailEngine); Config::set('mail.from.address', $storeMail); @@ -113,7 +109,6 @@ class ShopServiceProvider extends ServiceProvider } } - /** * 加载主体模板路径 */ @@ -123,23 +118,23 @@ class ShopServiceProvider extends ServiceProvider $paths = $app['config']['view.paths']; if ($theme = system_setting('base.theme')) { $customTheme[] = base_path("themes/{$theme}"); - $paths = array_merge($customTheme, $paths); + $paths = array_merge($customTheme, $paths); } + return new FileViewFinder($app['files'], $paths); }); } - /** * 加载视图组件 */ protected function loadComponents() { $this->loadViewComponentsAs('shop', [ - 'sidebar' => AccountSidebar::class, - 'no-data' => NoData::class, - 'alert' => Alert::class, - 'breadcrumb' => Breadcrumb::class + 'sidebar' => AccountSidebar::class, + 'no-data' => NoData::class, + 'alert' => Alert::class, + 'breadcrumb' => Breadcrumb::class, ]); } } diff --git a/beike/Shop/Routes/shop.php b/beike/Shop/Routes/shop.php index ec05657e..9aa9c83b 100644 --- a/beike/Shop/Routes/shop.php +++ b/beike/Shop/Routes/shop.php @@ -1,29 +1,28 @@ name('shop.') diff --git a/beike/Shop/Services/AccountService.php b/beike/Shop/Services/AccountService.php index 049379ba..44d2776f 100644 --- a/beike/Shop/Services/AccountService.php +++ b/beike/Shop/Services/AccountService.php @@ -11,13 +11,10 @@ namespace Beike\Shop\Services; - -use Beike\Libraries\Notification; use Beike\Models\Customer; use Beike\Repositories\CustomerRepo; use Beike\Repositories\VerifyCodeRepo; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Log; class AccountService @@ -36,7 +33,7 @@ class AccountService $data['locale'] = locale(); if ($data['email'] ?? '') { - $data['name'] = substr($data['email'], 0, strrpos($data['email'], '@'));; + $data['name'] = substr($data['email'], 0, strrpos($data['email'], '@')); } $data['avatar'] = $data['avatar'] ?? ''; @@ -45,6 +42,7 @@ class AccountService $customer->notifyRegistration(); hook_action('after_register', $customer); } + return $customer; } @@ -74,14 +72,16 @@ class AccountService * @param $code * @param $account * @param $password - * @param $type $account类型，email代表$account为邮箱地址，telephone代表$account为手机号码 + * @param string $type $account类型，email代表$account为邮箱地址，telephone代表$account为手机号码 * @return void + * @throws \Exception */ - public static function verifyAndChangePassword($code, $account, $password, $type = 'email') + public static function verifyAndChangePassword($code, $account, $password, string $type = 'email') { $verifyCode = VerifyCodeRepo::findByAccount($account); if ($verifyCode->created_at->addMinutes(10) < Carbon::now()) { $verifyCode->delete(); + throw new \Exception(trans('shop/account.verify_code_expired')); } @@ -95,9 +95,9 @@ class AccountService throw new \Exception(trans('shop/account.account_not_exist')); } } elseif ($type == 'telephone') { - throw new \Exception("暂不支持手机号码找回密码"); + throw new \Exception('暂不支持手机号码找回密码'); } else { - throw new \Exception("找回密码类型错误"); + throw new \Exception('找回密码类型错误'); } CustomerRepo::update($customer, ['password' => $password]); $verifyCode->delete(); diff --git a/beike/Shop/Services/AddressService.php b/beike/Shop/Services/AddressService.php index fb967d33..bc317823 100644 --- a/beike/Shop/Services/AddressService.php +++ b/beike/Shop/Services/AddressService.php @@ -11,8 +11,6 @@ namespace Beike\Shop\Services; - - use Beike\Repositories\AddressRepo; use Beike\Repositories\ZoneRepo; @@ -20,27 +18,28 @@ class AddressService { public static function create($data) { - $customer = current_customer(); + $customer = current_customer(); $data['customer_id'] = $customer->id; - $data['zone'] = ZoneRepo::find($data['zone_id'])->name; - $address = AddressRepo::create($data); + $data['zone'] = ZoneRepo::find($data['zone_id'])->name; + $address = AddressRepo::create($data); if ($data['default']) { $customer->address_id = $address->id; $customer->save(); } + return $address; } public static function update($id, $data) { $customer = current_customer(); - $address = AddressRepo::find($id); + $address = AddressRepo::find($id); if ($address->customer_id != $customer->id) { return null; } $data['zone'] = ZoneRepo::find($data['zone_id'])->name; - $address = AddressRepo::update($address, $data); + $address = AddressRepo::update($address, $data); if ($data['default'] && $customer->address_id != $address->id) { $customer->address_id = $address->id; $customer->save(); diff --git a/beike/Shop/Services/CartService.php b/beike/Shop/Services/CartService.php index 7867e920..2f663d15 100644 --- a/beike/Shop/Services/CartService.php +++ b/beike/Shop/Services/CartService.php @@ -11,10 +11,10 @@ namespace Beike\Shop\Services; -use Exception; use Beike\Models\CartProduct; use Beike\Repositories\CartRepo; use Beike\Shop\Http\Resources\CartDetail; +use Exception; class CartService { @@ -35,17 +35,17 @@ class CartService $cartItems = $cartItems->filter(function ($item) { $description = $item->sku->product->description ?? ''; - $product = $item->product ?? null; + $product = $item->product ?? null; if (empty($description) || empty($product)) { $item->delete(); } + return $description && $product; }); return CartDetail::collection($cartItems)->jsonSerialize(); } - /** * 创建购物车或者更新购物车数量 * @throws Exception @@ -53,8 +53,8 @@ class CartService public static function add($sku, int $quantity, $customer = null) { $customerId = $customer->id ?? 0; - $productId = $sku->product_id; - $skuId = $sku->id; + $productId = $sku->product_id; + $skuId = $sku->id; if (empty($sku) || $quantity == 0) { return null; @@ -73,18 +73,18 @@ class CartService $cart->increment('quantity', $quantity); } else { $cart = CartProduct::query()->create([ - 'customer_id' => $customerId, - 'session_id' => session()->getId(), - 'product_id' => $productId, + 'customer_id' => $customerId, + 'session_id' => session()->getId(), + 'product_id' => $productId, 'product_sku_id' => $skuId, - 'quantity' => $quantity, - 'selected' => true, + 'quantity' => $quantity, + 'selected' => true, ]); } + return $cart; } - /** * 选择购物车商品 * @@ -106,7 +106,6 @@ class CartService ->update(['selected' => 1]); } - /** * 更新购物车数量 */ @@ -124,7 +123,6 @@ class CartService ->update(['quantity' => $quantity, 'selected' => 1]); } - /** * 删除购物车商品 * @@ -146,7 +144,6 @@ class CartService ->delete(); } - /** * 获取购物车相关数据 * @@ -156,22 +153,23 @@ class CartService public static function reloadData(array $carts = []): array { if (empty($carts)) { - $carts = CartService::list(current_customer()); + $carts = self::list(current_customer()); } $cartList = collect($carts)->where('selected', 1); - $quantity = $cartList->sum('quantity'); + $quantity = $cartList->sum('quantity'); $quantityAll = collect($carts)->sum('quantity'); - $amount = $cartList->sum('subtotal'); + $amount = $cartList->sum('subtotal'); $data = [ - 'carts' => $carts, - 'quantity' => $quantity, - 'quantity_all' => $quantityAll, - 'amount' => $amount, + 'carts' => $carts, + 'quantity' => $quantity, + 'quantity_all' => $quantityAll, + 'amount' => $amount, 'amount_format' => currency_format($amount), ]; + return hook_filter('cart.data', $data); } } diff --git a/beike/Shop/Services/CheckoutService.php b/beike/Shop/Services/CheckoutService.php index 542ca1bf..9c989358 100644 --- a/beike/Shop/Services/CheckoutService.php +++ b/beike/Shop/Services/CheckoutService.php @@ -11,29 +11,31 @@ namespace Beike\Shop\Services; -use Beike\Models\Country; -use Beike\Models\Order; use Beike\Models\Address; +use Beike\Models\Country; use Beike\Models\Customer; +use Beike\Models\Order; use Beike\Models\Zone; -use Beike\Repositories\CartRepo; -use Beike\Repositories\OrderRepo; -use Illuminate\Support\Facades\DB; -use Beike\Repositories\PluginRepo; use Beike\Repositories\AddressRepo; +use Beike\Repositories\CartRepo; use Beike\Repositories\CountryRepo; -use Beike\Services\StateMachineService; +use Beike\Repositories\OrderRepo; +use Beike\Repositories\PluginRepo; use Beike\Services\ShippingMethodService; +use Beike\Services\StateMachineService; use Beike\Shop\Http\Resources\Account\AddressResource; use Beike\Shop\Http\Resources\Checkout\PaymentMethodItem; +use Illuminate\Support\Facades\DB; class CheckoutService { public $customer; - public $cart; - public $selectedProducts; - public $totalService; + public $cart; + + public $selectedProducts; + + public $totalService; /** * @throws \Exception @@ -46,7 +48,7 @@ class CheckoutService // if (empty($this->customer) || !($this->customer instanceof Customer)) { // // throw new \Exception(trans('shop/carts.invalid_customer')); // } - $this->cart = CartRepo::createCart($this->customer); + $this->cart = CartRepo::createCart($this->customer); $this->selectedProducts = CartRepo::selectedCartProducts($this->customer->id ?? 0); if ($this->selectedProducts->count() == 0) { throw new \Exception(trans('shop/carts.empty_selected_products')); @@ -62,14 +64,14 @@ class CheckoutService */ public function update($requestData): array { - $shippingAddressId = $requestData['shipping_address_id'] ?? 0; + $shippingAddressId = $requestData['shipping_address_id'] ?? 0; $shippingMethodCode = $requestData['shipping_method_code'] ?? ''; - $paymentAddressId = $requestData['payment_address_id'] ?? 0; + $paymentAddressId = $requestData['payment_address_id'] ?? 0; $paymentMethodCode = $requestData['payment_method_code'] ?? ''; $guestShippingAddress = $requestData['guest_shipping_address'] ?? []; - $guestPaymentAddress = $requestData['guest_payment_address'] ?? []; + $guestPaymentAddress = $requestData['guest_payment_address'] ?? []; if ($shippingAddressId) { $this->updateShippingAddressId($shippingAddressId); @@ -96,15 +98,14 @@ class CheckoutService return $this->checkoutData(); } - /** * 确认提交订单 * @throws \Throwable */ public function confirm(): Order { - $customer = current_customer(); - $checkoutData = self::checkoutData(); + $customer = current_customer(); + $checkoutData = self::checkoutData(); $checkoutData['customer'] = $customer; $this->validateConfirm($checkoutData); @@ -119,12 +120,13 @@ class CheckoutService DB::commit(); } catch (\Exception $e) { DB::rollBack(); + throw $e; } + return $order; } - /** * 计算当前选中商品总重量, 当前产品无重量, 待处理 * @return int @@ -132,15 +134,15 @@ class CheckoutService */ public function getCartWeight(): int { - $weight = 0; + $weight = 0; $selectedProducts = $this->selectedProducts; foreach ($selectedProducts as $product) { $weight += $this->weight->convert($product['weight'], $product['weight_class_id'], $this->config->get('config_weight_class_id')); } + return $weight; } - /** * @throws \Exception */ @@ -159,29 +161,28 @@ class CheckoutService throw new \Exception(trans('shop/carts.invalid_payment_address')); } } else { - if (!$current['guest_shipping_address']) { + if (! $current['guest_shipping_address']) { throw new \Exception(trans('shop/carts.invalid_shipping_address')); } - if (!$current['guest_payment_address']) { + if (! $current['guest_payment_address']) { throw new \Exception(trans('shop/carts.invalid_payment_address')); } } $shippingMethodCode = $current['shipping_method_code']; - if (!PluginRepo::shippingEnabled($shippingMethodCode)) { + if (! PluginRepo::shippingEnabled($shippingMethodCode)) { throw new \Exception(trans('shop/carts.invalid_shipping_method')); } $paymentMethodCode = $current['payment_method_code']; - if (!PluginRepo::paymentEnabled($paymentMethodCode)) { + if (! PluginRepo::paymentEnabled($paymentMethodCode)) { throw new \Exception(trans('shop/carts.invalid_payment_method')); } hook_action('after_checkout_validate', $checkoutData); } - private function updateShippingAddressId($shippingAddressId) { $this->cart->update(['shipping_address_id' => $shippingAddressId]); @@ -220,48 +221,49 @@ class CheckoutService */ public function checkoutData(): array { - $customer = $this->customer; + $customer = $this->customer; $currentCart = $this->cart; - $cartList = CartService::list($customer, true); - $carts = CartService::reloadData($cartList); - $totalService = (new TotalService($currentCart, $cartList)); + $cartList = CartService::list($customer, true); + $carts = CartService::reloadData($cartList); + $totalService = (new TotalService($currentCart, $cartList)); $this->totalService = $totalService; $addresses = AddressRepo::listByCustomer($customer); $shipments = ShippingMethodService::getShippingMethods($this); - $payments = PaymentMethodItem::collection(PluginRepo::getPaymentMethods())->jsonSerialize(); + $payments = PaymentMethodItem::collection(PluginRepo::getPaymentMethods())->jsonSerialize(); $data = [ - 'current' => [ - 'shipping_address_id' => $currentCart->shipping_address_id, + 'current' => [ + 'shipping_address_id' => $currentCart->shipping_address_id, 'guest_shipping_address' => $currentCart->guest_shipping_address, - 'shipping_method_code' => $currentCart->shipping_method_code, - 'payment_address_id' => $currentCart->payment_address_id, - 'guest_payment_address' => $currentCart->guest_payment_address, - 'payment_method_code' => $currentCart->payment_method_code, - 'extra' => $currentCart->extra, + 'shipping_method_code' => $currentCart->shipping_method_code, + 'payment_address_id' => $currentCart->payment_address_id, + 'guest_payment_address' => $currentCart->guest_payment_address, + 'payment_method_code' => $currentCart->payment_method_code, + 'extra' => $currentCart->extra, ], - 'country_id' => (int)system_setting('base.country_id'), - 'customer_id' => $customer->id ?? null, - 'countries' => CountryRepo::all(), - 'addresses' => AddressResource::collection($addresses), + 'country_id' => (int) system_setting('base.country_id'), + 'customer_id' => $customer->id ?? null, + 'countries' => CountryRepo::all(), + 'addresses' => AddressResource::collection($addresses), 'shipping_methods' => $shipments, - 'payment_methods' => $payments, - 'carts' => $carts, - 'totals' => $totalService->getTotals($this), + 'payment_methods' => $payments, + 'carts' => $carts, + 'totals' => $totalService->getTotals($this), ]; return hook_filter('checkout.data', $data); } - static public function formatAddress($address) + public static function formatAddress($address) { - if (!$address) { + if (! $address) { return []; } $address['country'] = Country::find($address['country_id'])->name; - $address['zone'] = Zone::find($address['zone_id'])->name; + $address['zone'] = Zone::find($address['zone_id'])->name; + return $address; } } diff --git a/beike/Shop/Services/PaymentService.php b/beike/Shop/Services/PaymentService.php index 0729b4cb..f5b5472a 100644 --- a/beike/Shop/Services/PaymentService.php +++ b/beike/Shop/Services/PaymentService.php @@ -14,16 +14,13 @@ namespace Beike\Shop\Services; use Beike\Models\Order; use Beike\Repositories\OrderRepo; use Illuminate\Support\Str; -use Illuminate\View\View; -use Stripe\Customer; -use Stripe\Exception\ApiErrorException; -use Stripe\Stripe; -use Stripe\Token; class PaymentService { protected $order; + protected $orderId; + protected $paymentMethodCode; public function __construct($order) @@ -40,27 +37,27 @@ class PaymentService if ($this->order->status != 'unpaid') { throw new \Exception(trans('shop/order.order_already_paid')); } - $this->orderId = (int)$this->order->id; + $this->orderId = (int) $this->order->id; $this->paymentMethodCode = $this->order->payment_method_code; } - /** * @throws \Exception */ public function pay() { $orderPaymentCode = $this->paymentMethodCode; - $paymentCode = Str::studly($orderPaymentCode); - $viewPath = "$paymentCode::checkout.payment"; - if (!view()->exists($viewPath)) { + $paymentCode = Str::studly($orderPaymentCode); + $viewPath = "$paymentCode::checkout.payment"; + if (! view()->exists($viewPath)) { throw new \Exception("找不到支付方式 {$orderPaymentCode} 模板 {$viewPath}"); } $paymentData = [ - 'order' => $this->order, + 'order' => $this->order, 'payment_setting' => plugin_setting($orderPaymentCode), ]; $paymentView = view($viewPath, $paymentData)->render(); + return view('checkout.payment', ['order' => $this->order, 'payment' => $paymentView]); } } diff --git a/beike/Shop/Services/RmaService.php b/beike/Shop/Services/RmaService.php index f9621436..a3fc4af9 100644 --- a/beike/Shop/Services/RmaService.php +++ b/beike/Shop/Services/RmaService.php @@ -11,10 +11,10 @@ namespace Beike\Shop\Services; -use Beike\Repositories\RmaRepo; -use Illuminate\Database\Eloquent\Model; use Beike\Repositories\OrderProductRepo; +use Beike\Repositories\RmaRepo; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Model; class RmaService { @@ -27,22 +27,22 @@ class RmaService public static function createFromShop($data): Model|Builder { $orderProduct = OrderProductRepo::find($data['order_product_id']); - $customer = current_customer(); - $params = [ - 'order_id' => $orderProduct->order->id, + $customer = current_customer(); + $params = [ + 'order_id' => $orderProduct->order->id, 'order_product_id' => $data['order_product_id'], - 'customer_id' => $customer->id, - 'name' => $customer->name, - 'email' => $customer->email, - 'telephone' => $customer->telephone ?? '', - 'product_name' => $orderProduct->name, - 'sku' => $orderProduct->product_sku, - 'quantity' => $data['quantity'], - 'opened' => $data['opened'], - 'rma_reason_id' => $data['rma_reason_id'], - 'type' => $data['type'], - 'comment' => $data['comment'], - 'status' => 'pending', + 'customer_id' => $customer->id, + 'name' => $customer->name, + 'email' => $customer->email, + 'telephone' => $customer->telephone ?? '', + 'product_name' => $orderProduct->name, + 'sku' => $orderProduct->product_sku, + 'quantity' => $data['quantity'], + 'opened' => $data['opened'], + 'rma_reason_id' => $data['rma_reason_id'], + 'type' => $data['type'], + 'comment' => $data['comment'], + 'status' => 'pending', ]; return RmaRepo::create($params); diff --git a/beike/Shop/Services/TotalService.php b/beike/Shop/Services/TotalService.php index 496c78da..3e21ee7c 100644 --- a/beike/Shop/Services/TotalService.php +++ b/beike/Shop/Services/TotalService.php @@ -17,39 +17,43 @@ use Illuminate\Support\Str; class TotalService { - const TOTAL_CODES = [ + public const TOTAL_CODES = [ 'subtotal', 'tax', 'shipping', - 'order_total' + 'order_total', ]; public Cart $currentCart; + public array $cartProducts; + public array $taxes = []; + public array $totals; + public float $amount = 0; + public string $shippingMethod = ''; public function __construct($currentCart, $cartProducts) { - $this->currentCart = $currentCart; + $this->currentCart = $currentCart; $this->cartProducts = $cartProducts; $this->setShippingMethod($currentCart->shipping_method_code); $this->getTaxes(); } - /** * 设置配送方式 */ - public function setShippingMethod($methodCode): TotalService + public function setShippingMethod($methodCode): self { $this->shippingMethod = $methodCode; + return $this; } - /** * 获取税费数据 * @@ -59,7 +63,7 @@ class TotalService { $addressInfo = [ 'shipping_address' => $this->currentCart->shippingAddress, - 'payment_address' => $this->currentCart->paymentAddress, + 'payment_address' => $this->currentCart->paymentAddress, ]; $taxLib = Tax::getInstance($addressInfo); @@ -70,7 +74,7 @@ class TotalService $taxRates = $taxLib->getRates($product['price'], $product['tax_class_id']); foreach ($taxRates as $taxRate) { - if (!isset($this->taxes[$taxRate['tax_rate_id']])) { + if (! isset($this->taxes[$taxRate['tax_rate_id']])) { $this->taxes[$taxRate['tax_rate_id']] = ($taxRate['amount'] * $product['quantity']); } else { $this->taxes[$taxRate['tax_rate_id']] += ($taxRate['amount'] * $product['quantity']); @@ -81,7 +85,6 @@ class TotalService return $this->taxes; } - /** * @param CheckoutService $checkout * @return array @@ -90,8 +93,8 @@ class TotalService { foreach (self::TOTAL_CODES as $code) { $serviceName = Str::studly($code) . 'Service'; - $service = "\Beike\\Shop\\Services\\TotalServices\\{$serviceName}"; - if (!class_exists($service) || !method_exists($service, 'getTotal')) { + $service = "\Beike\\Shop\\Services\\TotalServices\\{$serviceName}"; + if (! class_exists($service) || ! method_exists($service, 'getTotal')) { continue; } $service::getTotal($checkout); diff --git a/beike/Shop/Services/TotalServices/OrderTotalService.php b/beike/Shop/Services/TotalServices/OrderTotalService.php index 57c4549e..e8d52359 100644 --- a/beike/Shop/Services/TotalServices/OrderTotalService.php +++ b/beike/Shop/Services/TotalServices/OrderTotalService.php @@ -22,12 +22,12 @@ class OrderTotalService public static function getTotal(CheckoutService $checkout) { $totalService = $checkout->totalService; - $amount = $totalService->amount; - $totalData = [ - 'code' => 'order_total', - 'title' => trans('shop/carts.order_total'), - 'amount' => $amount, - 'amount_format' => currency_format($amount) + $amount = $totalService->amount; + $totalData = [ + 'code' => 'order_total', + 'title' => trans('shop/carts.order_total'), + 'amount' => $amount, + 'amount_format' => currency_format($amount), ]; $totalService->amount += $totalData['amount']; diff --git a/beike/Shop/Services/TotalServices/ShippingService.php b/beike/Shop/Services/TotalServices/ShippingService.php index a0b80d04..64e8c963 100644 --- a/beike/Shop/Services/TotalServices/ShippingService.php +++ b/beike/Shop/Services/TotalServices/ShippingService.php @@ -12,8 +12,8 @@ namespace Beike\Shop\Services\TotalServices; -use Illuminate\Support\Str; use Beike\Shop\Services\CheckoutService; +use Illuminate\Support\Str; class ShippingService { @@ -24,33 +24,34 @@ class ShippingService */ public static function getTotal(CheckoutService $checkout): ?array { - $totalService = $checkout->totalService; + $totalService = $checkout->totalService; $shippingMethod = $totalService->shippingMethod; if (empty($shippingMethod)) { return null; } $shippingPluginCode = self::parseShippingPluginCode($shippingMethod); - $pluginCode = Str::studly($shippingPluginCode); + $pluginCode = Str::studly($shippingPluginCode); $plugin = app('plugin')->getPlugin($shippingPluginCode); - if (empty($plugin) || !$plugin->getInstalled() || !$plugin->getEnabled()) { - $cart = $checkout->cart; + if (empty($plugin) || ! $plugin->getInstalled() || ! $plugin->getEnabled()) { + $cart = $checkout->cart; $cart->shipping_method_code = ''; $cart->saveOrFail(); + return []; } $className = "Plugin\\{$pluginCode}\\Bootstrap"; - if (!method_exists($className, 'getShippingFee')) { + if (! method_exists($className, 'getShippingFee')) { throw new \Exception("请在插件 {$className} 实现方法: public function getShippingFee(CheckoutService \$checkout)"); } - $amount = (float)(new $className)->getShippingFee($checkout); + $amount = (float) (new $className)->getShippingFee($checkout); $totalData = [ - 'code' => 'shipping', - 'title' => trans('shop/carts.shipping_fee'), - 'amount' => $amount, - 'amount_format' => currency_format($amount) + 'code' => 'shipping', + 'title' => trans('shop/carts.shipping_fee'), + 'amount' => $amount, + 'amount_format' => currency_format($amount), ]; $totalService->amount += $totalData['amount']; @@ -59,7 +60,6 @@ class ShippingService return $totalData; } - /** * 通过配送方式获取插件编码 * @@ -69,6 +69,7 @@ class ShippingService public static function parseShippingPluginCode($shippingMethod): string { $methodArray = explode('.', $shippingMethod); + return $methodArray[0]; } } diff --git a/beike/Shop/Services/TotalServices/SubtotalService.php b/beike/Shop/Services/TotalServices/SubtotalService.php index 520f1d2b..4354b789 100644 --- a/beike/Shop/Services/TotalServices/SubtotalService.php +++ b/beike/Shop/Services/TotalServices/SubtotalService.php @@ -12,8 +12,8 @@ namespace Beike\Shop\Services\TotalServices; -use Beike\Shop\Services\TotalService; use Beike\Shop\Services\CheckoutService; +use Beike\Shop\Services\TotalService; class SubtotalService { @@ -24,12 +24,12 @@ class SubtotalService public static function getTotal(CheckoutService $checkout) { $totalService = $checkout->totalService; - $amount = self::getAmount($totalService); - $totalData = [ - 'code' => 'sub_total', - 'title' => trans('shop/carts.product_total'), - 'amount' => $amount, - 'amount_format' => currency_format($amount) + $amount = self::getAmount($totalService); + $totalData = [ + 'code' => 'sub_total', + 'title' => trans('shop/carts.product_total'), + 'amount' => $amount, + 'amount_format' => currency_format($amount), ]; $totalService->amount += $totalData['amount']; @@ -41,6 +41,7 @@ class SubtotalService public static function getAmount(TotalService $totalService) { $carts = $totalService->cartProducts; + return collect($carts)->sum('subtotal'); } } diff --git a/beike/Shop/Services/TotalServices/TaxService.php b/beike/Shop/Services/TotalServices/TaxService.php index 52262260..e37e84b2 100644 --- a/beike/Shop/Services/TotalServices/TaxService.php +++ b/beike/Shop/Services/TotalServices/TaxService.php @@ -12,8 +12,8 @@ namespace Beike\Shop\Services\TotalServices; -use Beike\Shop\Services\CheckoutService; use Beike\Admin\Repositories\TaxRateRepo; +use Beike\Shop\Services\CheckoutService; class TaxService { @@ -24,8 +24,8 @@ class TaxService public static function getTotal(CheckoutService $checkout): ?array { $totalService = $checkout->totalService; - $taxEnabled = system_setting('base.tax', false); - if (!$taxEnabled) { + $taxEnabled = system_setting('base.tax', false); + if (! $taxEnabled) { return null; } @@ -36,16 +36,17 @@ class TaxService if ($value <= 0) { continue; } - $totalItems[] = array( - 'code' => 'tax', - 'title' => TaxRateRepo::getNameByRateId($taxRateId), - 'amount' => $value, - 'amount_format' => currency_format($value) - ); + $totalItems[] = [ + 'code' => 'tax', + 'title' => TaxRateRepo::getNameByRateId($taxRateId), + 'amount' => $value, + 'amount_format' => currency_format($value), + ]; $totalService->amount += $value; } $totalService->totals = array_merge($totalService->totals, $totalItems); + return $totalItems; } } diff --git a/beike/Shop/View/Components/AccountSidebar.php b/beike/Shop/View/Components/AccountSidebar.php index 9cb42d1f..15ab9b01 100644 --- a/beike/Shop/View/Components/AccountSidebar.php +++ b/beike/Shop/View/Components/AccountSidebar.php @@ -2,8 +2,8 @@ namespace Beike\Shop\View\Components; -use Illuminate\View\Component; use Illuminate\Contracts\View\View; +use Illuminate\View\Component; class AccountSidebar extends Component { @@ -29,6 +29,7 @@ class AccountSidebar extends Component $data = [ 'customer' => $this->customer, ]; + return view('components.account.sidebar', $data); } } diff --git a/beike/Shop/View/Components/Alert.php b/beike/Shop/View/Components/Alert.php index e9f178ed..a5412fda 100644 --- a/beike/Shop/View/Components/Alert.php +++ b/beike/Shop/View/Components/Alert.php @@ -7,12 +7,13 @@ use Illuminate\View\Component; class Alert extends Component { public string $type; + public string $msg; - public function __construct(?string $type = 'success', string $msg) + public function __construct(?string $type, string $msg) { $this->type = $type ?? 'success'; - $this->msg = $msg; + $this->msg = $msg; } public function render() diff --git a/beike/Shop/View/Components/Breadcrumb.php b/beike/Shop/View/Components/Breadcrumb.php index fb8c5b62..bb5952bf 100644 --- a/beike/Shop/View/Components/Breadcrumb.php +++ b/beike/Shop/View/Components/Breadcrumb.php @@ -12,10 +12,10 @@ namespace Beike\Shop\View\Components; use Beike\Models\Product; +use Illuminate\Contracts\View\View; +use Illuminate\Support\Collection; use Illuminate\Support\Str; use Illuminate\View\Component; -use Illuminate\Support\Collection; -use Illuminate\Contracts\View\View; class Breadcrumb extends Component { @@ -31,7 +31,7 @@ class Breadcrumb extends Component { $breadcrumbs[] = [ 'title' => trans('shop/common.home'), - 'url' => shop_route('home.index') + 'url' => shop_route('home.index'), ]; if ($type == 'category') { @@ -61,7 +61,6 @@ class Breadcrumb extends Component return view('components.breadcrumbs'); } - /** * 获取分类以及路径 * @@ -72,11 +71,12 @@ class Breadcrumb extends Component private function handleCategoryLinks($value): array { $link = handle_link(['type' => 'category', 'value' => $value]); + return [ [ 'title' => $link['text'], - 'url' => $link['link'], - ] + 'url' => $link['link'], + ], ]; } @@ -89,27 +89,26 @@ class Breadcrumb extends Component */ private function handleProductLinks($value): array { - $links = []; + $links = []; $productId = 0; if (is_array($value)) { $productId = $value['id'] ?? 0; } elseif (is_int($value)) { $productId = $value; } - $product = Product::query()->find($productId); + $product = Product::query()->find($productId); $category = $product->categories()->first(); if ($category) { $categoryLink = handle_link(['type' => 'category', 'value' => $category]); - $links[] = ['title' => $categoryLink['text'], 'url' => $categoryLink['link']]; + $links[] = ['title' => $categoryLink['text'], 'url' => $categoryLink['link']]; } $productLink = handle_link(['type' => 'product', 'value' => $value]); - $links[] = ['title' => $productLink['text'], 'url' => $productLink['link']]; + $links[] = ['title' => $productLink['text'], 'url' => $productLink['link']]; return $links; } - /** * 获取订单详情页面包屑 * @@ -121,28 +120,27 @@ class Breadcrumb extends Component { $links = []; - $link = handle_link(['type' => 'static', 'value' => 'account.index']); + $link = handle_link(['type' => 'static', 'value' => 'account.index']); $links[] = [ 'title' => $link['text'], - 'url' => $link['link'], + 'url' => $link['link'], ]; - $link = handle_link(['type' => 'static', 'value' => 'account.order.index']); + $link = handle_link(['type' => 'static', 'value' => 'account.order.index']); $links[] = [ 'title' => $link['text'], - 'url' => $link['link'], + 'url' => $link['link'], ]; - $link = handle_link(['type' => 'order', 'value' => $value]); + $link = handle_link(['type' => 'order', 'value' => $value]); $links[] = [ 'title' => $value, - 'url' => $link['link'], + 'url' => $link['link'], ]; return $links; } - /** * 获取订单详情页面包屑 * @@ -154,28 +152,27 @@ class Breadcrumb extends Component { $links = []; - $link = handle_link(['type' => 'static', 'value' => 'account.index']); + $link = handle_link(['type' => 'static', 'value' => 'account.index']); $links[] = [ 'title' => $link['text'], - 'url' => $link['link'], + 'url' => $link['link'], ]; - $link = handle_link(['type' => 'static', 'value' => 'account.rma.index']); + $link = handle_link(['type' => 'static', 'value' => 'account.rma.index']); $links[] = [ 'title' => $link['text'], - 'url' => $link['link'], + 'url' => $link['link'], ]; - $link = handle_link(['type' => 'rma', 'value' => $value]); + $link = handle_link(['type' => 'rma', 'value' => $value]); $links[] = [ 'title' => $value, - 'url' => $link['link'], + 'url' => $link['link'], ]; return $links; } - /** * 处理个人中心面包屑 * @@ -185,21 +182,21 @@ class Breadcrumb extends Component */ private function handleAccountLinks($value): array { - $links = []; + $links = []; $values = explode('.', $value); if (count($values) == 3) { - $link = handle_link(['type' => 'static', 'value' => 'account.index']); + $link = handle_link(['type' => 'static', 'value' => 'account.index']); $links[] = [ 'title' => $link['text'], - 'url' => $link['link'], + 'url' => $link['link'], ]; } - $link = handle_link(['type' => 'static', 'value' => $value]); + $link = handle_link(['type' => 'static', 'value' => $value]); $links[] = [ 'title' => $link['text'], - 'url' => $link['link'], + 'url' => $link['link'], ]; return $links; @@ -217,16 +214,17 @@ class Breadcrumb extends Component private function handleLinks($type, $value, array $text = []): array { $data = [ - 'type' => $type, + 'type' => $type, 'value' => $value, - 'text' => $text, + 'text' => $text, ]; $link = handle_link($data); + return [ [ 'title' => $link['text'], - 'url' => $link['link'], - ] + 'url' => $link['link'], + ], ]; } } diff --git a/beike/Shop/View/Components/NoData.php b/beike/Shop/View/Components/NoData.php index 8a7ca319..c0b7b66e 100644 --- a/beike/Shop/View/Components/NoData.php +++ b/beike/Shop/View/Components/NoData.php @@ -3,19 +3,20 @@ namespace Beike\Shop\View\Components; use Illuminate\View\Component; -use Illuminate\Contracts\View\View; class NoData extends Component { public string $text; + public string $link; + public string $btn; public function __construct(?string $text = '', ?string $link = '', ?string $btn = '') { $this->text = $text ?: trans('common.no_data'); $this->link = $link; - $this->btn = $btn; + $this->btn = $btn; } public function render() diff --git a/config/app.php b/config/app.php index e848e90f..01d92f94 100644 --- a/config/app.php +++ b/config/app.php @@ -13,7 +13,7 @@ return [ | */ - 'name' => env('APP_NAME', 'Laravel'), + 'name' => env('APP_NAME', 'Laravel'), /* |-------------------------------------------------------------------------- @@ -26,7 +26,7 @@ return [ | */ - 'env' => env('APP_ENV', 'production'), + 'env' => env('APP_ENV', 'production'), /* |-------------------------------------------------------------------------- @@ -39,7 +39,7 @@ return [ | */ - 'debug' => (bool)env('APP_DEBUG', false), + 'debug' => (bool) env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- @@ -52,9 +52,9 @@ return [ | */ - 'url' => env('APP_URL', 'http://localhost'), + 'url' => env('APP_URL', 'http://localhost'), - 'asset_url' => env('ASSET_URL', null), + 'asset_url' => env('ASSET_URL', null), /* |-------------------------------------------------------------------------- @@ -67,7 +67,7 @@ return [ | */ - 'timezone' => env('APP_TIMEZONE', 'UTC'), + 'timezone' => env('APP_TIMEZONE', 'UTC'), /* |-------------------------------------------------------------------------- @@ -80,7 +80,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => 'en', /* |-------------------------------------------------------------------------- @@ -106,7 +106,7 @@ return [ | */ - 'faker_locale' => 'en_US', + 'faker_locale' => 'en_US', /* |-------------------------------------------------------------------------- @@ -119,9 +119,9 @@ return [ | */ - 'key' => env('APP_KEY'), + 'key' => env('APP_KEY'), - 'cipher' => 'AES-256-CBC', + 'cipher' => 'AES-256-CBC', /* |-------------------------------------------------------------------------- @@ -134,7 +134,7 @@ return [ | */ - 'providers' => [ + 'providers' => [ /* * Laravel Framework Service Providers... @@ -194,47 +194,47 @@ return [ | */ - 'aliases' => [ + 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, - 'Arr' => Illuminate\Support\Arr::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, - 'Bus' => Illuminate\Support\Facades\Bus::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'Date' => Illuminate\Support\Facades\Date::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Http' => Illuminate\Support\Facades\Http::class, - 'Js' => Illuminate\Support\Js::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, + 'App' => Illuminate\Support\Facades\App::class, + 'Arr' => Illuminate\Support\Arr::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'Date' => Illuminate\Support\Facades\Date::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Http' => Illuminate\Support\Facades\Http::class, + 'Js' => Illuminate\Support\Js::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, 'Notification' => Illuminate\Support\Facades\Notification::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, // 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'Str' => Illuminate\Support\Str::class, - 'URL' => Illuminate\Support\Facades\URL::class, - 'Validator' => Illuminate\Support\Facades\Validator::class, - 'View' => Illuminate\Support\Facades\View::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'Str' => Illuminate\Support\Str::class, + 'URL' => Illuminate\Support\Facades\URL::class, + 'Validator' => Illuminate\Support\Facades\Validator::class, + 'View' => Illuminate\Support\Facades\View::class, ], diff --git a/config/auth.php b/config/auth.php index e29a3f7d..e89228e1 100644 --- a/config/auth.php +++ b/config/auth.php @@ -13,8 +13,8 @@ return [ | */ - 'defaults' => [ - 'guard' => 'web', + 'defaults' => [ + 'guard' => 'web', 'passwords' => 'users', ], @@ -35,9 +35,9 @@ return [ | */ - 'guards' => [ + 'guards' => [ 'web' => [ - 'driver' => 'session', + 'driver' => 'session', 'provider' => 'users', ], ], @@ -59,10 +59,10 @@ return [ | */ - 'providers' => [ + 'providers' => [ 'users' => [ 'driver' => 'eloquent', - 'model' => App\Models\User::class, + 'model' => App\Models\User::class, ], // 'users' => [ @@ -86,11 +86,11 @@ return [ | */ - 'passwords' => [ + 'passwords' => [ 'users' => [ 'provider' => 'users', - 'table' => 'password_resets', - 'expire' => 60, + 'table' => 'password_resets', + 'expire' => 60, 'throttle' => 60, ], ], diff --git a/config/broadcasting.php b/config/broadcasting.php index 2d529820..4fa36313 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -15,7 +15,7 @@ return [ | */ - 'default' => env('BROADCAST_DRIVER', 'null'), + 'default' => env('BROADCAST_DRIVER', 'null'), /* |-------------------------------------------------------------------------- @@ -31,31 +31,31 @@ return [ 'connections' => [ 'pusher' => [ - 'driver' => 'pusher', - 'key' => env('PUSHER_APP_KEY'), - 'secret' => env('PUSHER_APP_SECRET'), - 'app_id' => env('PUSHER_APP_ID'), + 'driver' => 'pusher', + 'key' => env('PUSHER_APP_KEY'), + 'secret' => env('PUSHER_APP_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), 'options' => [ 'cluster' => env('PUSHER_APP_CLUSTER'), - 'useTLS' => true, + 'useTLS' => true, ], ], - 'ably' => [ + 'ably' => [ 'driver' => 'ably', - 'key' => env('ABLY_KEY'), + 'key' => env('ABLY_KEY'), ], - 'redis' => [ - 'driver' => 'redis', + 'redis' => [ + 'driver' => 'redis', 'connection' => 'default', ], - 'log' => [ + 'log' => [ 'driver' => 'log', ], - 'null' => [ + 'null' => [ 'driver' => 'null', ], diff --git a/config/cache.php b/config/cache.php index 8736c7a7..76a2a65f 100644 --- a/config/cache.php +++ b/config/cache.php @@ -31,64 +31,64 @@ return [ | */ - 'stores' => [ + 'stores' => [ - 'apc' => [ + 'apc' => [ 'driver' => 'apc', ], - 'array' => [ - 'driver' => 'array', + 'array' => [ + 'driver' => 'array', 'serialize' => false, ], - 'database' => [ - 'driver' => 'database', - 'table' => 'cache', - 'connection' => null, + 'database' => [ + 'driver' => 'database', + 'table' => 'cache', + 'connection' => null, 'lock_connection' => null, ], - 'file' => [ + 'file' => [ 'driver' => 'file', - 'path' => storage_path('framework/cache/data'), + 'path' => storage_path('framework/cache/data'), ], 'memcached' => [ - 'driver' => 'memcached', + 'driver' => 'memcached', 'persistent_id' => env('MEMCACHED_PERSISTENT_ID'), - 'sasl' => [ + 'sasl' => [ env('MEMCACHED_USERNAME'), env('MEMCACHED_PASSWORD'), ], - 'options' => [ + 'options' => [ // Memcached::OPT_CONNECT_TIMEOUT => 2000, ], - 'servers' => [ + 'servers' => [ [ - 'host' => env('MEMCACHED_HOST', '127.0.0.1'), - 'port' => env('MEMCACHED_PORT', 11211), + 'host' => env('MEMCACHED_HOST', '127.0.0.1'), + 'port' => env('MEMCACHED_PORT', 11211), 'weight' => 100, ], ], ], - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'cache', + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'cache', 'lock_connection' => 'default', ], - 'dynamodb' => [ - 'driver' => 'dynamodb', - 'key' => env('AWS_ACCESS_KEY_ID'), - 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), - 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), + 'dynamodb' => [ + 'driver' => 'dynamodb', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'table' => env('DYNAMODB_CACHE_TABLE', 'cache'), 'endpoint' => env('DYNAMODB_ENDPOINT'), ], - 'octane' => [ + 'octane' => [ 'driver' => 'octane', ], @@ -105,6 +105,6 @@ return [ | */ - 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache'), ]; diff --git a/config/cors.php b/config/cors.php index 8a39e6da..9eaa3c1e 100644 --- a/config/cors.php +++ b/config/cors.php @@ -15,20 +15,20 @@ return [ | */ - 'paths' => ['api/*', 'sanctum/csrf-cookie'], + 'paths' => ['api/*', 'sanctum/csrf-cookie'], - 'allowed_methods' => ['*'], + 'allowed_methods' => ['*'], - 'allowed_origins' => ['*'], + 'allowed_origins' => ['*'], 'allowed_origins_patterns' => [], - 'allowed_headers' => ['*'], + 'allowed_headers' => ['*'], - 'exposed_headers' => [], + 'exposed_headers' => [], - 'max_age' => 0, + 'max_age' => 0, - 'supports_credentials' => false, + 'supports_credentials' => false, ]; diff --git a/config/database.php b/config/database.php index 99e2a09f..8f72108c 100644 --- a/config/database.php +++ b/config/database.php @@ -15,7 +15,7 @@ return [ | */ - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'mysql'), /* |-------------------------------------------------------------------------- @@ -36,58 +36,58 @@ return [ 'connections' => [ 'sqlite' => [ - 'driver' => 'sqlite', - 'url' => env('DATABASE_URL'), - 'database' => env('DB_DATABASE', database_path('database.sqlite')), - 'prefix' => '', + 'driver' => 'sqlite', + 'url' => env('DATABASE_URL'), + 'database' => env('DB_DATABASE', database_path('database.sqlite')), + 'prefix' => '', 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), ], - 'mysql' => [ - 'driver' => 'mysql', - 'url' => env('DATABASE_URL'), - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'unix_socket' => env('DB_SOCKET', ''), - 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', - 'prefix' => '', + 'mysql' => [ + 'driver' => 'mysql', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'unix_socket' => env('DB_SOCKET', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', 'prefix_indexes' => true, - 'strict' => true, - 'engine' => 'InnoDB', - 'options' => extension_loaded('pdo_mysql') ? array_filter([ + 'strict' => true, + 'engine' => 'InnoDB', + 'options' => extension_loaded('pdo_mysql') ? array_filter([ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), ]) : [], ], - 'pgsql' => [ - 'driver' => 'pgsql', - 'url' => env('DATABASE_URL'), - 'host' => env('DB_HOST', '127.0.0.1'), - 'port' => env('DB_PORT', '5432'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', + 'pgsql' => [ + 'driver' => 'pgsql', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST', '127.0.0.1'), + 'port' => env('DB_PORT', '5432'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', + 'prefix' => '', 'prefix_indexes' => true, - 'schema' => 'public', - 'sslmode' => 'prefer', + 'schema' => 'public', + 'sslmode' => 'prefer', ], 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'url' => env('DATABASE_URL'), - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '1433'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', + 'driver' => 'sqlsrv', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '1433'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', + 'prefix' => '', 'prefix_indexes' => true, ], @@ -104,7 +104,7 @@ return [ | */ - 'migrations' => 'migrations', + 'migrations' => 'migrations', /* |-------------------------------------------------------------------------- @@ -117,28 +117,28 @@ return [ | */ - 'redis' => [ + 'redis' => [ - 'client' => env('REDIS_CLIENT', 'phpredis'), + 'client' => env('REDIS_CLIENT', 'phpredis'), 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'redis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), + 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), ], 'default' => [ - 'url' => env('REDIS_URL'), - 'host' => env('REDIS_HOST', '127.0.0.1'), + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', '6379'), + 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_DB', '0'), ], - 'cache' => [ - 'url' => env('REDIS_URL'), - 'host' => env('REDIS_HOST', '127.0.0.1'), + 'cache' => [ + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', '6379'), + 'port' => env('REDIS_PORT', '6379'), 'database' => env('REDIS_CACHE_DB', '1'), ], diff --git a/config/debugbar.php b/config/debugbar.php index 9d104774..c394a320 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -14,8 +14,8 @@ return [ | */ - 'enabled' => env('DEBUGBAR_ENABLED', null), - 'except' => [ + 'enabled' => env('DEBUGBAR_ENABLED', null), + 'except' => [ 'telescope*', 'horizon*', ], @@ -32,14 +32,14 @@ return [ | can also be used. For PDO, run the package migrations first. | */ - 'storage' => [ - 'enabled' => true, - 'driver' => 'file', // redis, file, pdo, socket, custom - 'path' => storage_path('debugbar'), // For file driver + 'storage' => [ + 'enabled' => true, + 'driver' => 'file', // redis, file, pdo, socket, custom + 'path' => storage_path('debugbar'), // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) - 'provider' => '', // Instance of StorageInterface for custom driver - 'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver - 'port' => 2304, // Port to use with the "socket" driver + 'provider' => '', // Instance of StorageInterface for custom driver + 'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver + 'port' => 2304, // Port to use with the "socket" driver ], /* @@ -55,7 +55,7 @@ return [ | */ - 'editor' => env('DEBUGBAR_EDITOR', 'phpstorm'), + 'editor' => env('DEBUGBAR_EDITOR', 'phpstorm'), /* |-------------------------------------------------------------------------- @@ -80,8 +80,8 @@ return [ | */ - 'remote_sites_path' => env('DEBUGBAR_REMOTE_SITES_PATH', ''), - 'local_sites_path' => env('DEBUGBAR_LOCAL_SITES_PATH', ''), + 'remote_sites_path' => env('DEBUGBAR_REMOTE_SITES_PATH', ''), + 'local_sites_path' => env('DEBUGBAR_LOCAL_SITES_PATH', ''), /* |-------------------------------------------------------------------------- @@ -97,7 +97,7 @@ return [ | */ - 'include_vendors' => true, + 'include_vendors' => true, /* |-------------------------------------------------------------------------- @@ -113,8 +113,8 @@ return [ | X-Requested-With with the value XMLHttpRequest (most JS libraries send this), or have application/json as a Accept header. */ - 'capture_ajax' => true, - 'add_ajax_timing' => false, + 'capture_ajax' => true, + 'add_ajax_timing' => false, /* |-------------------------------------------------------------------------- @@ -125,7 +125,7 @@ return [ | in the Messages tab. | */ - 'error_handler' => false, + 'error_handler' => false, /* |-------------------------------------------------------------------------- @@ -136,7 +136,7 @@ return [ | Extension, without the server-side code. It uses Debugbar collectors instead. | */ - 'clockwork' => false, + 'clockwork' => false, /* |-------------------------------------------------------------------------- @@ -147,30 +147,30 @@ return [ | */ - 'collectors' => [ - 'phpinfo' => true, // Php version - 'messages' => true, // Messages - 'time' => true, // Time Datalogger - 'memory' => true, // Memory usage - 'exceptions' => true, // Exception displayer - 'log' => true, // Logs from Monolog (merged in messages if enabled) - 'db' => true, // Show database (PDO) queries and bindings - 'views' => true, // Views with their data - 'route' => true, // Current route information - 'auth' => false, // Display Laravel authentication status - 'gate' => true, // Display Laravel Gate checks - 'session' => true, // Display session data + 'collectors' => [ + 'phpinfo' => true, // Php version + 'messages' => true, // Messages + 'time' => true, // Time Datalogger + 'memory' => true, // Memory usage + 'exceptions' => true, // Exception displayer + 'log' => true, // Logs from Monolog (merged in messages if enabled) + 'db' => true, // Show database (PDO) queries and bindings + 'views' => true, // Views with their data + 'route' => true, // Current route information + 'auth' => false, // Display Laravel authentication status + 'gate' => true, // Display Laravel Gate checks + 'session' => true, // Display session data 'symfony_request' => true, // Only one can be enabled.. - 'mail' => true, // Catch mail messages - 'laravel' => false, // Laravel version and environment - 'events' => false, // All events fired + 'mail' => true, // Catch mail messages + 'laravel' => false, // Laravel version and environment + 'events' => false, // All events fired 'default_request' => false, // Regular or special Symfony request logger - 'logs' => false, // Add the latest log messages - 'files' => false, // Show the included files - 'config' => false, // Display config settings - 'cache' => false, // Display cache events - 'models' => true, // Display models - 'livewire' => true, // Display Livewire (when available) + 'logs' => false, // Add the latest log messages + 'files' => false, // Show the included files + 'config' => false, // Display config settings + 'cache' => false, // Display cache events + 'models' => true, // Display models + 'livewire' => true, // Display Livewire (when available) ], /* @@ -182,34 +182,34 @@ return [ | */ - 'options' => [ - 'auth' => [ + 'options' => [ + 'auth' => [ 'show_name' => true, // Also show the users name/email in the debugbar ], - 'db' => [ - 'with_params' => true, // Render SQL with the parameters substituted - 'backtrace' => true, // Use a backtrace to find the origin of the query in your files. + 'db' => [ + 'with_params' => true, // Render SQL with the parameters substituted + 'backtrace' => true, // Use a backtrace to find the origin of the query in your files. 'backtrace_exclude_paths' => [], // Paths to exclude from backtrace. (in addition to defaults) - 'timeline' => false, // Add the queries to the timeline - 'duration_background' => true, // Show shaded background on each query relative to how long it took to execute. - 'explain' => [ // Show EXPLAIN output on queries + 'timeline' => false, // Add the queries to the timeline + 'duration_background' => true, // Show shaded background on each query relative to how long it took to execute. + 'explain' => [ // Show EXPLAIN output on queries 'enabled' => false, - 'types' => ['SELECT'], // Deprecated setting, is always only SELECT + 'types' => ['SELECT'], // Deprecated setting, is always only SELECT ], - 'hints' => false, // Show hints for common mistakes - 'show_copy' => false, // Show copy button next to the query + 'hints' => false, // Show hints for common mistakes + 'show_copy' => false, // Show copy button next to the query ], - 'mail' => [ + 'mail' => [ 'full_log' => false, ], 'views' => [ 'timeline' => false, // Add the views to the timeline (Experimental) - 'data' => env('DEBUGBAR_OPTIONS_VIEW_DATA', false), //Note: Can slow down the application, because the data can be quite large.. + 'data' => env('DEBUGBAR_OPTIONS_VIEW_DATA', false), //Note: Can slow down the application, because the data can be quite large.. ], 'route' => [ 'label' => true, // show complete route on bar ], - 'logs' => [ + 'logs' => [ 'file' => null, ], 'cache' => [ @@ -228,7 +228,7 @@ return [ | */ - 'inject' => true, + 'inject' => true, /* |-------------------------------------------------------------------------- @@ -240,7 +240,7 @@ return [ | from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97 | */ - 'route_prefix' => '_debugbar', + 'route_prefix' => '_debugbar', /* |-------------------------------------------------------------------------- @@ -250,7 +250,7 @@ return [ | By default DebugBar route served from the same domain that request served. | To override default domain, specify it as a non-empty value. */ - 'route_domain' => null, + 'route_domain' => null, /* |-------------------------------------------------------------------------- @@ -260,7 +260,7 @@ return [ | Switches between light and dark theme. If set to auto it will respect system preferences | Possible values: auto, light, dark */ - 'theme' => env('DEBUGBAR_THEME', 'auto'), + 'theme' => env('DEBUGBAR_THEME', 'auto'), /* |-------------------------------------------------------------------------- diff --git a/config/filesystems.php b/config/filesystems.php index 760ef972..7f942f21 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -28,28 +28,28 @@ return [ | */ - 'disks' => [ + 'disks' => [ - 'local' => [ + 'local' => [ 'driver' => 'local', - 'root' => storage_path('app'), + 'root' => storage_path('app'), ], 'public' => [ - 'driver' => 'local', - 'root' => storage_path('app/public'), - 'url' => env('APP_URL').'/storage', + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'url' => env('APP_URL') . '/storage', 'visibility' => 'public', ], - 's3' => [ - 'driver' => 's3', - 'key' => env('AWS_ACCESS_KEY_ID'), - 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'region' => env('AWS_DEFAULT_REGION'), - 'bucket' => env('AWS_BUCKET'), - 'url' => env('AWS_URL'), - 'endpoint' => env('AWS_ENDPOINT'), + 's3' => [ + 'driver' => 's3', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'region' => env('AWS_DEFAULT_REGION'), + 'bucket' => env('AWS_BUCKET'), + 'url' => env('AWS_URL'), + 'endpoint' => env('AWS_ENDPOINT'), 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), ], @@ -66,7 +66,7 @@ return [ | */ - 'links' => [ + 'links' => [ public_path('storage') => storage_path('app/public'), ], diff --git a/config/hashing.php b/config/hashing.php index 84257708..0abe6127 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -43,10 +43,10 @@ return [ | */ - 'argon' => [ - 'memory' => 1024, + 'argon' => [ + 'memory' => 1024, 'threads' => 2, - 'time' => 2, + 'time' => 2, ], ]; diff --git a/config/horizon.php b/config/horizon.php index db17ef93..ba913336 100644 --- a/config/horizon.php +++ b/config/horizon.php @@ -15,7 +15,7 @@ return [ | */ - 'domain' => env('HORIZON_DOMAIN'), + 'domain' => env('HORIZON_DOMAIN'), /* |-------------------------------------------------------------------------- @@ -28,7 +28,7 @@ return [ | */ - 'path' => env('HORIZON_PATH', 'horizon'), + 'path' => env('HORIZON_PATH', 'horizon'), /* |-------------------------------------------------------------------------- @@ -41,7 +41,7 @@ return [ | */ - 'use' => 'default', + 'use' => 'default', /* |-------------------------------------------------------------------------- @@ -54,9 +54,9 @@ return [ | */ - 'prefix' => env( + 'prefix' => env( 'HORIZON_PREFIX', - Str::slug(env('APP_NAME', 'laravel'), '_').'_horizon:' + Str::slug(env('APP_NAME', 'laravel'), '_') . '_horizon:' ), /* @@ -70,7 +70,7 @@ return [ | */ - 'middleware' => ['shop'], + 'middleware' => ['shop'], /* |-------------------------------------------------------------------------- @@ -83,7 +83,7 @@ return [ | */ - 'waits' => [ + 'waits' => [ 'redis:default' => 60, ], @@ -98,13 +98,13 @@ return [ | */ - 'trim' => [ - 'recent' => 60, - 'pending' => 60, - 'completed' => 60, + 'trim' => [ + 'recent' => 60, + 'pending' => 60, + 'completed' => 60, 'recent_failed' => 10080, - 'failed' => 10080, - 'monitored' => 10080, + 'failed' => 10080, + 'monitored' => 10080, ], /* @@ -118,9 +118,9 @@ return [ | */ - 'metrics' => [ + 'metrics' => [ 'trim_snapshots' => [ - 'job' => 24, + 'job' => 24, 'queue' => 24, ], ], @@ -151,7 +151,7 @@ return [ | */ - 'memory_limit' => 64, + 'memory_limit' => 64, /* |-------------------------------------------------------------------------- @@ -164,31 +164,31 @@ return [ | */ - 'defaults' => [ + 'defaults' => [ 'supervisor-1' => [ - 'connection' => 'redis', - 'queue' => ['default'], - 'balance' => 'auto', + 'connection' => 'redis', + 'queue' => ['default'], + 'balance' => 'auto', 'maxProcesses' => 1, - 'maxTime' => 0, - 'maxJobs' => 0, - 'memory' => 128, - 'tries' => 1, - 'timeout' => 60, - 'nice' => 0, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 128, + 'tries' => 1, + 'timeout' => 60, + 'nice' => 0, ], ], - 'environments' => [ + 'environments' => [ 'production' => [ 'supervisor-1' => [ - 'maxProcesses' => 10, + 'maxProcesses' => 10, 'balanceMaxShift' => 1, 'balanceCooldown' => 3, ], ], - 'local' => [ + 'local' => [ 'supervisor-1' => [ 'maxProcesses' => 3, ], diff --git a/config/logging.php b/config/logging.php index 880cd922..a4145189 100644 --- a/config/logging.php +++ b/config/logging.php @@ -17,7 +17,7 @@ return [ | */ - 'default' => env('LOG_CHANNEL', 'stack'), + 'default' => env('LOG_CHANNEL', 'stack'), /* |-------------------------------------------------------------------------- @@ -47,70 +47,70 @@ return [ | */ - 'channels' => [ - 'stack' => [ - 'driver' => 'stack', - 'channels' => ['single'], + 'channels' => [ + 'stack' => [ + 'driver' => 'stack', + 'channels' => ['single'], 'ignore_exceptions' => false, ], - 'single' => [ + 'single' => [ 'driver' => 'single', - 'path' => storage_path('logs/laravel.log'), - 'level' => env('LOG_LEVEL', 'debug'), + 'path' => storage_path('logs/laravel.log'), + 'level' => env('LOG_LEVEL', 'debug'), ], - 'daily' => [ + 'daily' => [ 'driver' => 'daily', - 'path' => storage_path('logs/laravel.log'), - 'level' => env('LOG_LEVEL', 'debug'), - 'days' => 14, + 'path' => storage_path('logs/laravel.log'), + 'level' => env('LOG_LEVEL', 'debug'), + 'days' => 14, ], - 'slack' => [ - 'driver' => 'slack', - 'url' => env('LOG_SLACK_WEBHOOK_URL'), + 'slack' => [ + 'driver' => 'slack', + 'url' => env('LOG_SLACK_WEBHOOK_URL'), 'username' => 'Laravel Log', - 'emoji' => ':boom:', - 'level' => env('LOG_LEVEL', 'critical'), + 'emoji' => ':boom:', + 'level' => env('LOG_LEVEL', 'critical'), ], 'papertrail' => [ - 'driver' => 'monolog', - 'level' => env('LOG_LEVEL', 'debug'), - 'handler' => SyslogUdpHandler::class, + 'driver' => 'monolog', + 'level' => env('LOG_LEVEL', 'debug'), + 'handler' => SyslogUdpHandler::class, 'handler_with' => [ 'host' => env('PAPERTRAIL_URL'), 'port' => env('PAPERTRAIL_PORT'), ], ], - 'stderr' => [ - 'driver' => 'monolog', - 'level' => env('LOG_LEVEL', 'debug'), - 'handler' => StreamHandler::class, + 'stderr' => [ + 'driver' => 'monolog', + 'level' => env('LOG_LEVEL', 'debug'), + 'handler' => StreamHandler::class, 'formatter' => env('LOG_STDERR_FORMATTER'), - 'with' => [ + 'with' => [ 'stream' => 'php://stderr', ], ], - 'syslog' => [ + 'syslog' => [ 'driver' => 'syslog', - 'level' => env('LOG_LEVEL', 'debug'), + 'level' => env('LOG_LEVEL', 'debug'), ], - 'errorlog' => [ + 'errorlog' => [ 'driver' => 'errorlog', - 'level' => env('LOG_LEVEL', 'debug'), + 'level' => env('LOG_LEVEL', 'debug'), ], - 'null' => [ - 'driver' => 'monolog', + 'null' => [ + 'driver' => 'monolog', 'handler' => NullHandler::class, ], - 'emergency' => [ + 'emergency' => [ 'path' => storage_path('logs/laravel.log'), ], ], diff --git a/config/mail.php b/config/mail.php index e8607494..dfd2b5ab 100644 --- a/config/mail.php +++ b/config/mail.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('MAIL_MAILER', 'smtp'), + 'default' => env('MAIL_MAILER', 'smtp'), /* |-------------------------------------------------------------------------- @@ -33,23 +33,23 @@ return [ | */ - 'mailers' => [ - 'smtp' => [ - 'transport' => 'smtp', - 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), - 'port' => env('MAIL_PORT', 587), + 'mailers' => [ + 'smtp' => [ + 'transport' => 'smtp', + 'host' => env('MAIL_HOST', 'smtp.mailgun.org'), + 'port' => env('MAIL_PORT', 587), 'encryption' => env('MAIL_ENCRYPTION', 'tls'), - 'username' => env('MAIL_USERNAME'), - 'password' => env('MAIL_PASSWORD'), - 'timeout' => null, - 'auth_mode' => null, + 'username' => env('MAIL_USERNAME'), + 'password' => env('MAIL_PASSWORD'), + 'timeout' => null, + 'auth_mode' => null, ], - 'ses' => [ + 'ses' => [ 'transport' => 'ses', ], - 'mailgun' => [ + 'mailgun' => [ 'transport' => 'mailgun', ], @@ -59,21 +59,21 @@ return [ 'sendmail' => [ 'transport' => 'sendmail', - 'path' => '/usr/sbin/sendmail -bs', + 'path' => '/usr/sbin/sendmail -bs', ], - 'log' => [ + 'log' => [ 'transport' => 'log', - 'channel' => env('MAIL_LOG_CHANNEL'), + 'channel' => env('MAIL_LOG_CHANNEL'), ], - 'array' => [ + 'array' => [ 'transport' => 'array', ], 'failover' => [ 'transport' => 'failover', - 'mailers' => [ + 'mailers' => [ 'smtp', 'log', ], @@ -91,9 +91,9 @@ return [ | */ - 'from' => [ + 'from' => [ 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), - 'name' => env('MAIL_FROM_NAME', 'Example'), + 'name' => env('MAIL_FROM_NAME', 'Example'), ], /* diff --git a/config/permission.php b/config/permission.php index 5b6e184c..601fdfc7 100644 --- a/config/permission.php +++ b/config/permission.php @@ -2,7 +2,7 @@ return [ - 'models' => [ + 'models' => [ /* * When using the "HasPermissions" trait from this package, we need to know which @@ -24,11 +24,11 @@ return [ * `Spatie\Permission\Contracts\Role` contract. */ - 'role' => Spatie\Permission\Models\Role::class, + 'role' => Spatie\Permission\Models\Role::class, ], - 'table_names' => [ + 'table_names' => [ /* * When using the "HasRoles" trait from this package, we need to know which @@ -36,7 +36,7 @@ return [ * default value but you may easily change it to any table you like. */ - 'roles' => 'roles', + 'roles' => 'roles', /* * When using the "HasPermissions" trait from this package, we need to know which @@ -44,7 +44,7 @@ return [ * default value but you may easily change it to any table you like. */ - 'permissions' => 'permissions', + 'permissions' => 'permissions', /* * When using the "HasPermissions" trait from this package, we need to know which @@ -60,7 +60,7 @@ return [ * basic default value but you may easily change it to any table you like. */ - 'model_has_roles' => 'model_has_roles', + 'model_has_roles' => 'model_has_roles', /* * When using the "HasRoles" trait from this package, we need to know which @@ -68,14 +68,14 @@ return [ * basic default value but you may easily change it to any table you like. */ - 'role_has_permissions' => 'role_has_permissions', + 'role_has_permissions' => 'role_has_permissions', ], - 'column_names' => [ + 'column_names' => [ /* * Change this if you want to name the related pivots other than defaults */ - 'role_pivot_key' => null, //default 'role_id', + 'role_pivot_key' => null, //default 'role_id', 'permission_pivot_key' => null, //default 'permission_id', /* @@ -86,14 +86,14 @@ return [ * that case, name this `model_uuid`. */ - 'model_morph_key' => 'model_id', + 'model_morph_key' => 'model_id', /* * Change this if you want to use the teams feature and your related model's * foreign key is other than `team_id`. */ - 'team_foreign_key' => 'team_id', + 'team_foreign_key' => 'team_id', ], /* @@ -111,7 +111,7 @@ return [ * 'model_has_permissions'(view the latest version of package's migration file) */ - 'teams' => false, + 'teams' => false, /* * When set to true, the required permission names are added to the exception @@ -119,7 +119,7 @@ return [ * the default setting is false here for optimum safety. */ - 'display_permission_in_exception' => false, + 'display_permission_in_exception' => false, /* * When set to true, the required role names are added to the exception @@ -127,15 +127,15 @@ return [ * the default setting is false here for optimum safety. */ - 'display_role_in_exception' => false, + 'display_role_in_exception' => false, /* * By default wildcard permission lookups are disabled. */ - 'enable_wildcard_permission' => false, + 'enable_wildcard_permission' => false, - 'cache' => [ + 'cache' => [ /* * By default all permissions are cached for 24 hours to speed up performance. @@ -148,7 +148,7 @@ return [ * The cache key used to store all permissions. */ - 'key' => 'spatie.permission.cache', + 'key' => 'spatie.permission.cache', /* * You may optionally indicate a specific cache driver to use for permission and @@ -156,6 +156,6 @@ return [ * file. Using 'default' here means to use the `default` set in cache.php. */ - 'store' => 'default', + 'store' => 'default', ], ]; diff --git a/config/queue.php b/config/queue.php index 25ea5a81..8c2b7e44 100644 --- a/config/queue.php +++ b/config/queue.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('QUEUE_CONNECTION', 'sync'), + 'default' => env('QUEUE_CONNECTION', 'sync'), /* |-------------------------------------------------------------------------- @@ -30,44 +30,44 @@ return [ 'connections' => [ - 'sync' => [ + 'sync' => [ 'driver' => 'sync', ], - 'database' => [ - 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', - 'retry_after' => 90, + 'database' => [ + 'driver' => 'database', + 'table' => 'jobs', + 'queue' => 'default', + 'retry_after' => 90, 'after_commit' => false, ], 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'retry_after' => 90, - 'block_for' => 0, + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', + 'retry_after' => 90, + 'block_for' => 0, 'after_commit' => false, ], - 'sqs' => [ - 'driver' => 'sqs', - 'key' => env('AWS_ACCESS_KEY_ID'), - 'secret' => env('AWS_SECRET_ACCESS_KEY'), - 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), - 'queue' => env('SQS_QUEUE', 'default'), - 'suffix' => env('SQS_SUFFIX'), - 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), + 'sqs' => [ + 'driver' => 'sqs', + 'key' => env('AWS_ACCESS_KEY_ID'), + 'secret' => env('AWS_SECRET_ACCESS_KEY'), + 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), + 'queue' => env('SQS_QUEUE', 'default'), + 'suffix' => env('SQS_SUFFIX'), + 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'after_commit' => false, ], - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => env('REDIS_QUEUE', 'default'), - 'retry_after' => 90, - 'block_for' => null, + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => env('REDIS_QUEUE', 'default'), + 'retry_after' => 90, + 'block_for' => null, 'after_commit' => false, ], @@ -84,10 +84,10 @@ return [ | */ - 'failed' => [ - 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), + 'failed' => [ + 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; diff --git a/config/sanctum.php b/config/sanctum.php index 9281c92d..18611f6d 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -13,10 +13,10 @@ return [ | */ - 'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf( + 'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf( '%s%s', 'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1', - env('APP_URL') ? ','.parse_url(env('APP_URL'), PHP_URL_HOST) : '' + env('APP_URL') ? ',' . parse_url(env('APP_URL'), PHP_URL_HOST) : '' ))), /* @@ -31,7 +31,7 @@ return [ | */ - 'guard' => ['web'], + 'guard' => ['web'], /* |-------------------------------------------------------------------------- @@ -59,7 +59,7 @@ return [ 'middleware' => [ 'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class, - 'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class, + 'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class, ], ]; diff --git a/config/services.php b/config/services.php index 2a1d616c..73b76d8d 100644 --- a/config/services.php +++ b/config/services.php @@ -14,9 +14,9 @@ return [ | */ - 'mailgun' => [ - 'domain' => env('MAILGUN_DOMAIN'), - 'secret' => env('MAILGUN_SECRET'), + 'mailgun' => [ + 'domain' => env('MAILGUN_DOMAIN'), + 'secret' => env('MAILGUN_SECRET'), 'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'), ], @@ -24,8 +24,8 @@ return [ 'token' => env('POSTMARK_TOKEN'), ], - 'ses' => [ - 'key' => env('AWS_ACCESS_KEY_ID'), + 'ses' => [ + 'key' => env('AWS_ACCESS_KEY_ID'), 'secret' => env('AWS_SECRET_ACCESS_KEY'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], diff --git a/config/session.php b/config/session.php index ac0802b1..9d762224 100644 --- a/config/session.php +++ b/config/session.php @@ -18,7 +18,7 @@ return [ | */ - 'driver' => env('SESSION_DRIVER', 'file'), + 'driver' => env('SESSION_DRIVER', 'file'), /* |-------------------------------------------------------------------------- @@ -31,7 +31,7 @@ return [ | */ - 'lifetime' => env('SESSION_LIFETIME', 120), + 'lifetime' => env('SESSION_LIFETIME', 120), 'expire_on_close' => false, @@ -46,7 +46,7 @@ return [ | */ - 'encrypt' => false, + 'encrypt' => false, /* |-------------------------------------------------------------------------- @@ -59,7 +59,7 @@ return [ | */ - 'files' => storage_path('framework/sessions'), + 'files' => storage_path('framework/sessions'), /* |-------------------------------------------------------------------------- @@ -72,7 +72,7 @@ return [ | */ - 'connection' => env('SESSION_CONNECTION', null), + 'connection' => env('SESSION_CONNECTION', null), /* |-------------------------------------------------------------------------- @@ -85,7 +85,7 @@ return [ | */ - 'table' => 'sessions', + 'table' => 'sessions', /* |-------------------------------------------------------------------------- @@ -100,7 +100,7 @@ return [ | */ - 'store' => env('SESSION_STORE', null), + 'store' => env('SESSION_STORE', null), /* |-------------------------------------------------------------------------- @@ -113,7 +113,7 @@ return [ | */ - 'lottery' => [2, 100], + 'lottery' => [2, 100], /* |-------------------------------------------------------------------------- @@ -126,9 +126,9 @@ return [ | */ - 'cookie' => env( + 'cookie' => env( 'SESSION_COOKIE', - Str::slug(env('APP_NAME', 'laravel'), '_').'_session' + Str::slug(env('APP_NAME', 'laravel'), '_') . '_session' ), /* @@ -142,7 +142,7 @@ return [ | */ - 'path' => '/', + 'path' => '/', /* |-------------------------------------------------------------------------- @@ -155,7 +155,7 @@ return [ | */ - 'domain' => env('SESSION_DOMAIN', null), + 'domain' => env('SESSION_DOMAIN', null), /* |-------------------------------------------------------------------------- @@ -168,7 +168,7 @@ return [ | */ - 'secure' => env('SESSION_SECURE_COOKIE'), + 'secure' => env('SESSION_SECURE_COOKIE'), /* |-------------------------------------------------------------------------- @@ -181,7 +181,7 @@ return [ | */ - 'http_only' => true, + 'http_only' => true, /* |-------------------------------------------------------------------------- @@ -196,6 +196,6 @@ return [ | */ - 'same_site' => 'lax', + 'same_site' => 'lax', ]; diff --git a/config/sitemap.php b/config/sitemap.php index 495306c0..74c9cc88 100644 --- a/config/sitemap.php +++ b/config/sitemap.php @@ -2,13 +2,13 @@ /* Simple configuration file for Laravel Sitemap package */ return [ - 'use_cache' => false, - 'cache_key' => 'laravel-sitemap.'.config('app.url'), - 'cache_duration' => 3600, - 'escaping' => true, - 'use_limit_size' => false, - 'max_size' => null, - 'use_styles' => false, + 'use_cache' => false, + 'cache_key' => 'laravel-sitemap.' . config('app.url'), + 'cache_duration' => 3600, + 'escaping' => true, + 'use_limit_size' => false, + 'max_size' => null, + 'use_styles' => false, 'styles_location' => '/vendor/sitemap/styles/', - 'use_gzip' => false + 'use_gzip' => false, ]; diff --git a/config/view.php b/config/view.php index d2021f23..9414744a 100644 --- a/config/view.php +++ b/config/view.php @@ -13,7 +13,7 @@ return [ | */ - 'paths' => [ + 'paths' => [ base_path('themes/default'), resource_path('views'), ], diff --git a/index.php b/index.php index 192a051f..3321b816 100644 --- a/index.php +++ b/index.php @@ -8,6 +8,5 @@ * @created 2022-09-06 10:50:56 * @modified 2022-09-06 10:50:56 */ - $currentDir = getcwd(); -die("请修改 Apache 或 Nginx 配置, 将网站根目录设置为: {$currentDir}/public/"); +exit("请修改 Apache 或 Nginx 配置, 将网站根目录设置为: {$currentDir}/public/"); diff --git a/public/index.php b/public/index.php index fe16d77f..8c04c4e6 100644 --- a/public/index.php +++ b/public/index.php @@ -3,10 +3,10 @@ use Illuminate\Contracts\Http\Kernel; use Illuminate\Http\Request; -$basePath = getcwd() . '/'; -$htaPath = $basePath . '.htaccess'; +$basePath = getcwd() . '/'; +$htaPath = $basePath . '.htaccess'; $htaExamplePath = $basePath . 'htaccess.txt'; -if (!file_exists($htaPath)) { +if (! file_exists($htaPath)) { if (file_exists($htaExamplePath)) { copy($htaExamplePath, $htaPath); } else { @@ -14,10 +14,10 @@ if (!file_exists($htaPath)) { } } -if (!file_exists(__DIR__ . '/../storage/installed') - && !(isset($_SERVER['REQUEST_URI']) && substr($_SERVER['REQUEST_URI'], 0, 10) == '/installer') +if (! file_exists(__DIR__ . '/../storage/installed') + && ! (isset($_SERVER['REQUEST_URI']) && substr($_SERVER['REQUEST_URI'], 0, 10) == '/installer') && (stripos($_SERVER['REQUEST_URI'], '_debugbar') !== 1)) { - header("Location: /installer"); + header('Location: /installer'); exit; } diff --git a/resources/lang/de/address.php b/resources/lang/de/address.php index bf4bdae6..37e25e29 100644 --- a/resources/lang/de/address.php +++ b/resources/lang/de/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Adresse bearbeiten', - 'name' => 'Name', - 'phone' => 'Telefonnummer', - 'country_id' => 'Landes-ID', - 'zone' => 'Provinz', - 'zone_id' => 'Provinz-ID', - 'address_1' => 'Adresse 1', - 'adresse_2' => 'Adresse 2', - 'adresse' => 'Adresse', - 'enter_city' => 'Adresse eingeben', - 'post_code' => 'Postleitzahl', - 'default' => 'Standardadresse', + 'index' => 'Adresse bearbeiten', + 'name' => 'Name', + 'phone' => 'Telefonnummer', + 'country_id' => 'Landes-ID', + 'zone' => 'Provinz', + 'zone_id' => 'Provinz-ID', + 'address_1' => 'Adresse 1', + 'adresse_2' => 'Adresse 2', + 'adresse' => 'Adresse', + 'enter_city' => 'Adresse eingeben', + 'post_code' => 'Postleitzahl', + 'default' => 'Standardadresse', ]; diff --git a/resources/lang/de/admin/admin_roles.php b/resources/lang/de/admin/admin_roles.php index 84910d66..791555bb 100644 --- a/resources/lang/de/admin/admin_roles.php +++ b/resources/lang/de/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => 'alle auswählen', - 'unselect_all' => 'Auswahl aufheben', - 'role_name' => 'Rollenname', - 'role_management' => 'Rollenverwaltung', - 'permission' => 'Erlaubnis', - 'error_roles' => 'Bitte mindestens eine Rolle auswählen', + 'select_all' => 'alle auswählen', + 'unselect_all' => 'Auswahl aufheben', + 'role_name' => 'Rollenname', + 'role_management' => 'Rollenverwaltung', + 'permission' => 'Erlaubnis', + 'error_roles' => 'Bitte mindestens eine Rolle auswählen', ]; diff --git a/resources/lang/de/admin/attribute.php b/resources/lang/de/admin/attribute.php index a70f826a..cd906c95 100644 --- a/resources/lang/de/admin/attribute.php +++ b/resources/lang/de/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'attribut', - 'attribute_info' => 'Attributinformationen', - 'create_at' => 'Attribut erstellen', - 'attribute_value' => 'Attributwert', - 'set_attribute' => 'Konfigurationsattribut', - 'add_attribute' => 'Attributwert hinzufügen', + 'index' => 'attribut', + 'attribute_info' => 'Attributinformationen', + 'create_at' => 'Attribut erstellen', + 'attribute_value' => 'Attributwert', + 'set_attribute' => 'Konfigurationsattribut', + 'add_attribute' => 'Attributwert hinzufügen', 'before_attribute' => 'Bitte zuerst das linke Attribut auswählen', - 'btn_at' => 'Jetzt gehen', - 'btn_later' => 'Später gehen', - 'to_info_values' => 'Bitte gehen Sie zur Detailseite, um Attributwerte zu bearbeiten', + 'btn_at' => 'Jetzt gehen', + 'btn_later' => 'Später gehen', + 'to_info_values' => 'Bitte gehen Sie zur Detailseite, um Attributwerte zu bearbeiten', ]; diff --git a/resources/lang/de/admin/attribute_groups.php b/resources/lang/de/admin/attribute_groups.php index 79c5d527..233a0490 100644 --- a/resources/lang/de/admin/attribute_groups.php +++ b/resources/lang/de/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => 'Attributgruppe', + 'index' => 'Attributgruppe', 'create_at_groups' => 'Attributgruppe erstellen', ]; diff --git a/resources/lang/de/admin/brand.php b/resources/lang/de/admin/brand.php index e430ba58..4ce1e058 100644 --- a/resources/lang/de/admin/brand.php +++ b/resources/lang/de/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => 'Marke', + 'index' => 'Marke', - 'brands_index' => 'Markenliste', - 'brands_create' => 'Eine Marke erstellen', - 'brands_show' => 'Markendetails', - 'brands_update' => 'Marke aktualisieren', - 'brands_delete' => 'Marke löschen', - 'error_upload' => 'Bitte laden Sie das Symbol hoch' + 'brands_index' => 'Markenliste', + 'brands_create' => 'Eine Marke erstellen', + 'brands_show' => 'Markendetails', + 'brands_update' => 'Marke aktualisieren', + 'brands_delete' => 'Marke löschen', + 'error_upload' => 'Bitte laden Sie das Symbol hoch', ]; diff --git a/resources/lang/de/admin/builder.php b/resources/lang/de/admin/builder.php index 019b40a0..450b31f9 100644 --- a/resources/lang/de/admin/builder.php +++ b/resources/lang/de/admin/builder.php @@ -11,242 +11,242 @@ */ return [ - 'heading_title' => 'Seitenbearbeitung', - 'modules_instructions' => 'Verfügbare Module, zum Hinzufügen zur Seite klicken', - 'text_floor_prompt' => 'Einstellungen (Etagenkonfiguration muss gespeichert und aktualisiert werden, um die Seite zu aktualisieren)', - 'text_new_page' => 'Neue Seite hinzufügen', - 'text_quit' => 'Beenden', - 'text_save' => 'Speichern', - 'text_view_page' => 'Seite ansehen', - 'text_module' => 'modul', - 'text_module_title' => 'Modultitel', - 'text_menu' => 'Navigation', - 'text_drag_sort' => 'Ziehen sortieren', - 'text_set_up' => 'setup', - 'text_delete' => 'Löschen', - 'text_floor' => 'Etage', - 'text_add_module' => 'Modul hinzufügen', - 'text_to_menu' => 'Navigationsmenü bearbeiten', - 'text_other' => 'andere', - 'text_preparing' => 'Vorbereitung...', - 'text_floor_setting' => 'Bodeneinstellung', - 'text_background_color' => 'Hintergrundfarbe', - 'text_sure' => 'OK', - 'text_page_name' => 'Bitte geben Sie einen neuen Seitennamen ein', - 'text_is_save' => 'Bitte stellen Sie sicher, dass die aktuellen Seitendaten gespeichert wurden! ', - 'text_pop_ads' => 'Pop-up-Werbung', - 'text_style_setting' => 'Stileinstellung', - 'text_is_save_data' => 'Vor dem Seitenwechsel sicherstellen, dass die aktuellen Seitendaten gespeichert wurden? ', - 'text_hint' => 'Hinweis', - 'text_cancel' => 'Abbrechen', - 'text_created_success' => 'Seite erfolgreich erstellt', - 'text_html_none' => 'Fehler beim Laden des Moduls, HTML-Daten sind leer! ', - 'text_is_delete' => 'OK zum Löschen', - 'text_enable' => 'aktivieren', - 'text_set_title' => 'Konfigurationstitel', - 'text_set_subtitle' => 'Untertitel konfigurieren', - 'text_suggested_size' => 'Vorgeschlagene Größe (Breite x Höhe): ', - 'text_word' => 'text', - 'text_add_pictures' => 'Bilder hinzufügen', - 'text_refresh_cookie' => 'Cookie aktualisieren', - 'text_popup_hint' => 'Hinweis: Die Klicks des Benutzers zum Schließen werden nicht mehr angezeigt, bis der Browser geschlossen und erneut geöffnet wird. Für lokale Tests können Sie auf „Cookie aktualisieren“ klicken, dann den Browser aktualisieren und das Popup-Fenster kann erneut aktiviert werden. ', - 'text_cookie_refresh_success' => 'Cookie-Aktualisierung erfolgreich, aktualisieren Sie den Browser, um den Inhalt des Pop-up-Fensters zu sehen. ', - 'text_add_hot_links' => 'Hot-Search-Links hinzufügen', - 'text_add' => 'Hinzufügen', - 'text_margin_top' => 'Modulpolsterung - oben', - 'text_margin_bottom' => 'Modulpolsterung - unten', - 'text_file_manager' => 'Dateimanager', - 'modules_link' => 'link', - 'modules_choose_link' => 'Link auswählen', - 'text_select_link' => 'Bitte wählen Sie die Linkseite aus, zu der gesprungen werden soll', - 'text_no' => 'nein', - 'text_search' => 'Suche', - 'text_is_newpage' => 'Ob ein neues Fenster geöffnet wird:', - 'text_manage' => 'Verwaltung', - 'text_title_cover' => 'Titel (deckt den unten ausgewählten Linknamen ab)', - 'text_enter_link' => 'Bitte geben Sie die Linkadresse ein', - 'text_states' => 'Zustand', - 'text_disable' => 'deaktivieren', - 'text_no_data' => 'Daten existieren nicht oder wurden gelöscht', - 'text_to_add' => 'hinzufügen', - 'text_category' => 'Kategorie', - 'text_information' => 'Informationsseite', - 'text_manufacturer' => 'Marke', - 'text_static' => 'feste Verbindung', - 'text_custom' => 'benutzerdefiniert', - 'text_top_text' => 'Oberster Text', - 'text_edit_page_name' => 'Seitenname ändern', - 'text_page_name_no' => 'Der Name darf nicht leer sein', - 'custom_name' => 'benutzerdefinierter Name', + 'heading_title' => 'Seitenbearbeitung', + 'modules_instructions' => 'Verfügbare Module, zum Hinzufügen zur Seite klicken', + 'text_floor_prompt' => 'Einstellungen (Etagenkonfiguration muss gespeichert und aktualisiert werden, um die Seite zu aktualisieren)', + 'text_new_page' => 'Neue Seite hinzufügen', + 'text_quit' => 'Beenden', + 'text_save' => 'Speichern', + 'text_view_page' => 'Seite ansehen', + 'text_module' => 'modul', + 'text_module_title' => 'Modultitel', + 'text_menu' => 'Navigation', + 'text_drag_sort' => 'Ziehen sortieren', + 'text_set_up' => 'setup', + 'text_delete' => 'Löschen', + 'text_floor' => 'Etage', + 'text_add_module' => 'Modul hinzufügen', + 'text_to_menu' => 'Navigationsmenü bearbeiten', + 'text_other' => 'andere', + 'text_preparing' => 'Vorbereitung...', + 'text_floor_setting' => 'Bodeneinstellung', + 'text_background_color' => 'Hintergrundfarbe', + 'text_sure' => 'OK', + 'text_page_name' => 'Bitte geben Sie einen neuen Seitennamen ein', + 'text_is_save' => 'Bitte stellen Sie sicher, dass die aktuellen Seitendaten gespeichert wurden! ', + 'text_pop_ads' => 'Pop-up-Werbung', + 'text_style_setting' => 'Stileinstellung', + 'text_is_save_data' => 'Vor dem Seitenwechsel sicherstellen, dass die aktuellen Seitendaten gespeichert wurden? ', + 'text_hint' => 'Hinweis', + 'text_cancel' => 'Abbrechen', + 'text_created_success' => 'Seite erfolgreich erstellt', + 'text_html_none' => 'Fehler beim Laden des Moduls, HTML-Daten sind leer! ', + 'text_is_delete' => 'OK zum Löschen', + 'text_enable' => 'aktivieren', + 'text_set_title' => 'Konfigurationstitel', + 'text_set_subtitle' => 'Untertitel konfigurieren', + 'text_suggested_size' => 'Vorgeschlagene Größe (Breite x Höhe): ', + 'text_word' => 'text', + 'text_add_pictures' => 'Bilder hinzufügen', + 'text_refresh_cookie' => 'Cookie aktualisieren', + 'text_popup_hint' => 'Hinweis: Die Klicks des Benutzers zum Schließen werden nicht mehr angezeigt, bis der Browser geschlossen und erneut geöffnet wird. Für lokale Tests können Sie auf „Cookie aktualisieren“ klicken, dann den Browser aktualisieren und das Popup-Fenster kann erneut aktiviert werden. ', + 'text_cookie_refresh_success' => 'Cookie-Aktualisierung erfolgreich, aktualisieren Sie den Browser, um den Inhalt des Pop-up-Fensters zu sehen. ', + 'text_add_hot_links' => 'Hot-Search-Links hinzufügen', + 'text_add' => 'Hinzufügen', + 'text_margin_top' => 'Modulpolsterung - oben', + 'text_margin_bottom' => 'Modulpolsterung - unten', + 'text_file_manager' => 'Dateimanager', + 'modules_link' => 'link', + 'modules_choose_link' => 'Link auswählen', + 'text_select_link' => 'Bitte wählen Sie die Linkseite aus, zu der gesprungen werden soll', + 'text_no' => 'nein', + 'text_search' => 'Suche', + 'text_is_newpage' => 'Ob ein neues Fenster geöffnet wird:', + 'text_manage' => 'Verwaltung', + 'text_title_cover' => 'Titel (deckt den unten ausgewählten Linknamen ab)', + 'text_enter_link' => 'Bitte geben Sie die Linkadresse ein', + 'text_states' => 'Zustand', + 'text_disable' => 'deaktivieren', + 'text_no_data' => 'Daten existieren nicht oder wurden gelöscht', + 'text_to_add' => 'hinzufügen', + 'text_category' => 'Kategorie', + 'text_information' => 'Informationsseite', + 'text_manufacturer' => 'Marke', + 'text_static' => 'feste Verbindung', + 'text_custom' => 'benutzerdefiniert', + 'text_top_text' => 'Oberster Text', + 'text_edit_page_name' => 'Seitenname ändern', + 'text_page_name_no' => 'Der Name darf nicht leer sein', + 'custom_name' => 'benutzerdefinierter Name', // Feste Verbindung - 'text_static_product_latest' => 'Neuestes Produkt', - 'text_static_product_special' => 'Sonderprodukt', - 'text_static_product_manufacturer' => 'Markenbereich', - 'text_static_account_account' => 'Mitgliederzentrum', - 'text_static_account_order' => 'historische Reihenfolge', - 'text_static_account_wishlist' => 'Favoritenliste', - 'text_static_affiliate_login' => 'Affiliate-Mitglied', - 'text_static_account_newsletter' => 'Beratung abonnieren', - 'text_static_information_contact' => 'Kontaktieren Sie uns', - 'text_static_information_sitemap' => 'Sitemap', - 'text_static_information_faq' => 'Häufig gestellte Fragen', - 'text_static_account_voucher' => 'Geschenkgutschein', - 'text_static_account_login' => 'Anmeldung', - 'text_static_account_register' => 'registrieren', - 'text_static_checkout_cart' => 'Warenkorb', - 'text_static_blog_home' => 'Blog', + 'text_static_product_latest' => 'Neuestes Produkt', + 'text_static_product_special' => 'Sonderprodukt', + 'text_static_product_manufacturer' => 'Markenbereich', + 'text_static_account_account' => 'Mitgliederzentrum', + 'text_static_account_order' => 'historische Reihenfolge', + 'text_static_account_wishlist' => 'Favoritenliste', + 'text_static_affiliate_login' => 'Affiliate-Mitglied', + 'text_static_account_newsletter' => 'Beratung abonnieren', + 'text_static_information_contact' => 'Kontaktieren Sie uns', + 'text_static_information_sitemap' => 'Sitemap', + 'text_static_information_faq' => 'Häufig gestellte Fragen', + 'text_static_account_voucher' => 'Geschenkgutschein', + 'text_static_account_login' => 'Anmeldung', + 'text_static_account_register' => 'registrieren', + 'text_static_checkout_cart' => 'Warenkorb', + 'text_static_blog_home' => 'Blog', - 'text_edit_product' => 'Produktdetails bearbeiten', - 'text_edit_home' => 'Startseite bearbeiten', - 'text_edit_mb_home' => 'Mobile Startseite bearbeiten', - 'text_footer_edit' => 'Fußzeile bearbeiten', - 'text_header_edit' => 'Kopfzeile bearbeiten', - 'text_save_refresh' => 'Speichern und aktualisieren', - 'text_save_refresh_header' => 'Speichern (Header aktualisieren)', - 'text_service_icon' => 'Dienstsymbol', - 'text_describe' => 'Beschreibung', - 'text_add_link' => 'Link hinzufügen', - 'text_is_btn' => 'ob die Schaltfläche angezeigt werden soll', - 'text_phone' => 'Telefon', - 'text_address' => 'Adresse', - 'text_email' => 'Postfach', - 'text_copyright' => 'Urheberrecht/Bild', - 'text_yq_link' => 'Freundschaftslink', - 'text_link_bar' => 'Linkleiste', - 'text_introduce' => 'Einführung', - 'text_up_logo' => 'Logo hochladen', - 'text_hot_keywords' => 'heiße Suchbegriffe', - 'text_title' => 'Titel', - 'text_text_notific' => 'Textbenachrichtigung', - 'text_only_home' => 'Nur auf der Startseite angezeigt', - 'text_background_color' => 'Hintergrundfarbe', - 'text_font_color' => 'Schriftfarbe', - 'text_image' => 'Bild', - 'text_show' => 'Anzeige', - 'text_is_phone' => 'Kontakttelefonnummer anzeigen', - 'text_half_angle' => 'Kommas halber Breite zum Trennen verwenden', - 'text_prompt_words' => 'Eingabeaufforderungstext', - 'text_search_bar' => 'Suchleiste', - 'text_btn_text' => 'Schaltflächentext', - 'text_banner_ad' => 'Banneranzeige', - 'text_l_c' => 'Spalte Sprache/Währung', - 'text_top_color' => 'Obere Farbe', - 'text_title_color' => 'Titelfarbe', - 'text_color' => 'Farbe', - 'text_left_text' => 'linker Text', - 'text_right_icon' => 'rechtes Zahlungssymbol', - 'text_bgi' => 'Hintergrundbild', - 'text_btn' => 'Schaltfläche', + 'text_edit_product' => 'Produktdetails bearbeiten', + 'text_edit_home' => 'Startseite bearbeiten', + 'text_edit_mb_home' => 'Mobile Startseite bearbeiten', + 'text_footer_edit' => 'Fußzeile bearbeiten', + 'text_header_edit' => 'Kopfzeile bearbeiten', + 'text_save_refresh' => 'Speichern und aktualisieren', + 'text_save_refresh_header' => 'Speichern (Header aktualisieren)', + 'text_service_icon' => 'Dienstsymbol', + 'text_describe' => 'Beschreibung', + 'text_add_link' => 'Link hinzufügen', + 'text_is_btn' => 'ob die Schaltfläche angezeigt werden soll', + 'text_phone' => 'Telefon', + 'text_address' => 'Adresse', + 'text_email' => 'Postfach', + 'text_copyright' => 'Urheberrecht/Bild', + 'text_yq_link' => 'Freundschaftslink', + 'text_link_bar' => 'Linkleiste', + 'text_introduce' => 'Einführung', + 'text_up_logo' => 'Logo hochladen', + 'text_hot_keywords' => 'heiße Suchbegriffe', + 'text_title' => 'Titel', + 'text_text_notific' => 'Textbenachrichtigung', + 'text_only_home' => 'Nur auf der Startseite angezeigt', + 'text_background_color' => 'Hintergrundfarbe', + 'text_font_color' => 'Schriftfarbe', + 'text_image' => 'Bild', + 'text_show' => 'Anzeige', + 'text_is_phone' => 'Kontakttelefonnummer anzeigen', + 'text_half_angle' => 'Kommas halber Breite zum Trennen verwenden', + 'text_prompt_words' => 'Eingabeaufforderungstext', + 'text_search_bar' => 'Suchleiste', + 'text_btn_text' => 'Schaltflächentext', + 'text_banner_ad' => 'Banneranzeige', + 'text_l_c' => 'Spalte Sprache/Währung', + 'text_top_color' => 'Obere Farbe', + 'text_title_color' => 'Titelfarbe', + 'text_color' => 'Farbe', + 'text_left_text' => 'linker Text', + 'text_right_icon' => 'rechtes Zahlungssymbol', + 'text_bgi' => 'Hintergrundbild', + 'text_btn' => 'Schaltfläche', // page - 'page_product_title_size' => 'Schriftgröße des Produkttitels', - 'page_product_title_color' => 'Produkttitelfarbe', - 'page_product_price_color' => 'Produktpreisfarbe', - 'page_product_thumb_position' => 'Thumbnail-Position', - 'page_product_image' => 'Produktbild', - 'page_product_bottom' => 'unten', - 'page_product_left' => 'linke Seite', - 'page_product_magnifying_style' => 'Lupenstil', - 'page_product_magnifying_window' => 'externes Fenster', - 'page_product_magnifying_inner' => 'interne Aufhängung', - 'page_product_magnifying_lens' => 'interne Lupe', - 'page_product_share' => 'Teilen', - 'page_product_share_code' => 'Share-Code', - 'page_product_general_settings' => 'Allgemeine Einstellungen', - 'page_product_font_size' => 'Schriftgröße', + 'page_product_title_size' => 'Schriftgröße des Produkttitels', + 'page_product_title_color' => 'Produkttitelfarbe', + 'page_product_price_color' => 'Produktpreisfarbe', + 'page_product_thumb_position' => 'Thumbnail-Position', + 'page_product_image' => 'Produktbild', + 'page_product_bottom' => 'unten', + 'page_product_left' => 'linke Seite', + 'page_product_magnifying_style' => 'Lupenstil', + 'page_product_magnifying_window' => 'externes Fenster', + 'page_product_magnifying_inner' => 'interne Aufhängung', + 'page_product_magnifying_lens' => 'interne Lupe', + 'page_product_share' => 'Teilen', + 'page_product_share_code' => 'Share-Code', + 'page_product_general_settings' => 'Allgemeine Einstellungen', + 'page_product_font_size' => 'Schriftgröße', // ModuleS List - 'modules_photo_text' => 'Bild- und Textmix', - 'modules_video_module' => 'Videomodul', - 'modules_customer_reviews' => 'Kundenrezensionen', - 'modules_images_link' => 'Multi-Image-Link', - 'modules_background_icon_text' => 'Hintergrundsymboltext', - 'modules_slideshow_category' => 'Diashow-Kategorie', - 'modules_bargain' => 'Schnäppchen', - 'modules_bestseller' => 'Bestseller', - 'modules_blog' => 'Blog', - 'modules_carousel' => 'Swing Bo-Symbol', - 'modules_category' => 'Kategoriemodul', - 'modules_coupon' => 'Gutschein', - 'modules_flash_sale' => 'Rohstoffspitze', - 'modules_group_buying' => 'Einkaufsgruppe', - 'modules_html' => 'Rich-Text', - 'modules_icon_text' => 'Symboltext', - 'modules_image_100' => 'Einzelbildmodul', - 'modules_image_200' => 'eine Zeile zwei Bilder', - 'modules_image_300' => 'eine Zeile drei Bilder', - 'modules_image_301' => 'eine Zeile drei Bilder-Pro', - 'modules_image_400' => 'eine Zeile vier Bilder', - 'modules_image_401' => 'one line four images-pro', - 'modules_latest' => 'neuestes Produkt', - 'modules_manufacturer' => 'Markenliste', - 'modules_product' => 'Produkt', - 'modules_product_tab' => 'Tab-Produkte', - 'modules_slideshow' => 'Diashow', - 'modules_quantity' => 'Mengenbegrenzung anzeigen', - 'modules_manage_bargain' => 'Handelswaren verwalten', - 'modules_manage_blog' => 'Management-Blog', - 'modules_no_blog' => 'Keine Artikel, bitte gehen Sie zu [Content Management -> Blog Management], um Artikel zu konfigurieren. ', - 'modules_slides_per_view' => 'Eine Bildschirmanzeigenummer', - 'modules_enter_content' => 'Bitte Inhalt eingeben', - 'modules_full_screen' => 'Ob Vollbild', - 'modules_content' => 'Inhalt', - 'modules_edit_content' => 'Inhalt bearbeiten', - 'modules_select_image' => 'Bild auswählen', - 'modules_quantity_line' => 'eine Zeile zeigt mehrere', - 'modules_please_choose' => 'bitte auswählen', - 'modules_choose' => 'auswählen', - 'modules_add_category' => 'Kategorie hinzufügen', - 'modules_choose_category' => 'Kategorie wählen', - 'modules_set_coupon' => 'Gutscheinkonfiguration', - 'modules_no_coupon' => 'Keine Gutscheindaten', - 'modules_manage_flash' => 'Spike-Produkte verwalten', - 'modules_manage_group' => 'Gruppenprodukte verwalten', - 'modules_no_state' => 'Das aktuelle Modul ist nicht aktiviert oder konfiguriert, bitte gehen Sie in den Hintergrund [Modulverwaltung], um dieses Modul zu konfigurieren. ', - 'modules_grid_mode' => 'Grid-Modus', - 'modules_more_link' => 'weitere Links', - 'modules_choose_brand' => 'Marke wählen', - 'modules_set_product' => 'Produkte konfigurieren', - 'modules_keywords_search' => 'Bitte Stichwortsuche eingeben', - 'modules_test_name' => 'Testname', - 'modules_please_products' => 'bitte Produkte hinzufügen', - 'modules_image_size' => 'Bildgröße', - 'modules_height' => 'hoch', - 'modules_width' => 'Breite', - 'modules_category_style' => 'Kategorieanzeigestil', - 'modules_down' => 'unten', - 'modules_left' => 'links', - 'modules_category_no' => 'Nicht kategorisieren', - 'modules_review_name' => 'name', - 'modules_profession' => 'professionell', - 'modules_video_cover' => 'Videocover', - 'modules_video' => 'video', + 'modules_photo_text' => 'Bild- und Textmix', + 'modules_video_module' => 'Videomodul', + 'modules_customer_reviews' => 'Kundenrezensionen', + 'modules_images_link' => 'Multi-Image-Link', + 'modules_background_icon_text' => 'Hintergrundsymboltext', + 'modules_slideshow_category' => 'Diashow-Kategorie', + 'modules_bargain' => 'Schnäppchen', + 'modules_bestseller' => 'Bestseller', + 'modules_blog' => 'Blog', + 'modules_carousel' => 'Swing Bo-Symbol', + 'modules_category' => 'Kategoriemodul', + 'modules_coupon' => 'Gutschein', + 'modules_flash_sale' => 'Rohstoffspitze', + 'modules_group_buying' => 'Einkaufsgruppe', + 'modules_html' => 'Rich-Text', + 'modules_icon_text' => 'Symboltext', + 'modules_image_100' => 'Einzelbildmodul', + 'modules_image_200' => 'eine Zeile zwei Bilder', + 'modules_image_300' => 'eine Zeile drei Bilder', + 'modules_image_301' => 'eine Zeile drei Bilder-Pro', + 'modules_image_400' => 'eine Zeile vier Bilder', + 'modules_image_401' => 'one line four images-pro', + 'modules_latest' => 'neuestes Produkt', + 'modules_manufacturer' => 'Markenliste', + 'modules_product' => 'Produkt', + 'modules_product_tab' => 'Tab-Produkte', + 'modules_slideshow' => 'Diashow', + 'modules_quantity' => 'Mengenbegrenzung anzeigen', + 'modules_manage_bargain' => 'Handelswaren verwalten', + 'modules_manage_blog' => 'Management-Blog', + 'modules_no_blog' => 'Keine Artikel, bitte gehen Sie zu [Content Management -> Blog Management], um Artikel zu konfigurieren. ', + 'modules_slides_per_view' => 'Eine Bildschirmanzeigenummer', + 'modules_enter_content' => 'Bitte Inhalt eingeben', + 'modules_full_screen' => 'Ob Vollbild', + 'modules_content' => 'Inhalt', + 'modules_edit_content' => 'Inhalt bearbeiten', + 'modules_select_image' => 'Bild auswählen', + 'modules_quantity_line' => 'eine Zeile zeigt mehrere', + 'modules_please_choose' => 'bitte auswählen', + 'modules_choose' => 'auswählen', + 'modules_add_category' => 'Kategorie hinzufügen', + 'modules_choose_category' => 'Kategorie wählen', + 'modules_set_coupon' => 'Gutscheinkonfiguration', + 'modules_no_coupon' => 'Keine Gutscheindaten', + 'modules_manage_flash' => 'Spike-Produkte verwalten', + 'modules_manage_group' => 'Gruppenprodukte verwalten', + 'modules_no_state' => 'Das aktuelle Modul ist nicht aktiviert oder konfiguriert, bitte gehen Sie in den Hintergrund [Modulverwaltung], um dieses Modul zu konfigurieren. ', + 'modules_grid_mode' => 'Grid-Modus', + 'modules_more_link' => 'weitere Links', + 'modules_choose_brand' => 'Marke wählen', + 'modules_set_product' => 'Produkte konfigurieren', + 'modules_keywords_search' => 'Bitte Stichwortsuche eingeben', + 'modules_test_name' => 'Testname', + 'modules_please_products' => 'bitte Produkte hinzufügen', + 'modules_image_size' => 'Bildgröße', + 'modules_height' => 'hoch', + 'modules_width' => 'Breite', + 'modules_category_style' => 'Kategorieanzeigestil', + 'modules_down' => 'unten', + 'modules_left' => 'links', + 'modules_category_no' => 'Nicht kategorisieren', + 'modules_review_name' => 'name', + 'modules_profession' => 'professionell', + 'modules_video_cover' => 'Videocover', + 'modules_video' => 'video', // mobile - 'mobile_search' => 'Suchleiste', - 'mobile_search_normal' => 'Nicht am oberen Bildschirmrand angeheftet', - 'mobile_search_hide' => 'Top-Suchleiste nicht anzeigen', - 'mobile_search_fixed' => 'Am oberen Bildschirmrand anheften (Standard)', + 'mobile_search' => 'Suchleiste', + 'mobile_search_normal' => 'Nicht am oberen Bildschirmrand angeheftet', + 'mobile_search_hide' => 'Top-Suchleiste nicht anzeigen', + 'mobile_search_fixed' => 'Am oberen Bildschirmrand anheften (Standard)', // Menu - 'main_menu' => 'Hauptmenü', - 'please_add_data' => 'Bitte Daten hinzufügen', - 'add_main_menu' => 'Hauptmenü hinzufügen', - 'main_menu_name_link' => 'Name/Link des Hauptmenüs', - 'main_menu_label' => 'Hauptmenübeschriftung', - 'label_background_color' => 'Hintergrundfarbe des Etiketts', - 'label_text_color' => 'Etikettentextfarbe', - 'submenu_group' => 'Untermenü (Gruppe)', - 'add_menu_group' => 'Menügruppe hinzufügen', - 'full_screen' => 'Ob Vollbild', - 'menu' => 'Menü', - 'add_submenu_link' => 'Link zum Untermenü hinzufügen', - 'type' => 'Typ', + 'main_menu' => 'Hauptmenü', + 'please_add_data' => 'Bitte Daten hinzufügen', + 'add_main_menu' => 'Hauptmenü hinzufügen', + 'main_menu_name_link' => 'Name/Link des Hauptmenüs', + 'main_menu_label' => 'Hauptmenübeschriftung', + 'label_background_color' => 'Hintergrundfarbe des Etiketts', + 'label_text_color' => 'Etikettentextfarbe', + 'submenu_group' => 'Untermenü (Gruppe)', + 'add_menu_group' => 'Menügruppe hinzufügen', + 'full_screen' => 'Ob Vollbild', + 'menu' => 'Menü', + 'add_submenu_link' => 'Link zum Untermenü hinzufügen', + 'type' => 'Typ', // footer - 'footer_edit' => 'Fußzeilen-Editor', - 'sub_title' => 'Untertitel', - 'introduction' => 'Einführung', - 'copyright_settings' => 'Copyright-Einstellungen', + 'footer_edit' => 'Fußzeilen-Editor', + 'sub_title' => 'Untertitel', + 'introduction' => 'Einführung', + 'copyright_settings' => 'Copyright-Einstellungen', ]; diff --git a/resources/lang/de/admin/category.php b/resources/lang/de/admin/category.php index cefec0cb..347497ae 100644 --- a/resources/lang/de/admin/category.php +++ b/resources/lang/de/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Kategorie', - 'edit_category' => 'Kategorie bearbeiten', - 'upper_category' => 'höhere Kategorie', + 'index' => 'Kategorie', + 'edit_category' => 'Kategorie bearbeiten', + 'upper_category' => 'höhere Kategorie', - 'categories_index' => 'Kategorieliste', - 'categories_create' => 'Kategorien erstellen', - 'categories_show' => 'Kategoriedetails', - 'categories_update' => 'Kategorien aktualisieren', - 'categories_delete' => 'Kategorie löschen', + 'categories_index' => 'Kategorieliste', + 'categories_create' => 'Kategorien erstellen', + 'categories_show' => 'Kategoriedetails', + 'categories_update' => 'Kategorien aktualisieren', + 'categories_delete' => 'Kategorie löschen', ]; diff --git a/resources/lang/de/admin/common.php b/resources/lang/de/admin/common.php index 7bc3e431..355888e5 100644 --- a/resources/lang/de/admin/common.php +++ b/resources/lang/de/admin/common.php @@ -10,65 +10,65 @@ */ return [ - 'admin_panel' => 'Backstage-Management', - 'edit' => 'bearbeiten', - 'status' => 'Status', - 'action' => 'Aktion', - 'install' => 'installieren', - 'uninstall' => 'deinstallieren', + 'admin_panel' => 'Backstage-Management', + 'edit' => 'bearbeiten', + 'status' => 'Status', + 'action' => 'Aktion', + 'install' => 'installieren', + 'uninstall' => 'deinstallieren', // errors - 'forbidden' => 'Kein Zugang', - 'has_no_permission' => 'Sie sind nicht berechtigt, auf diese Seite zuzugreifen, wenden Sie sich bitte an Ihren Systemadministrator.', + 'forbidden' => 'Kein Zugang', + 'has_no_permission' => 'Sie sind nicht berechtigt, auf diese Seite zuzugreifen, wenden Sie sich bitte an Ihren Systemadministrator.', // header - 'home' => 'Startseite verwalten', - 'order' => 'Auftragsverwaltung', - 'rma' => 'Kundendienstverwaltung', - 'rma_reason' => 'Rücksendegrundverwaltung', - 'product' => 'Produktmanagement', - 'brand' => 'Markenführung', - 'category' => 'category management', - 'customer_group' => 'Kundengruppenverwaltung', - 'customer' => 'Kundenverwaltung', - 'content' => 'Inhaltsverwaltung', - 'setting' => 'system settings', - 'plugin' => 'plugin-verwaltung', - 'admin_user' => 'Backend-Benutzer', - 'admin_role' => 'Benutzerrolle', - 'region' => 'Regionsgruppierung', - 'tax_rate' => 'Steuersatzverwaltung', - 'tax_class' => 'Steuerverwaltung', - 'currency' => 'Währungsverwaltung', - 'language' => 'Sprachverwaltung', - 'zone' => 'Provinzverwaltung', - 'country' => 'Landesverwaltung', - 'file_manager' => 'Dateimanager', - 'access_frontend' => 'Zugang zum Frontend', + 'home' => 'Startseite verwalten', + 'order' => 'Auftragsverwaltung', + 'rma' => 'Kundendienstverwaltung', + 'rma_reason' => 'Rücksendegrundverwaltung', + 'product' => 'Produktmanagement', + 'brand' => 'Markenführung', + 'category' => 'category management', + 'customer_group' => 'Kundengruppenverwaltung', + 'customer' => 'Kundenverwaltung', + 'content' => 'Inhaltsverwaltung', + 'setting' => 'system settings', + 'plugin' => 'plugin-verwaltung', + 'admin_user' => 'Backend-Benutzer', + 'admin_role' => 'Benutzerrolle', + 'region' => 'Regionsgruppierung', + 'tax_rate' => 'Steuersatzverwaltung', + 'tax_class' => 'Steuerverwaltung', + 'currency' => 'Währungsverwaltung', + 'language' => 'Sprachverwaltung', + 'zone' => 'Provinzverwaltung', + 'country' => 'Landesverwaltung', + 'file_manager' => 'Dateimanager', + 'access_frontend' => 'Zugang zum Frontend', // sidebar - 'settings_index' => 'Systemeinstellungen', - 'admin_users_index' => 'Backend-Benutzer', - 'plugins_index' => 'plugins-liste', - 'regions_index' => 'Regionsgruppierung', - 'tax_rates_index' => 'Steuersatzeinstellungen', - 'tax_classes_index' => 'Steuerkategorie', - 'currencies_index' => 'Währungsverwaltung', - 'languages_index' => 'Sprachverwaltung', - 'design_index' => 'Wohndekoration', - 'pages_index' => 'Informationsseite', - 'design_footer_index' => 'Fußzeilendekoration', - 'design_menu_index' => 'Navigationskonfiguration', - 'categories_index' => 'Produktkategorie', - 'products_index' => 'Produktverwaltung', - 'products_trashed' => 'Papierkorb', - 'customers_trashed' => 'Papierkorb', - 'brands_index' => 'Produktmarke', - 'orders_index' => 'Bestellliste', - 'rmas_index' => 'Kundendienstverwaltung', - 'rma_reasons_index' => 'Nachverkaufsgrund', - 'customers_index' => 'Kundenliste', - 'customer_groups_index' => 'Kundengruppe', - 'countries_index' => 'Landesverwaltung', - 'zones_index' => 'Provinzverwaltung', + 'settings_index' => 'Systemeinstellungen', + 'admin_users_index' => 'Backend-Benutzer', + 'plugins_index' => 'plugins-liste', + 'regions_index' => 'Regionsgruppierung', + 'tax_rates_index' => 'Steuersatzeinstellungen', + 'tax_classes_index' => 'Steuerkategorie', + 'currencies_index' => 'Währungsverwaltung', + 'languages_index' => 'Sprachverwaltung', + 'design_index' => 'Wohndekoration', + 'pages_index' => 'Informationsseite', + 'design_footer_index' => 'Fußzeilendekoration', + 'design_menu_index' => 'Navigationskonfiguration', + 'categories_index' => 'Produktkategorie', + 'products_index' => 'Produktverwaltung', + 'products_trashed' => 'Papierkorb', + 'customers_trashed' => 'Papierkorb', + 'brands_index' => 'Produktmarke', + 'orders_index' => 'Bestellliste', + 'rmas_index' => 'Kundendienstverwaltung', + 'rma_reasons_index' => 'Nachverkaufsgrund', + 'customers_index' => 'Kundenliste', + 'customer_groups_index' => 'Kundengruppe', + 'countries_index' => 'Landesverwaltung', + 'zones_index' => 'Provinzverwaltung', ]; diff --git a/resources/lang/de/admin/country.php b/resources/lang/de/admin/country.php index 7141de8e..79d94bc1 100644 --- a/resources/lang/de/admin/country.php +++ b/resources/lang/de/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => 'Landesname', + 'country_name' => 'Landesname', - 'countries_index' => 'Länderliste', - 'countries_create' => 'Land erstellen', - 'countries_update' => 'Land aktualisieren', + 'countries_index' => 'Länderliste', + 'countries_create' => 'Land erstellen', + 'countries_update' => 'Land aktualisieren', ]; diff --git a/resources/lang/de/admin/currency.php b/resources/lang/de/admin/currency.php index 5ef39bbb..402c9f9a 100644 --- a/resources/lang/de/admin/currency.php +++ b/resources/lang/de/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => 'Währungsliste', - 'currencies_create' => 'Währung erstellen', - 'currencies_show' => 'Währungsdetails', - 'currencies_update' => 'Währung aktualisieren', - 'currencies_delete' => 'Währung löschen', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'Währungsliste', + 'currencies_create' => 'Währung erstellen', + 'currencies_show' => 'Währungsdetails', + 'currencies_update' => 'Währung aktualisieren', + 'currencies_delete' => 'Währung löschen', ]; diff --git a/resources/lang/de/admin/customer.php b/resources/lang/de/admin/customer.php index a7b5b198..dd833606 100644 --- a/resources/lang/de/admin/customer.php +++ b/resources/lang/de/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => 'Kundenliste', - 'customers_create' => 'Kunden anlegen', - 'customers_show' => 'Kundendetails', - 'customers_update' => 'Kunden aktualisieren', - 'customers_delete' => 'Kunden löschen', + 'customers_index' => 'Kundenliste', + 'customers_create' => 'Kunden anlegen', + 'customers_show' => 'Kundendetails', + 'customers_update' => 'Kunden aktualisieren', + 'customers_delete' => 'Kunden löschen', - 'user_info' => 'Benutzerinformationen', - 'address_management' => 'Adressverwaltung', - 'user_name' => 'Benutzername', - 'password_info' => 'Leer lassen, um das ursprüngliche Passwort unverändert zu lassen', - 'add_address' => 'Adresse hinzufügen', - 'no_address' => 'Das Girokonto hat keine Adresse', - 'edit_address' => 'Adresse bearbeiten', - 'adresse' => 'Adresse', - 'choose_country' => 'Land wählen', - 'zones' => 'Provinz', - 'choose_zones' => 'Provinz wählen', - 'enter_city' => 'Stadt eingeben', - 'city' => 'Stadt', - 'zipcode' => 'postleitzahl', - 'address_1' => 'detaillierte Adresse 1', - 'address_2' => 'detaillierte Adresse 2', + 'user_info' => 'Benutzerinformationen', + 'address_management' => 'Adressverwaltung', + 'user_name' => 'Benutzername', + 'password_info' => 'Leer lassen, um das ursprüngliche Passwort unverändert zu lassen', + 'add_address' => 'Adresse hinzufügen', + 'no_address' => 'Das Girokonto hat keine Adresse', + 'edit_address' => 'Adresse bearbeiten', + 'adresse' => 'Adresse', + 'choose_country' => 'Land wählen', + 'zones' => 'Provinz', + 'choose_zones' => 'Provinz wählen', + 'enter_city' => 'Stadt eingeben', + 'city' => 'Stadt', + 'zipcode' => 'postleitzahl', + 'address_1' => 'detaillierte Adresse 1', + 'address_2' => 'detaillierte Adresse 2', - 'cannot_delete_root' => 'Das Root-Konto kann nicht gelöscht werden', - 'error_email' => 'Bitte geben Sie das richtige E-Mail-Format ein', - 'confirm_delete_address' => 'Sind Sie sicher, dass Sie die Adresse löschen möchten? ', + 'cannot_delete_root' => 'Das Root-Konto kann nicht gelöscht werden', + 'error_email' => 'Bitte geben Sie das richtige E-Mail-Format ein', + 'confirm_delete_address' => 'Sind Sie sicher, dass Sie die Adresse löschen möchten? ', ]; diff --git a/resources/lang/de/admin/customer_group.php b/resources/lang/de/admin/customer_group.php index f8ef304f..7cb14e2b 100644 --- a/resources/lang/de/admin/customer_group.php +++ b/resources/lang/de/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Kundengruppe', - 'consumption_limit' => 'Verbrauchslimit', - 'discount_rate' => 'Rabattsatz', - 'reward_points_factor' => 'Belohnungspunktefaktor', - 'integral_factor' => 'Integralkoeffizient verwenden', + 'index' => 'Kundengruppe', + 'consumption_limit' => 'Verbrauchslimit', + 'discount_rate' => 'Rabattsatz', + 'reward_points_factor' => 'Belohnungspunktefaktor', + 'integral_factor' => 'Integralkoeffizient verwenden', - 'customer_groups_index' => 'Kundengruppenliste', - 'customer_groups_create' => 'Kundengruppen erstellen', - 'customer_groups_show' => 'Kundengruppendetails', - 'customer_groups_update' => 'Kundengruppen aktualisieren', - 'customer_groups_delete' => 'Kundengruppe löschen', - 'default_cannot_delete' => 'Standardkundengruppe kann nicht gelöscht werden', + 'customer_groups_index' => 'Kundengruppenliste', + 'customer_groups_create' => 'Kundengruppen erstellen', + 'customer_groups_show' => 'Kundengruppendetails', + 'customer_groups_update' => 'Kundengruppen aktualisieren', + 'customer_groups_delete' => 'Kundengruppe löschen', + 'default_cannot_delete' => 'Standardkundengruppe kann nicht gelöscht werden', ]; diff --git a/resources/lang/de/admin/dashboard.php b/resources/lang/de/admin/dashboard.php index a113ea2f..e63d4bb4 100644 --- a/resources/lang/de/admin/dashboard.php +++ b/resources/lang/de/admin/dashboard.php @@ -10,15 +10,15 @@ */ return [ - 'customer_view' => 'Benutzerbesuche', - 'order_total' => 'Bestellmenge', - 'customer_new' => 'Benutzer hinzufügen', - 'order_amount' => 'Umsatz', - 'yesterday' => 'gestern', - 'day_before' => 'einen Tag vorher', + 'customer_view' => 'Benutzerbesuche', + 'order_total' => 'Bestellmenge', + 'customer_new' => 'Benutzer hinzufügen', + 'order_amount' => 'Umsatz', + 'yesterday' => 'gestern', + 'day_before' => 'einen Tag vorher', - 'order_report' => 'Bestellstatistik', - 'latest_month' => 'Monat', - 'latest_week' => 'Woche', - 'latest_year' => 'ein Jahr', + 'order_report' => 'Bestellstatistik', + 'latest_month' => 'Monat', + 'latest_week' => 'Woche', + 'latest_year' => 'ein Jahr', ]; diff --git a/resources/lang/de/admin/design_builder.php b/resources/lang/de/admin/design_builder.php index 278303ba..56c6fcb8 100644 --- a/resources/lang/de/admin/design_builder.php +++ b/resources/lang/de/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'Markenmodul', - 'module_banner' => 'Bannermodul', - 'module_four_image_pro' => 'eine Zeile vier Bilder PRO', - 'module_slideshow' => 'Folienmodul', - 'module_tab_products' => 'Tab-Produkte', + 'module_brand' => 'Markenmodul', + 'module_banner' => 'Bannermodul', + 'module_four_image_pro' => 'eine Zeile vier Bilder PRO', + 'module_slideshow' => 'Folienmodul', + 'module_tab_products' => 'Tab-Produkte', ]; diff --git a/resources/lang/de/admin/file_manager.php b/resources/lang/de/admin/file_manager.php index 5a1dd675..8c30331d 100644 --- a/resources/lang/de/admin/file_manager.php +++ b/resources/lang/de/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'Verzeichnis/Datei erstellen', - 'file_manager_show' => 'Verzeichnis/Datei anzeigen', - 'file_manager_update' => 'umbenennen', - 'file_manager_delete' => 'Verzeichnis/Datei löschen', - 'directory_already_exist' => 'Verzeichnis existiert bereits', - 'directory_not_empty' => 'Das Verzeichnis ist nicht leer', - 'target_not_exist' => 'ursprüngliche Datei oder Ordner existiert nicht', - 'create_folder' => 'Ordner erstellen', - 'rename' => 'umbenennen', - 'download' => 'herunterladen', - 'upload_files' => 'Dateien hochladen', - 'click_upload' => 'Zum Hochladen klicken oder das Bild hierher ziehen', - 'image_uploading' => 'Bild hochladen', - 'no_file' => 'keine Datei', - 'picture_space' => 'Bildraum', - 'show_pc' => 'Bitte gehen Sie zur Bedienung auf die PC-Seite', + 'file_manager_create' => 'Verzeichnis/Datei erstellen', + 'file_manager_show' => 'Verzeichnis/Datei anzeigen', + 'file_manager_update' => 'umbenennen', + 'file_manager_delete' => 'Verzeichnis/Datei löschen', + 'directory_already_exist' => 'Verzeichnis existiert bereits', + 'directory_not_empty' => 'Das Verzeichnis ist nicht leer', + 'target_not_exist' => 'ursprüngliche Datei oder Ordner existiert nicht', + 'create_folder' => 'Ordner erstellen', + 'rename' => 'umbenennen', + 'download' => 'herunterladen', + 'upload_files' => 'Dateien hochladen', + 'click_upload' => 'Zum Hochladen klicken oder das Bild hierher ziehen', + 'image_uploading' => 'Bild hochladen', + 'no_file' => 'keine Datei', + 'picture_space' => 'Bildraum', + 'show_pc' => 'Bitte gehen Sie zur Bedienung auf die PC-Seite', - 'confirm_delete_file' => 'Möchten Sie die ausgewählte Datei löschen', - 'confirm_delete_folder' => 'Der Vorgang zum Löschen des Ordners läuft, alle Dateien im Ordner werden gelöscht, möchten Sie dies bestätigen? ', - 'new_folder' => 'Neuer Ordner', - 'can_empty' => 'darf nicht leer sein', - 'finish' => 'beenden', - 'uploading' => 'Hochladen', - 'file_manager' => 'Bildmanager', + 'confirm_delete_file' => 'Möchten Sie die ausgewählte Datei löschen', + 'confirm_delete_folder' => 'Der Vorgang zum Löschen des Ordners läuft, alle Dateien im Ordner werden gelöscht, möchten Sie dies bestätigen? ', + 'new_folder' => 'Neuer Ordner', + 'can_empty' => 'darf nicht leer sein', + 'finish' => 'beenden', + 'uploading' => 'Hochladen', + 'file_manager' => 'Bildmanager', ]; diff --git a/resources/lang/de/admin/language.php b/resources/lang/de/admin/language.php index 4bacce52..29e82f78 100644 --- a/resources/lang/de/admin/language.php +++ b/resources/lang/de/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => 'Sprachliste', - 'languages_create' => 'Sprache erstellen', - 'languages_show' => 'Sprachdetails', - 'languages_update' => 'Sprache aktualisieren', - 'languages_delete' => 'Sprache löschen', - 'error_default_language_cannot_delete' => 'Die Standardsprache kann nicht gelöscht werden! ', - 'help_install' => 'Hinweis: Um eine neue Sprache zu installieren, müssen Sie die Produkte, Kategorien, Navigation, Homepage-Module, Seitenfußzeilen usw. der entsprechenden Sprache konfigurieren, andernfalls kommt es zu einer abnormalen Seitenanzeige', + 'languages_index' => 'Sprachliste', + 'languages_create' => 'Sprache erstellen', + 'languages_show' => 'Sprachdetails', + 'languages_update' => 'Sprache aktualisieren', + 'languages_delete' => 'Sprache löschen', + 'error_default_language_cannot_delete' => 'Die Standardsprache kann nicht gelöscht werden! ', + 'help_install' => 'Hinweis: Um eine neue Sprache zu installieren, müssen Sie die Produkte, Kategorien, Navigation, Homepage-Module, Seitenfußzeilen usw. der entsprechenden Sprache konfigurieren, andernfalls kommt es zu einer abnormalen Seitenanzeige', ]; diff --git a/resources/lang/de/admin/login.php b/resources/lang/de/admin/login.php index d9de2029..70e50173 100644 --- a/resources/lang/de/admin/login.php +++ b/resources/lang/de/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => 'Melden Sie sich beim BeikeShop-Backend an', - 'log_in' => 'Einloggen', + 'log_in' => 'Einloggen', ]; diff --git a/resources/lang/de/admin/marketing.php b/resources/lang/de/admin/marketing.php index aa2e9548..28931570 100644 --- a/resources/lang/de/admin/marketing.php +++ b/resources/lang/de/admin/marketing.php @@ -10,16 +10,16 @@ */ return [ - 'marketing_list' => 'Plug-in-Markt', - 'marketing_show' => 'Plug-in-Details', - 'set_token' => 'Token setzen', - 'get_token' => 'Token abrufen', - 'download_count' => 'Download-Zähler', - 'last_update' => 'letzte Aktualisierung', - 'text_version' => 'Version', - 'text_compatibility' => 'Kompatibilität', - 'text_author' => 'Plugin-Autor', - 'download_plugin' => 'Plugin herunterladen', + 'marketing_list' => 'Plug-in-Markt', + 'marketing_show' => 'Plug-in-Details', + 'set_token' => 'Token setzen', + 'get_token' => 'Token abrufen', + 'download_count' => 'Download-Zähler', + 'last_update' => 'letzte Aktualisierung', + 'text_version' => 'Version', + 'text_compatibility' => 'Kompatibilität', + 'text_author' => 'Plugin-Autor', + 'download_plugin' => 'Plugin herunterladen', 'download_description' => 'Plugin-Beschreibung', - 'text_free' => 'kostenlos', + 'text_free' => 'kostenlos', ]; diff --git a/resources/lang/de/admin/order.php b/resources/lang/de/admin/order.php index 514394c2..db55ada0 100644 --- a/resources/lang/de/admin/order.php +++ b/resources/lang/de/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => 'Bestellliste', + 'list' => 'Bestellliste', - 'order_quantity' => 'Bestellmenge', - 'order_amount' => 'Bestellbetrag', - 'orders_index' => 'Bestellliste', - 'orders_create' => 'Bestellung erstellen', - 'orders_show' => 'Bestelldetails', - 'notify' => 'Ob zu erinnern', - 'orders_export' => 'Bestellungen exportieren', - 'orders_update' => 'Bestellung aktualisieren', - 'orders_delete' => 'Bestellung löschen', - 'orders_update_status' => 'Status aktualisieren', - 'error_status' => 'Bitte wählen Sie den Status', + 'order_quantity' => 'Bestellmenge', + 'order_amount' => 'Bestellbetrag', + 'orders_index' => 'Bestellliste', + 'orders_create' => 'Bestellung erstellen', + 'orders_show' => 'Bestelldetails', + 'notify' => 'Ob zu erinnern', + 'orders_export' => 'Bestellungen exportieren', + 'orders_update' => 'Bestellung aktualisieren', + 'orders_delete' => 'Bestellung löschen', + 'orders_update_status' => 'Status aktualisieren', + 'error_status' => 'Bitte wählen Sie den Status', ]; diff --git a/resources/lang/de/admin/page.php b/resources/lang/de/admin/page.php index 73ba4f8f..b7270e75 100644 --- a/resources/lang/de/admin/page.php +++ b/resources/lang/de/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Informationsseite', - 'info_title' => 'Informationstitel', - 'info_content' => 'Inhalt', + 'index' => 'Informationsseite', + 'info_title' => 'Informationstitel', + 'info_content' => 'Inhalt', - 'pages_index' => 'Einzelseitenliste', - 'pages_create' => 'Eine einzelne Seite erstellen', - 'pages_show' => 'Einzelseitendetails', - 'pages_update' => 'Einzelne Seite bearbeiten', - 'pages_delete' => 'Eine einzelne Seite löschen' + 'pages_index' => 'Einzelseitenliste', + 'pages_create' => 'Eine einzelne Seite erstellen', + 'pages_show' => 'Einzelseitendetails', + 'pages_update' => 'Einzelne Seite bearbeiten', + 'pages_delete' => 'Eine einzelne Seite löschen', ]; diff --git a/resources/lang/de/admin/plugin.php b/resources/lang/de/admin/plugin.php index f7a13958..6187dc28 100644 --- a/resources/lang/de/admin/plugin.php +++ b/resources/lang/de/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => 'Plugin-Liste', - 'plugins_import' => 'Plugin hochladen', - 'plugins_show' => 'Plugins-Details', - 'plugins_update' => 'plugins-aktualisierung', - 'plugins_update_status' => 'Aktualisierungsstatus', - 'plugins_install' => 'installieren', - 'plugins_uninstall' => 'deinstallieren', + 'plugins_index' => 'Plugin-Liste', + 'plugins_import' => 'Plugin hochladen', + 'plugins_show' => 'Plugins-Details', + 'plugins_update' => 'plugins-aktualisierung', + 'plugins_update_status' => 'Aktualisierungsstatus', + 'plugins_install' => 'installieren', + 'plugins_uninstall' => 'deinstallieren', - 'plugin_list' => 'Plugin-Liste', - 'plugin_code' => 'plugin-code', - 'plugin_type' => 'plugin-typ', - 'plugin_description' => 'plugin-beschreibung', - 'plugin_upload' => 'Plugin hochladen (unterstützt nur Zip-Dateien)', + 'plugin_list' => 'Plugin-Liste', + 'plugin_code' => 'plugin-code', + 'plugin_type' => 'plugin-typ', + 'plugin_description' => 'plugin-beschreibung', + 'plugin_upload' => 'Plugin hochladen (unterstützt nur Zip-Dateien)', - 'shipping' => 'Versandart', - 'payment' => 'Zahlungsmethode', - 'total' => 'Auftragsberechnung', - 'view' => 'Seitenänderung', + 'shipping' => 'Versandart', + 'payment' => 'Zahlungsmethode', + 'total' => 'Auftragsberechnung', + 'view' => 'Seitenänderung', ]; diff --git a/resources/lang/de/admin/product.php b/resources/lang/de/admin/product.php index f65df606..c1212a63 100644 --- a/resources/lang/de/admin/product.php +++ b/resources/lang/de/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => 'Produktliste', - 'products_create' => 'Produkte erstellen', - 'products_show' => 'Produktdetails', - 'products_update' => 'Produkte aktualisieren', - 'products_delete' => 'Produkt löschen', - 'products_trashed' => 'Papierkorb', - 'products_restore' => 'Papierkorb wiederherstellen', - 'clear_restore' => 'Papierkorb leeren', + 'products_index' => 'Produktliste', + 'products_create' => 'Produkte erstellen', + 'products_show' => 'Produktdetails', + 'products_update' => 'Produkte aktualisieren', + 'products_delete' => 'Produkt löschen', + 'products_trashed' => 'Papierkorb', + 'products_restore' => 'Papierkorb wiederherstellen', + 'clear_restore' => 'Papierkorb leeren', + 'batch_delete' => 'Stapel löschen', + 'batch_active' => 'Chargenliste', + 'batch_inactive' => 'Charge aus dem Regal', - 'batch_delete' => 'Stapel löschen', - 'batch_active' => 'Chargenliste', - 'batch_inactive' => 'Charge aus dem Regal', + 'basic_information' => 'grundlegende Informationen', + 'product_details' => 'Produktdetails', + 'product_relations' => 'bezogene Waren', + 'stocks' => 'Warenbestand', + 'model' => 'Modell', + 'price' => 'Preis', + 'origin_price' => 'ursprünglicher Preis', + 'cost_price' => 'Kostenpreis', + 'quantity' => 'Menge', + 'enable_multi_spec' => 'Multi-Spezifikation aktivieren', + 'image_help' => 'Das erste Bild wird als Hauptbild des Produkts verwendet, und mehrere Bilder können gleichzeitig hochgeladen werden, und die Position mehrerer Bilder kann nach Belieben angepasst werden', + 'add_variable' => 'Spezifikation hinzufügen', + 'add_variable_value' => 'Spezifikationswert hinzufügen', + 'add_variable_image' => 'Spezifikationsbild hinzufügen', + 'default_main_product' => 'Standard-Hauptprodukt', + 'modify_order' => 'Zum Ändern doppelklicken, zum Anpassen der Reihenfolge ziehen', - 'basic_information' => 'grundlegende Informationen', - 'product_details' => 'Produktdetails', - 'product_relations' => 'bezogene Waren', - 'stocks' => 'Warenbestand', - 'model' => 'Modell', - 'price' => 'Preis', - 'origin_price' => 'ursprünglicher Preis', - 'cost_price' => 'Kostenpreis', - 'quantity' => 'Menge', - 'enable_multi_spec' => 'Multi-Spezifikation aktivieren', - 'image_help' => 'Das erste Bild wird als Hauptbild des Produkts verwendet, und mehrere Bilder können gleichzeitig hochgeladen werden, und die Position mehrerer Bilder kann nach Belieben angepasst werden', - 'add_variable' => 'Spezifikation hinzufügen', - 'add_variable_value' => 'Spezifikationswert hinzufügen', - 'add_variable_image' => 'Spezifikationsbild hinzufügen', - 'default_main_product' => 'Standard-Hauptprodukt', - 'modify_order' => 'Zum Ändern doppelklicken, zum Anpassen der Reihenfolge ziehen', - - 'confirm_batch_product' => 'Möchten Sie die ausgewählten Elemente wirklich in großen Mengen löschen?', - 'confirm_batch_status' => 'Möchten Sie den Status der ausgewählten Artikel wirklich per Bulk-Verfahren bearbeiten?', - 'confirm_batch_restore' => 'Möchten Sie das ausgewählte Element wirklich wiederherstellen?', + 'confirm_batch_product' => 'Möchten Sie die ausgewählten Elemente wirklich in großen Mengen löschen?', + 'confirm_batch_status' => 'Möchten Sie den Status der ausgewählten Artikel wirklich per Bulk-Verfahren bearbeiten?', + 'confirm_batch_restore' => 'Möchten Sie das ausgewählte Element wirklich wiederherstellen?', 'confirm_delete_restore' => 'Möchten Sie den Papierkorb wirklich leeren?', ]; diff --git a/resources/lang/de/admin/region.php b/resources/lang/de/admin/region.php index 8122339b..35fe5eb5 100644 --- a/resources/lang/de/admin/region.php +++ b/resources/lang/de/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'Regionsgruppe', - 'regions_index' => 'Regionsgruppenliste', - 'regions_create' => 'Regionsgruppe erstellen', - 'regions_show' => 'Regionsgruppendetails', - 'regions_update' => 'Regionsgruppe aktualisieren', - 'regions_delete' => 'Regionsgruppe löschen', - 'name' => 'Name', - 'describe' => 'beschreiben', - 'country' => 'Land', - 'zone' => 'Provinz', + 'index' => 'Regionsgruppe', + 'regions_index' => 'Regionsgruppenliste', + 'regions_create' => 'Regionsgruppe erstellen', + 'regions_show' => 'Regionsgruppendetails', + 'regions_update' => 'Regionsgruppe aktualisieren', + 'regions_delete' => 'Regionsgruppe löschen', + 'name' => 'Name', + 'describe' => 'beschreiben', + 'country' => 'Land', + 'zone' => 'Provinz', ]; diff --git a/resources/lang/de/admin/rma.php b/resources/lang/de/admin/rma.php index db650ed7..e130f885 100644 --- a/resources/lang/de/admin/rma.php +++ b/resources/lang/de/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'After-Sales-Anwendung', - - 'rmas_index' => 'Kundendienstliste', - 'rmas_show' => 'Kundendienstdetails', - 'rmas_update' => 'Kundendienst aktualisieren', - 'rmas_delete' => 'Kundendienst löschen', + 'index' => 'After-Sales-Anwendung', - 'customers_name' => 'Kundenname', - 'quantity' => 'Menge', - 'service_type' => 'Diensttyp', - 'rma_details' => 'Kundenanwendungsdetails', - 'reasons_return' => 'Rücksendegrund', - 'current_state' => 'aktueller Zustand', - 'modify_status' => 'Status ändern', - 'remarks' => 'Bemerkungen', - 'update_status' => 'Aktualisierungsstatus', - 'operation_history' => 'Vorgangsverlauf', + 'rmas_index' => 'Kundendienstliste', + 'rmas_show' => 'Kundendienstdetails', + 'rmas_update' => 'Kundendienst aktualisieren', + 'rmas_delete' => 'Kundendienst löschen', + + 'customers_name' => 'Kundenname', + 'quantity' => 'Menge', + 'service_type' => 'Diensttyp', + 'rma_details' => 'Kundenanwendungsdetails', + 'reasons_return' => 'Rücksendegrund', + 'current_state' => 'aktueller Zustand', + 'modify_status' => 'Status ändern', + 'remarks' => 'Bemerkungen', + 'update_status' => 'Aktualisierungsstatus', + 'operation_history' => 'Vorgangsverlauf', ]; diff --git a/resources/lang/de/admin/rma_reason.php b/resources/lang/de/admin/rma_reason.php index 1fa8a947..98e44247 100644 --- a/resources/lang/de/admin/rma_reason.php +++ b/resources/lang/de/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => 'Ursachenliste', - 'rma_reasons_create' => 'Erstellungsgrund', - 'rma_reasons_update' => 'Aktualisierungsgrund', - 'rma_reasons_delete' => 'Löschgrund' + 'rma_reasons_index' => 'Ursachenliste', + 'rma_reasons_create' => 'Erstellungsgrund', + 'rma_reasons_update' => 'Aktualisierungsgrund', + 'rma_reasons_delete' => 'Löschgrund', ]; diff --git a/resources/lang/de/admin/role.php b/resources/lang/de/admin/role.php index b346608a..b6d4c64a 100644 --- a/resources/lang/de/admin/role.php +++ b/resources/lang/de/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => 'Rollenliste', - 'admin_roles_create' => 'Rollen erstellen', - 'admin_roles_show' => 'Rollendetails', - 'admin_roles_update' => 'Rollen aktualisieren', - 'admin_roles_delete' => 'Rolle löschen', - 'select_one_at_least' => 'Berechtigungen dürfen nicht leer sein, bitte wählen Sie mindestens eine aus' + 'admin_roles_index' => 'Rollenliste', + 'admin_roles_create' => 'Rollen erstellen', + 'admin_roles_show' => 'Rollendetails', + 'admin_roles_update' => 'Rollen aktualisieren', + 'admin_roles_delete' => 'Rolle löschen', + 'select_one_at_least' => 'Berechtigungen dürfen nicht leer sein, bitte wählen Sie mindestens eine aus', ]; diff --git a/resources/lang/de/admin/setting.php b/resources/lang/de/admin/setting.php index f39f8268..69c3fbfd 100644 --- a/resources/lang/de/admin/setting.php +++ b/resources/lang/de/admin/setting.php @@ -10,61 +10,61 @@ */ return [ - 'index' => 'Systemeinstellungen', - 'settings_index' => 'Systemeinstellungen anzeigen', - 'settings_update' => 'Systemeinstellungen ändern', - 'design_index' => 'Home-Editor', - 'design_footer_index' => 'Fußzeilen-Editor', - 'design_menu_index' => 'Navigationseditor', - 'product_per_page' => 'Die Anzahl der auf jeder Seite angezeigten Produkte', + 'index' => 'Systemeinstellungen', + 'settings_index' => 'Systemeinstellungen anzeigen', + 'settings_update' => 'Systemeinstellungen ändern', + 'design_index' => 'Home-Editor', + 'design_footer_index' => 'Fußzeilen-Editor', + 'design_menu_index' => 'Navigationseditor', + 'product_per_page' => 'Die Anzahl der auf jeder Seite angezeigten Produkte', - '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.', + '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', - 'payment_address' => 'Rechnungsadresse', - 'meta_title' => 'Metatitel', - 'meta_description' => 'Meta-Beschreibung', - 'meta_keywords' => 'Meta-Schlüsselwort', - 'telephone' => 'Telefon kontaktieren', - 'email' => 'Postfach', - 'default_address' => 'Standardadresse', - 'default_country_set' => 'Standard-Ländereinstellung', - 'default_zone_set' => 'Standardeinstellung für die Provinz', - 'default_language' => 'Standardsprache', - 'default_currency' => 'Standardwährung', + 'guest_checkout' => 'Besucherkasse', + 'theme_default' => 'Standardthema', + 'theme_black' => 'schwarzes Thema', + 'shipping_address' => 'Lieferadresse', + 'payment_address' => 'Rechnungsadresse', + 'meta_title' => 'Metatitel', + 'meta_description' => 'Meta-Beschreibung', + 'meta_keywords' => 'Meta-Schlüsselwort', + 'telephone' => 'Telefon kontaktieren', + 'email' => 'Postfach', + 'default_address' => 'Standardadresse', + 'default_country_set' => 'Standard-Ländereinstellung', + 'default_zone_set' => 'Standardeinstellung für die Provinz', + 'default_language' => 'Standardsprache', + 'default_currency' => 'Standardwährung', 'default_customer_group' => 'Standardkundengruppe', - 'admin_name' => 'Hintergrundverzeichnis', - 'admin_name_info' => 'Verwaltungshintergrundverzeichnis, der Standardwert ist admin', - 'enable_tax' => 'Steuer aktivieren', - 'enable_tax_info' => 'ob die Steuerberechnung aktiviert werden soll', - 'tax_address' => 'Steueradresse', - 'tax_address_info' => 'Nach welcher Adresse soll die Steuer berechnet werden', - 'logo' => 'Website-Logo', - 'favicon' => 'favicon', - 'favicon_info' => 'Das kleine Symbol, das auf dem Browser-Tab angezeigt wird, muss im PNG-Format vorliegen und die Größe beträgt: 32*32', - 'placeholder_image' => 'Platzhalterbild', + 'admin_name' => 'Hintergrundverzeichnis', + 'admin_name_info' => 'Verwaltungshintergrundverzeichnis, der Standardwert ist admin', + 'enable_tax' => 'Steuer aktivieren', + 'enable_tax_info' => 'ob die Steuerberechnung aktiviert werden soll', + 'tax_address' => 'Steueradresse', + 'tax_address_info' => 'Nach welcher Adresse soll die Steuer berechnet werden', + 'logo' => 'Website-Logo', + 'favicon' => 'favicon', + 'favicon_info' => 'Das kleine Symbol, das auf dem Browser-Tab angezeigt wird, muss im PNG-Format vorliegen und die Größe beträgt: 32*32', + 'placeholder_image' => 'Platzhalterbild', 'placeholder_image_info' => 'Das Platzhalterbild wird angezeigt, wenn kein Bild vorhanden ist oder das Bild nicht gefunden wird, empfohlene Größe: 500*500', - 'head_code' => 'Code einfügen', - 'head_code_info' => 'Der Code im Eingabefeld wird in den Kopf der Frontend-Seite eingefügt, die zum Zählen des Codes oder zum Hinzufügen spezieller Plug-Ins usw. verwendet werden kann', + 'head_code' => 'Code einfügen', + 'head_code_info' => 'Der Code im Eingabefeld wird in den Kopf der Frontend-Seite eingefügt, die zum Zählen des Codes oder zum Hinzufügen spezieller Plug-Ins usw. verwendet werden kann', ]; diff --git a/resources/lang/de/admin/tax_class.php b/resources/lang/de/admin/tax_class.php index f5fa99cf..52440715 100644 --- a/resources/lang/de/admin/tax_class.php +++ b/resources/lang/de/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Steuerkategorie', - 'rule' => 'Regel', - 'based_on' => 'basierend auf', - 'priority' => 'Priorität', - 'tax_classes_index' => 'Liste der Steuerklassen', - 'tax_classes_create' => 'Steuerklassen erstellen', - 'tax_classes_show' => 'Steuerklassendetails', - 'tax_classes_update' => 'Steuerklassen aktualisieren', - 'tax_classes_delete' => 'Steuerklasse löschen', + 'index' => 'Steuerkategorie', + 'rule' => 'Regel', + 'based_on' => 'basierend auf', + 'priority' => 'Priorität', + 'tax_classes_index' => 'Liste der Steuerklassen', + 'tax_classes_create' => 'Steuerklassen erstellen', + 'tax_classes_show' => 'Steuerklassendetails', + 'tax_classes_update' => 'Steuerklassen aktualisieren', + 'tax_classes_delete' => 'Steuerklasse löschen', ]; diff --git a/resources/lang/de/admin/tax_rate.php b/resources/lang/de/admin/tax_rate.php index d2bd03a6..03d1a0aa 100644 --- a/resources/lang/de/admin/tax_rate.php +++ b/resources/lang/de/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => 'Steuereinstellung', - 'tax_classes_index' => 'Steuerklasseneinstellungen', - 'tax' => 'Steuerart', - 'tax_rate' => 'Steuersatz', - 'type' => 'Typ', - 'area' => 'Bereich', - 'percentage' => 'Prozent', - 'fixed_tax_rate' => 'fester Steuersatz', - 'tax_rates_index' => 'Steuersatzliste', - 'tax_rates_create' => 'Steuersatz erstellen', - 'tax_rates_show' => 'Steuerdetails', - 'tax_rates_update' => 'Steuersatz aktualisieren', - 'tax_rates_delete' => 'Steuersatz löschen', + 'index' => 'Steuereinstellung', + 'tax_classes_index' => 'Steuerklasseneinstellungen', + 'tax' => 'Steuerart', + 'tax_rate' => 'Steuersatz', + 'type' => 'Typ', + 'area' => 'Bereich', + 'percentage' => 'Prozent', + 'fixed_tax_rate' => 'fester Steuersatz', + 'tax_rates_index' => 'Steuersatzliste', + 'tax_rates_create' => 'Steuersatz erstellen', + 'tax_rates_show' => 'Steuerdetails', + 'tax_rates_update' => 'Steuersatz aktualisieren', + 'tax_rates_delete' => 'Steuersatz löschen', ]; diff --git a/resources/lang/de/admin/user.php b/resources/lang/de/admin/user.php index 617fbeb5..eb4dff65 100644 --- a/resources/lang/de/admin/user.php +++ b/resources/lang/de/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'Benutzerliste', - 'admin_users_create' => 'Benutzer erstellen', - 'admin_users_show' => 'Benutzerdetails', - 'admin_users_update' => 'Benutzer aktualisieren', - 'admin_users_delete' => 'Benutzer löschen', - 'verify_code_expired' => 'Ihr Bestätigungscode ist abgelaufen (10 Minuten), bitte fordern Sie ihn erneut an', - 'verify_code_error' => 'Ihr Bestätigungscode ist falsch', - 'account_not_exist' => 'Konto existiert nicht', + 'admin_users_index' => 'Benutzerliste', + 'admin_users_create' => 'Benutzer erstellen', + 'admin_users_show' => 'Benutzerdetails', + 'admin_users_update' => 'Benutzer aktualisieren', + 'admin_users_delete' => 'Benutzer löschen', + 'verify_code_expired' => 'Ihr Bestätigungscode ist abgelaufen (10 Minuten), bitte fordern Sie ihn erneut an', + 'verify_code_error' => 'Ihr Bestätigungscode ist falsch', + 'account_not_exist' => 'Konto existiert nicht', ]; diff --git a/resources/lang/de/admin/zone.php b/resources/lang/de/admin/zone.php index e542cb49..3b416e8c 100644 --- a/resources/lang/de/admin/zone.php +++ b/resources/lang/de/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => 'Provinzname', - 'country_of_origin' => 'Herkunftsland', + 'zone_name' => 'Provinzname', + 'country_of_origin' => 'Herkunftsland', - 'zones_index' => 'Provinzliste', - 'zones_create' => 'Provinz erstellen', - 'zones_update' => 'Provinz aktualisieren', - 'zones_delete' => 'Provinz löschen', + 'zones_index' => 'Provinzliste', + 'zones_create' => 'Provinz erstellen', + 'zones_update' => 'Provinz aktualisieren', + 'zones_delete' => 'Provinz löschen', - 'error_country' => 'Bitte wählen Sie ein Land aus', + 'error_country' => 'Bitte wählen Sie ein Land aus', ]; diff --git a/resources/lang/de/brand.php b/resources/lang/de/brand.php index 2ee79178..1e70e6db 100644 --- a/resources/lang/de/brand.php +++ b/resources/lang/de/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => 'Markenname', - 'icon' => 'Symbol', - 'first_letter' => 'Anfangsbuchstabe', + 'name' => 'Markenname', + 'icon' => 'Symbol', + 'first_letter' => 'Anfangsbuchstabe', ]; diff --git a/resources/lang/de/cart.php b/resources/lang/de/cart.php index bac6c847..59c3e708 100644 --- a/resources/lang/de/cart.php +++ b/resources/lang/de/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU-ID', - 'quantity' => 'Kaufmenge', - 'stock_out' => 'Unzureichender Vorrat', + 'sku_id' => 'SKU-ID', + 'quantity' => 'Kaufmenge', + 'stock_out' => 'Unzureichender Vorrat', ]; diff --git a/resources/lang/de/common.php b/resources/lang/de/common.php index 9fe3ce50..0ae75c9b 100644 --- a/resources/lang/de/common.php +++ b/resources/lang/de/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => 'Bitte füllen Sie :Name aus', // 这个有用别删了，:name 是一个变量 + 'error_required' => 'Bitte füllen Sie :Name aus', // 这个有用别删了，:name 是一个变量 'error_input_required' => 'Das Eingabefeld darf nicht leer sein', - 'error_form' => 'Bitte prüfen Sie, ob das Formular korrekt ausgefüllt ist', - 'email' => 'Postfach', - 'unauthenticated' => 'Bitte zuerst einloggen', - 'success' => 'Erfolg', - 'no_data' => 'Im Moment keine Daten~', - 'empty_items' => 'keine Daten', - 'created_success' => 'Erfolgreich erstellt!', - 'deleted_success' => 'Erfolgreich gelöscht!', - 'restored_success' => 'Erfolgreich wiederhergestellt!', - 'updated_success' => 'erfolgreich aktualisiert!', - 'edit_success' => 'Änderung erfolgreich!', - 'get_success' => 'Erfolg erzielen!', - 'all' => 'alle', - 'status' => 'Status', - 'enable' => 'aktivieren', - 'disable' => 'deaktivieren', - 'enabled' => 'aktiviert', - 'disabled' => 'deaktiviert', - 'home' => 'home', - 'submit' => 'Senden', - 'title' => 'Titel', - 'save' => 'speichern', - 'cancel' => 'Abbrechen', - 'confirm' => 'bestätigen', - 'no' => 'nein', - 'yes' => 'ja', - 'delete' => 'löschen', - 'sign_out' => 'Abmelden', - 'contact_us' => 'kontaktiere uns', - 'input' => 'Geben Sie hier Ihre Suche ein', - 'filter' => 'filter', - 'reset' => 'zurücksetzen', - 'export' => 'exportieren', - 'edit' => 'bearbeiten', - 'action' => 'Aktion', - 'add' => 'Hinzufügen', - 'please_choose' => 'Bitte wählen', - 'recommend_size' => 'empfohlene Größe', - 'pick_datetime' => 'Uhrzeit auswählen', - 'confirm_delete' => 'Sind Sie sicher, dass Sie löschen möchten?', - 'text_hint' => 'Hinweis', - 'restore' => 'wiederherstellen', - 'name' => 'Name', - 'image' => 'Bild', - 'data' => 'Daten', - 'view' => 'Ansicht', - 'phone' => 'Telefon', - 'exit' => 'exit', - 'return' => 'Rückkehr', - 'language' => 'Sprache', - 'select_all' => 'alle auswählen', - 'sign_out' => 'Abmelden', - 'menu' => 'Menü', - 'whether_open' => 'ob öffnen', - 'to_setting' => 'zu konfigurieren', + 'error_form' => 'Bitte prüfen Sie, ob das Formular korrekt ausgefüllt ist', + 'email' => 'Postfach', + 'unauthenticated' => 'Bitte zuerst einloggen', + 'success' => 'Erfolg', + 'no_data' => 'Im Moment keine Daten~', + 'empty_items' => 'keine Daten', + 'created_success' => 'Erfolgreich erstellt!', + 'deleted_success' => 'Erfolgreich gelöscht!', + 'restored_success' => 'Erfolgreich wiederhergestellt!', + 'updated_success' => 'erfolgreich aktualisiert!', + 'edit_success' => 'Änderung erfolgreich!', + 'get_success' => 'Erfolg erzielen!', + 'all' => 'alle', + 'status' => 'Status', + 'enable' => 'aktivieren', + 'disable' => 'deaktivieren', + 'enabled' => 'aktiviert', + 'disabled' => 'deaktiviert', + 'home' => 'home', + 'submit' => 'Senden', + 'title' => 'Titel', + 'save' => 'speichern', + 'cancel' => 'Abbrechen', + 'confirm' => 'bestätigen', + 'no' => 'nein', + 'yes' => 'ja', + 'delete' => 'löschen', + 'sign_out' => 'Abmelden', + 'contact_us' => 'kontaktiere uns', + 'input' => 'Geben Sie hier Ihre Suche ein', + 'filter' => 'filter', + 'reset' => 'zurücksetzen', + 'export' => 'exportieren', + 'edit' => 'bearbeiten', + 'action' => 'Aktion', + 'add' => 'Hinzufügen', + 'please_choose' => 'Bitte wählen', + 'recommend_size' => 'empfohlene Größe', + 'pick_datetime' => 'Uhrzeit auswählen', + 'confirm_delete' => 'Sind Sie sicher, dass Sie löschen möchten?', + 'text_hint' => 'Hinweis', + 'restore' => 'wiederherstellen', + 'name' => 'Name', + 'image' => 'Bild', + 'data' => 'Daten', + 'view' => 'Ansicht', + 'phone' => 'Telefon', + 'exit' => 'exit', + 'return' => 'Rückkehr', + 'language' => 'Sprache', + 'select_all' => 'alle auswählen', + 'sign_out' => 'Abmelden', + 'menu' => 'Menü', + 'whether_open' => 'ob öffnen', + 'to_setting' => 'zu konfigurieren', - 'id' => 'ID', - 'created_at' => 'Erstellungszeit', - 'updated_at' => 'geänderte Zeit', - 'sort_order' => 'sortieren', - 'error_page' => 'Die Daten, auf die Sie zugegriffen haben, existieren nicht oder wurden gelöscht~', - 'error_page_btn' => 'Zurück zur vorherigen Seite', + 'id' => 'ID', + 'created_at' => 'Erstellungszeit', + 'updated_at' => 'geänderte Zeit', + 'sort_order' => 'sortieren', + 'error_page' => 'Die Daten, auf die Sie zugegriffen haben, existieren nicht oder wurden gelöscht~', + 'error_page_btn' => 'Zurück zur vorherigen Seite', - 'order' => [ - 'unpaid' => 'zu bezahlen', - 'paid' => 'bezahlt', - 'shipped' => 'versandt', + 'order' => [ + 'unpaid' => 'zu bezahlen', + 'paid' => 'bezahlt', + 'shipped' => 'versandt', 'completed' => 'abgeschlossen', 'cancelled' => 'Storniert', - ] + ], ]; - - diff --git a/resources/lang/de/currency.php b/resources/lang/de/currency.php index 85967048..6417e05d 100644 --- a/resources/lang/de/currency.php +++ b/resources/lang/de/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => 'Name', - 'code' => 'code', - 'icon' => 'Symbol', - 'symbol_left' => 'linkes Symbol', - 'symbol_right' => 'rechtes Symbol', - 'value' => 'Wechselkurswert', - 'decimal_place' => 'Nachkommastellen', + 'name' => 'Name', + 'code' => 'code', + 'icon' => 'Symbol', + 'symbol_left' => 'linkes Symbol', + 'symbol_right' => 'rechtes Symbol', + 'value' => 'Wechselkurswert', + 'decimal_place' => 'Nachkommastellen', ]; diff --git a/resources/lang/de/customer.php b/resources/lang/de/customer.php index ee4578ea..630252c4 100644 --- a/resources/lang/de/customer.php +++ b/resources/lang/de/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => 'Name', - 'email' => 'E-Mail', - 'from' => 'Registrierungsquelle', - 'customer_group' => 'Benutzergruppe', + 'name' => 'Name', + 'email' => 'E-Mail', + 'from' => 'Registrierungsquelle', + 'customer_group' => 'Benutzergruppe', ]; diff --git a/resources/lang/de/customer_group.php b/resources/lang/de/customer_group.php index f482bc3b..d1a750bc 100644 --- a/resources/lang/de/customer_group.php +++ b/resources/lang/de/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => 'Klasse', - 'name' => 'Name der Kundengruppe', + 'name' => 'Name der Kundengruppe', ]; diff --git a/resources/lang/de/mail.php b/resources/lang/de/mail.php index 001a6910..4e98a5be 100644 --- a/resources/lang/de/mail.php +++ b/resources/lang/de/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => 'Bestellung erfolgreich übermittelt', - 'order_update' => 'Aktualisierung des Bestellstatus', - 'order_success_info' => 'Ihre Bestellung wurde erfolgreich übermittelt, das Folgende sind die Bestelldetails', - 'not_oneself' => 'nicht persönliche Operationen können ignoriert werden. ', - 'customer_name' => 'Sehr geehrter :name, hallo! ', - 'sincerely' => 'Mit freundlichen Grüßen', - 'Team' => 'Team', - 'order_update_status' => 'Der Status Ihrer Bestellung :number wird aktualisiert', - 'welcome_register' => 'Willkommen zur Registrierung', - 'register_end' => 'Registrierung abschließen, bitte klicken Sie auf die Schaltfläche unten, um zum Einkaufszentrum zurückzukehren. ', - 'btn_buy_now' => 'jetzt kaufen', - 'retrieve_password_title' => 'Passwort abrufen', - 'retrieve_password_text' => 'Sie rufen Ihr Passwort ab, bitte klicken Sie auf die Schaltfläche unten, um den Vorgang abzuschließen. ', - 'retrieve_password_btn' => 'Klicken Sie hier, um die E-Mail zu bestätigen', + 'order_success' => 'Bestellung erfolgreich übermittelt', + 'order_update' => 'Aktualisierung des Bestellstatus', + 'order_success_info' => 'Ihre Bestellung wurde erfolgreich übermittelt, das Folgende sind die Bestelldetails', + 'not_oneself' => 'nicht persönliche Operationen können ignoriert werden. ', + 'customer_name' => 'Sehr geehrter :name, hallo! ', + 'sincerely' => 'Mit freundlichen Grüßen', + 'Team' => 'Team', + 'order_update_status' => 'Der Status Ihrer Bestellung :number wird aktualisiert', + 'welcome_register' => 'Willkommen zur Registrierung', + 'register_end' => 'Registrierung abschließen, bitte klicken Sie auf die Schaltfläche unten, um zum Einkaufszentrum zurückzukehren. ', + 'btn_buy_now' => 'jetzt kaufen', + 'retrieve_password_title' => 'Passwort abrufen', + 'retrieve_password_text' => 'Sie rufen Ihr Passwort ab, bitte klicken Sie auf die Schaltfläche unten, um den Vorgang abzuschließen. ', + 'retrieve_password_btn' => 'Klicken Sie hier, um die E-Mail zu bestätigen', ]; diff --git a/resources/lang/de/order.php b/resources/lang/de/order.php index 5379a1da..4fbd54c5 100644 --- a/resources/lang/de/order.php +++ b/resources/lang/de/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'nummer' => 'Bestellnummer', - 'customer_name' => 'Kundenname', - 'payment_method' => 'Zahlungsmethode', - 'email' => 'E-Mail', - 'telephone' => 'Telefon kontaktieren', - 'created_at' => 'Erstellungszeit', - 'updated_at' => 'aktualisierte Zeit', - 'status' => 'Status', - 'status_format' => 'status', - 'total' => 'Bestellsumme', - 'express_number' => 'Express-Bestellnummer', - 'express_company' => 'express company', - 'order_shipments' => 'Sendungsinformationen', + 'id' => 'ID', + 'nummer' => 'Bestellnummer', + 'customer_name' => 'Kundenname', + 'payment_method' => 'Zahlungsmethode', + 'email' => 'E-Mail', + 'telephone' => 'Telefon kontaktieren', + 'created_at' => 'Erstellungszeit', + 'updated_at' => 'aktualisierte Zeit', + 'status' => 'Status', + 'status_format' => 'status', + 'total' => 'Bestellsumme', + 'express_number' => 'Express-Bestellnummer', + 'express_company' => 'express company', + 'order_shipments' => 'Sendungsinformationen', - 'address_info' => 'Adressinformationen', - 'shipping_address' => 'Lieferadresse', - 'payment_address' => 'Rechnungsadresse', - 'order_status' => 'Bestellstatus', - 'current_status' => 'aktueller Status', - 'change_to_status' => 'Status ändern', - 'comment' => 'remark information', - 'submit_status' => 'Status aktualisieren', + 'address_info' => 'Adressinformationen', + 'shipping_address' => 'Lieferadresse', + 'payment_address' => 'Rechnungsadresse', + 'order_status' => 'Bestellstatus', + 'current_status' => 'aktueller Status', + 'change_to_status' => 'Status ändern', + 'comment' => 'remark information', + 'submit_status' => 'Status aktualisieren', - 'product_info' => 'Produktinformationen', - 'product_name' => 'name', - 'product_price' => 'Preis', - 'product_sub_price' => 'Zwischensumme', - 'product_quantity' => 'Menge', - 'product_sku' => 'SKU', + 'product_info' => 'Produktinformationen', + 'product_name' => 'name', + 'product_price' => 'Preis', + 'product_sub_price' => 'Zwischensumme', + 'product_quantity' => 'Menge', + 'product_sku' => 'SKU', - 'action_history' => 'Betriebsprotokoll', - 'history_status' => 'status', - 'history_comment' => 'Bemerkungen', + 'action_history' => 'Betriebsprotokoll', + 'history_status' => 'status', + 'history_comment' => 'Bemerkungen', 'history_created_at' => 'Aktualisierungsdatum', - 'unpaid' => 'zu bezahlen', - 'paid' => 'bezahlt', - 'shipped' => 'versandt', - 'completed' => 'abgeschlossen', - 'cancelled' => 'Storniert', + 'unpaid' => 'zu bezahlen', + 'paid' => 'bezahlt', + 'shipped' => 'versandt', + 'completed' => 'abgeschlossen', + 'cancelled' => 'Storniert', ]; diff --git a/resources/lang/de/page.php b/resources/lang/de/page.php index 977612f1..55fe9b5b 100644 --- a/resources/lang/de/page.php +++ b/resources/lang/de/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => 'Titel', + 'title' => 'Titel', 'content' => 'Inhalt', ]; diff --git a/resources/lang/de/product.php b/resources/lang/de/product.php index 03d47dcc..6abc5cf2 100644 --- a/resources/lang/de/product.php +++ b/resources/lang/de/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => 'Name', - 'sku' => 'SKU', - 'price' => 'Preis', - 'origin_price' => 'ursprünglicher Preis', - 'cost_price' => 'Kostenpreis', - 'brand' => 'Marke', - 'category' => 'Kategorie', - 'model' => 'Modell', - 'quantity' => 'Lager', - 'image' => 'Bild', + 'name' => 'Name', + 'sku' => 'SKU', + 'price' => 'Preis', + 'origin_price' => 'ursprünglicher Preis', + 'cost_price' => 'Kostenpreis', + 'brand' => 'Marke', + 'category' => 'Kategorie', + 'model' => 'Modell', + 'quantity' => 'Lager', + 'image' => 'Bild', - 'active' => 'im Regal', - 'inactive' => 'von der Stange', + 'active' => 'im Regal', + 'inactive' => 'von der Stange', 'has_been_inactive' => 'Das Produkt wurde entfernt', ]; diff --git a/resources/lang/de/rma.php b/resources/lang/de/rma.php index c670d399..55e41227 100644 --- a/resources/lang/de/rma.php +++ b/resources/lang/de/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => 'Bestellung', - 'order_product_id' => 'Produkt bestellen', - 'customer_id' => 'Kunde', - 'quantity' => 'Menge', - 'opened' => 'ausgepackt', - 'rma_reason_id' => 'Rücksendegrund', - 'type' => 'Kundendiensttyp', + 'order_id' => 'Bestellung', + 'order_product_id' => 'Produkt bestellen', + 'customer_id' => 'Kunde', + 'quantity' => 'Menge', + 'opened' => 'ausgepackt', + 'rma_reason_id' => 'Rücksendegrund', + 'type' => 'Kundendiensttyp', - 'status_pending' => 'zu bearbeiten', - 'status_rejected' => 'abgelehnt', - 'status_approved' => 'Genehmigt (vom Kunden zurückzugeben)', - 'status_shipped' => 'versendet (Rücksendung)', - 'status_completed' => 'abgeschlossen', - 'type_return' => 'Rückgabe', - 'type_exchange' => 'Austausch', - 'type_repair' => 'reparieren', - 'type_reissue' => 'Produkt neu auflegen', - 'type_refund' => 'Nur Rückerstattung' + 'status_pending' => 'zu bearbeiten', + 'status_rejected' => 'abgelehnt', + 'status_approved' => 'Genehmigt (vom Kunden zurückzugeben)', + 'status_shipped' => 'versendet (Rücksendung)', + 'status_completed' => 'abgeschlossen', + 'type_return' => 'Rückgabe', + 'type_exchange' => 'Austausch', + 'type_repair' => 'reparieren', + 'type_reissue' => 'Produkt neu auflegen', + 'type_refund' => 'Nur Rückerstattung', ]; diff --git a/resources/lang/de/shop/account.php b/resources/lang/de/shop/account.php index f9dc07f2..c8a91556 100644 --- a/resources/lang/de/shop/account.php +++ b/resources/lang/de/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'persönliches Zentrum', - 'revise_info' => 'Informationen überarbeiten', - 'collect' => 'Sammlung', - 'coupon' => 'Gutschein', - 'my_order' => 'Meine Bestellung', - 'orders' => 'alle Bestellungen', - 'pending_payment' => 'zu zahlen', - 'pending_send' => 'zu versenden', - 'pending_receipt' => 'zu empfangen', - 'after_sales' => 'Kundendienst', - 'no_order' => 'Du hast noch keine Bestellung! ', - 'to_buy' => 'Zur Bestellung gehen', - 'order_number' => 'Bestellnummer', - 'order_time' => 'Bestellzeit', - 'state' => 'Staat', - 'amount' => 'Betrag', - 'check_details' => 'Details prüfen', - 'all' => 'Gesamt', - 'items' => 'Artikel', - 'verify_code_expired' => 'Ihr Bestätigungscode ist abgelaufen (10 Minuten), bitte fordern Sie ihn erneut an', - 'verify_code_error' => 'Ihr Bestätigungscode ist falsch', - 'account_not_exist' => 'Konto existiert nicht', + 'index' => 'persönliches Zentrum', + 'revise_info' => 'Informationen überarbeiten', + 'collect' => 'Sammlung', + 'coupon' => 'Gutschein', + 'my_order' => 'Meine Bestellung', + 'orders' => 'alle Bestellungen', + 'pending_payment' => 'zu zahlen', + 'pending_send' => 'zu versenden', + 'pending_receipt' => 'zu empfangen', + 'after_sales' => 'Kundendienst', + 'no_order' => 'Du hast noch keine Bestellung! ', + 'to_buy' => 'Zur Bestellung gehen', + 'order_number' => 'Bestellnummer', + 'order_time' => 'Bestellzeit', + 'state' => 'Staat', + 'amount' => 'Betrag', + 'check_details' => 'Details prüfen', + 'all' => 'Gesamt', + 'items' => 'Artikel', + 'verify_code_expired' => 'Ihr Bestätigungscode ist abgelaufen (10 Minuten), bitte fordern Sie ihn erneut an', + 'verify_code_error' => 'Ihr Bestätigungscode ist falsch', + 'account_not_exist' => 'Konto existiert nicht', - 'edit' => [ - 'index' => 'persönliche Daten ändern', - 'modify_avatar' => 'Avatar ändern', - 'suggest' => 'JPG- oder PNG-Bild hochladen. 300 x 300 wird empfohlen. ', - 'name' => 'Name', - 'emil' => 'Postfach', - 'crop' => 'Ernte', - 'password_edit_success' => 'Passwort erfolgreich geändert', - 'origin_password_fail' => 'ursprünglicher Passwortfehler', + 'edit' => [ + 'index' => 'persönliche Daten ändern', + 'modify_avatar' => 'Avatar ändern', + 'suggest' => 'JPG- oder PNG-Bild hochladen. 300 x 300 wird empfohlen. ', + 'name' => 'Name', + 'emil' => 'Postfach', + 'crop' => 'Ernte', + 'password_edit_success' => 'Passwort erfolgreich geändert', + 'origin_password_fail' => 'ursprünglicher Passwortfehler', ], - 'wishlist' => [ - 'index' => 'Meine Favoriten', - 'Produkt' => 'Produkt', - 'Prce' => 'Preis', - 'check_details' => 'Details prüfen', + 'wishlist' => [ + 'index' => 'Meine Favoriten', + 'Produkt' => 'Produkt', + 'Prce' => 'Preis', + 'check_details' => 'Details prüfen', ], - 'order' => [ - 'index' => 'Meine Bestellung', - 'completed' => 'bestätigter Eingang', - 'cancelled' => 'Bestellung storniert', - 'order_details' => 'Bestelldetails', - 'amount' => 'Betrag', - 'state' => 'Staat', - 'order_number' => 'Bestellnummer', - 'check' => 'prüfen', + 'order' => [ + 'index' => 'Meine Bestellung', + 'completed' => 'bestätigter Eingang', + 'cancelled' => 'Bestellung storniert', + 'order_details' => 'Bestelldetails', + 'amount' => 'Betrag', + 'state' => 'Staat', + 'order_number' => 'Bestellnummer', + 'check' => 'prüfen', - 'order_info' => [ - 'index' => 'Bestelldetails', - 'order_details' => 'Bestelldetails', - 'to_pay' => 'bezahlen', - 'cancel' => 'Bestellung stornieren', - 'confirm_receipt' => 'Empfang bestätigen', - 'order_number' => 'Bestellnummer', - 'order_date' => 'Bestelldatum', - 'state' => 'Staat', - 'order_amount' => 'Bestellbetrag', - 'order_items' => 'Artikel bestellen', - 'apply_after_sales' => 'Nach dem Verkauf bewerben', - 'order_total' => 'Gesamtbestellung', - 'logistics_status' => 'Logistikstatus', - 'order_status' => 'Bestellstatus', - 'remark' => 'Bemerkung', - 'update_time' => 'Aktualisierungszeit', + 'order_info' => [ + 'index' => 'Bestelldetails', + 'order_details' => 'Bestelldetails', + 'to_pay' => 'bezahlen', + 'cancel' => 'Bestellung stornieren', + 'confirm_receipt' => 'Empfang bestätigen', + 'order_number' => 'Bestellnummer', + 'order_date' => 'Bestelldatum', + 'state' => 'Staat', + 'order_amount' => 'Bestellbetrag', + 'order_items' => 'Artikel bestellen', + 'apply_after_sales' => 'Nach dem Verkauf bewerben', + 'order_total' => 'Gesamtbestellung', + 'logistics_status' => 'Logistikstatus', + 'order_status' => 'Bestellstatus', + 'remark' => 'Bemerkung', + 'update_time' => 'Aktualisierungszeit', ], 'order_success' => [ - 'order_success' => 'Herzlichen Glückwunsch, die Bestellung wurde erfolgreich generiert! ', - 'order_number' => 'Bestellnummer', - 'amounts_payable' => 'Zahlungsbetrag', - 'payment_method' => 'Zahlungsmethode', - 'view_order' => 'Bestelldetails anzeigen', - 'pay_now' => 'jetzt bezahlen', - 'kind_tips' => 'Herzliche Erinnerung: Ihre Bestellung wurde erfolgreich generiert, bitte schließen Sie die Zahlung so schnell wie möglich ab~', - 'also' => 'Du kannst auch', - 'continue_purchase' => 'mit dem Kauf fortfahren', - 'contact_customer_service' => 'Bei Fragen während des Bestellvorgangs können Sie sich jederzeit an unseren Kundenservice wenden', - 'email' => 'Postfach', - 'service_hotline' => 'Service-Hotline', + 'order_success' => 'Herzlichen Glückwunsch, die Bestellung wurde erfolgreich generiert! ', + 'order_number' => 'Bestellnummer', + 'amounts_payable' => 'Zahlungsbetrag', + 'payment_method' => 'Zahlungsmethode', + 'view_order' => 'Bestelldetails anzeigen', + 'pay_now' => 'jetzt bezahlen', + 'kind_tips' => 'Herzliche Erinnerung: Ihre Bestellung wurde erfolgreich generiert, bitte schließen Sie die Zahlung so schnell wie möglich ab~', + 'also' => 'Du kannst auch', + 'continue_purchase' => 'mit dem Kauf fortfahren', + 'contact_customer_service' => 'Bei Fragen während des Bestellvorgangs können Sie sich jederzeit an unseren Kundenservice wenden', + 'email' => 'Postfach', + 'service_hotline' => 'Service-Hotline', ], ], - 'addresses' => [ - 'index' => 'meine Adresse', - 'add_address' => 'Neue Adresse hinzufügen', - 'default_address' => 'Standardadresse', - 'delete' => 'löschen', - 'edit' => 'bearbeiten', - 'enter_name' => 'Bitte geben Sie Ihren Namen ein', - 'enter_phone' => 'Bitte geben Sie die Telefonnummer ein', - 'enter_address' => 'Bitte genaue Adresse 1 eingeben', - 'select_province' => 'Bitte wählen Sie eine Provinz aus', - 'enter_city' => 'Bitte Stadt eingeben', - 'confirm_delete' => 'Sind Sie sicher, dass Sie die Adresse löschen möchten? ', - 'hint' => 'hinweis', - 'check_form' => 'Bitte überprüfen Sie, ob das Formular korrekt ausgefüllt ist', + 'addresses' => [ + 'index' => 'meine Adresse', + 'add_address' => 'Neue Adresse hinzufügen', + 'default_address' => 'Standardadresse', + 'delete' => 'löschen', + 'edit' => 'bearbeiten', + 'enter_name' => 'Bitte geben Sie Ihren Namen ein', + 'enter_phone' => 'Bitte geben Sie die Telefonnummer ein', + 'enter_address' => 'Bitte genaue Adresse 1 eingeben', + 'select_province' => 'Bitte wählen Sie eine Provinz aus', + 'enter_city' => 'Bitte Stadt eingeben', + 'confirm_delete' => 'Sind Sie sicher, dass Sie die Adresse löschen möchten? ', + 'hint' => 'hinweis', + 'check_form' => 'Bitte überprüfen Sie, ob das Formular korrekt ausgefüllt ist', ], - 'rma' => [ - 'index' => 'Mein Kundendienst', - 'commodity' => 'Ware', - 'quantity' => 'Menge', - 'service_type' => 'Diensttyp', - 'return_reason' => 'Rücksendegrund', - 'creation_time' => 'Erstellungszeit', - 'check' => 'prüfen', + 'rma' => [ + 'index' => 'Mein Kundendienst', + 'commodity' => 'Ware', + 'quantity' => 'Menge', + 'service_type' => 'Diensttyp', + 'return_reason' => 'Rücksendegrund', + 'creation_time' => 'Erstellungszeit', + 'check' => 'prüfen', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'After-Sales-Details', ], - 'rma_form' => [ - 'index' => 'Kundendienstinformationen übermitteln', - 'service_type' => 'Diensttyp', - 'return_quantity' => 'Rückgabemenge', - 'unpacked' => 'ausgepackt', - 'return_reason' => 'Rücksendegrund', - 'remark' => 'Bemerkung', - ] - ] + 'rma_form' => [ + 'index' => 'Kundendienstinformationen übermitteln', + 'service_type' => 'Diensttyp', + 'return_quantity' => 'Rückgabemenge', + 'unpacked' => 'ausgepackt', + 'return_reason' => 'Rücksendegrund', + 'remark' => 'Bemerkung', + ], + ], ]; diff --git a/resources/lang/de/shop/carts.php b/resources/lang/de/shop/carts.php index 00358098..bdf536d5 100644 --- a/resources/lang/de/shop/carts.php +++ b/resources/lang/de/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'Einkaufswagen', - 'added_to_cart' => 'Zum Warenkorb hinzugefügt', - 'select_all' => 'alle auswählen', - 'commodity' => 'Ware', - 'quantity' => 'Menge', - 'subtotal' => 'Zwischensumme', - 'product_total' => 'Produktsumme', - 'order_total' => 'zu zahlender Gesamtbetrag', - 'shipping_fee' => 'Versandgebühr', - 'all' => 'alle', - 'selected' => 'ausgewählt', - 'to_checkout' => 'Zur Kasse gehen', - 'cart_empty' => 'Ihr Warenkorb ist leer', - 'go_buy' => 'Sie können gehen und sehen, was Sie kaufen möchten', - 'go_shopping' => 'Einkaufen gehen', - 'must_select' => 'Bitte wählen Sie mindestens einen Artikel aus', - 'mini' => 'Ihr Warenkorb', - 'delete' => 'löschen', - 'check_cart' => 'Warenkorb prüfen', + 'index' => 'Einkaufswagen', + 'added_to_cart' => 'Zum Warenkorb hinzugefügt', + 'select_all' => 'alle auswählen', + 'commodity' => 'Ware', + 'quantity' => 'Menge', + 'subtotal' => 'Zwischensumme', + 'product_total' => 'Produktsumme', + 'order_total' => 'zu zahlender Gesamtbetrag', + 'shipping_fee' => 'Versandgebühr', + 'all' => 'alle', + 'selected' => 'ausgewählt', + 'to_checkout' => 'Zur Kasse gehen', + 'cart_empty' => 'Ihr Warenkorb ist leer', + 'go_buy' => 'Sie können gehen und sehen, was Sie kaufen möchten', + 'go_shopping' => 'Einkaufen gehen', + 'must_select' => 'Bitte wählen Sie mindestens einen Artikel aus', + 'mini' => 'Ihr Warenkorb', + 'delete' => 'löschen', + 'check_cart' => 'Warenkorb prüfen', - 'invalid_customer' => 'Warenkorbkunde ist ungültig', - 'empty_selected_products' => 'Das ausgewählte Produkt im Warenkorb ist leer', - 'invalid_shipping_address' => 'Ungültige Lieferadresse', - 'invalid_payment_address' => 'Rechnungsadresse ist ungültig', - 'invalid_shipping_method' => 'Die Versandart ist nicht verfügbar', - 'invalid_payment_method' => 'Zahlungsmethode nicht verfügbar', -]; \ No newline at end of file + 'invalid_customer' => 'Warenkorbkunde ist ungültig', + 'empty_selected_products' => 'Das ausgewählte Produkt im Warenkorb ist leer', + 'invalid_shipping_address' => 'Ungültige Lieferadresse', + 'invalid_payment_address' => 'Rechnungsadresse ist ungültig', + 'invalid_shipping_method' => 'Die Versandart ist nicht verfügbar', + 'invalid_payment_method' => 'Zahlungsmethode nicht verfügbar', +]; diff --git a/resources/lang/de/shop/checkout.php b/resources/lang/de/shop/checkout.php index 86ee42a3..a16882dd 100644 --- a/resources/lang/de/shop/checkout.php +++ b/resources/lang/de/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'Rechnung bitte', - 'address' => 'Lieferadresse', - 'payment_address' => 'Rechnungsadresse', + 'index' => 'Rechnung bitte', + 'address' => 'Lieferadresse', + 'payment_address' => 'Rechnungsadresse', 'same_as_shipping_address' => 'Die Rechnungsadresse ist die gleiche wie die Lieferadresse', - 'chosen' => 'ausgewählt', - 'edit' => 'bearbeiten', - 'choose_another_address' => 'Wählen Sie eine andere Adresse', - 'add_new_address' => 'Neue Adresse hinzufügen', - 'payment_method' => 'Zahlungsmethode', - 'delivery_method' => 'Liefermethode', - 'cart_totals' => 'Gesamtzahl der Warenkörbe', - 'submit_order' => 'Bestellung absenden', - 'enter_name' => 'Bitte geben Sie Ihren Namen ein', - 'enter_phone' => 'Bitte geben Sie die Telefonnummer ein', - 'enter_address' => 'Bitte genaue Adresse 1 eingeben', - 'select_province' => 'Bitte wählen Sie eine Provinz aus', - 'enter_city' => 'Bitte Stadt eingeben', - 'check_form' => 'Bitte prüfen Sie, ob das Formular korrekt ausgefüllt ist', - 'error_payment_address' => 'Bitte wählen Sie die Rechnungsadresse', + 'chosen' => 'ausgewählt', + 'edit' => 'bearbeiten', + 'choose_another_address' => 'Wählen Sie eine andere Adresse', + 'add_new_address' => 'Neue Adresse hinzufügen', + 'payment_method' => 'Zahlungsmethode', + 'delivery_method' => 'Liefermethode', + 'cart_totals' => 'Gesamtzahl der Warenkörbe', + 'submit_order' => 'Bestellung absenden', + 'enter_name' => 'Bitte geben Sie Ihren Namen ein', + 'enter_phone' => 'Bitte geben Sie die Telefonnummer ein', + 'enter_address' => 'Bitte genaue Adresse 1 eingeben', + 'select_province' => 'Bitte wählen Sie eine Provinz aus', + 'enter_city' => 'Bitte Stadt eingeben', + 'check_form' => 'Bitte prüfen Sie, ob das Formular korrekt ausgefüllt ist', + 'error_payment_address' => 'Bitte wählen Sie die Rechnungsadresse', - 'payment' => [ - 'index' => 'bitte bezahlen', - 'please_pay' => 'Bestellung erfolgreich übermittelt, bitte bezahlen', - 'order_number' => 'Bestellnummer', + 'payment' => [ + 'index' => 'bitte bezahlen', + 'please_pay' => 'Bestellung erfolgreich übermittelt, bitte bezahlen', + 'order_number' => 'Bestellnummer', 'amounts_payable' => 'zu zahlender Betrag', - 'payment_method' => 'Zahlungsmethode', - ] + 'payment_method' => 'Zahlungsmethode', + ], ]; diff --git a/resources/lang/de/shop/common.php b/resources/lang/de/shop/common.php index 40b77135..7c8a3fd4 100644 --- a/resources/lang/de/shop/common.php +++ b/resources/lang/de/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => 'home', - 'submit' => 'Senden', - 'cancel' => 'Abbrechen', - 'confirm' => 'bestätigen', - 'no' => 'nein', - 'yes' => 'ja', + 'home' => 'home', + 'submit' => 'Senden', + 'cancel' => 'Abbrechen', + 'confirm' => 'bestätigen', + 'no' => 'nein', + 'yes' => 'ja', ]; diff --git a/resources/lang/de/shop/currency.php b/resources/lang/de/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/de/shop/currency.php +++ b/resources/lang/de/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/de/shop/forgotten.php b/resources/lang/de/shop/forgotten.php index cac329ab..e9fe7871 100644 --- a/resources/lang/de/shop/forgotten.php +++ b/resources/lang/de/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'Passwort vergessen', - 'follow_prompt' => 'Bitte folgen Sie den Anweisungen, um Ihr Passwort abzurufen', - 'email_forCode' => 'Bitte geben Sie Ihre E-Mail-Adresse ein, um den Bestätigungscode zu erhalten', - 'enter_password' => 'Bitte geben Sie ein neues Passwort ein', - 'email' => 'Postfach', - 'email_address' => 'E-Mail-Adresse', - 'verification_code' => 'Bestätigungscode', - 'passwort' => 'Passwort', - 'confirm_password' => 'Passwort bestätigen', - 'send_code' => 'Bestätigungscode senden', - 'to_back' => 'Zurück zum vorherigen Schritt', - 'enter_password' => 'Bitte geben Sie Ihr Passwort ein', - 'enter_email' => 'Bitte geben Sie Ihre E-Mail-Adresse ein', - 'please_confirm' => 'Bitte bestätigen Sie das Passwort', - 'password_err' => 'Die zweimal eingegebenen Passwörter sind inkonsistent!', - 'email_err' => 'Bitte geben Sie die richtige E-Mail-Adresse ein!', - 'enter_code' => 'Bitte geben Sie den Bestätigungscode ein', - 'verification_code_sent' => 'Der Verifizierungscode wurde gesendet, bitte überprüfen und geben Sie den Verifizierungscode ein', - 'password_updated' => 'Passwort wurde geändert', + 'index' => 'Passwort vergessen', + 'follow_prompt' => 'Bitte folgen Sie den Anweisungen, um Ihr Passwort abzurufen', + 'email_forCode' => 'Bitte geben Sie Ihre E-Mail-Adresse ein, um den Bestätigungscode zu erhalten', + 'enter_password' => 'Bitte geben Sie ein neues Passwort ein', + 'email' => 'Postfach', + 'email_address' => 'E-Mail-Adresse', + 'verification_code' => 'Bestätigungscode', + 'passwort' => 'Passwort', + 'confirm_password' => 'Passwort bestätigen', + 'send_code' => 'Bestätigungscode senden', + 'to_back' => 'Zurück zum vorherigen Schritt', + 'enter_password' => 'Bitte geben Sie Ihr Passwort ein', + 'enter_email' => 'Bitte geben Sie Ihre E-Mail-Adresse ein', + 'please_confirm' => 'Bitte bestätigen Sie das Passwort', + 'password_err' => 'Die zweimal eingegebenen Passwörter sind inkonsistent!', + 'email_err' => 'Bitte geben Sie die richtige E-Mail-Adresse ein!', + 'enter_code' => 'Bitte geben Sie den Bestätigungscode ein', + 'verification_code_sent' => 'Der Verifizierungscode wurde gesendet, bitte überprüfen und geben Sie den Verifizierungscode ein', + 'password_updated' => 'Passwort wurde geändert', ]; diff --git a/resources/lang/de/shop/login.php b/resources/lang/de/shop/login.php index 08de67df..81ed21c8 100644 --- a/resources/lang/de/shop/login.php +++ b/resources/lang/de/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'Benutzeranmeldung und Registrierung', - 'login_and_sign' => 'anmelden/registrieren', - 'home' => 'home', - 'library' => 'persönliches Zentrum', - 'login' => 'Anmeldung', - 'already' => 'Schon unser Kunde? ', - 'description' => 'Schon unser Kunde? ', - 'email' => 'Mail', - 'email_address' => 'E-Mail-Adresse', - 'passwort' => 'Passwort', - 'forget_password' => 'Passwort vergessen', - 'new' => 'neues Konto', - 'not_already' => 'Noch kein registrierter Kunde? ', - 'confirm_password' => 'Passwort bestätigen', - 'register' => 'registrieren', - 'enter_password' => 'Bitte geben Sie Ihr Passwort ein', - 'enter_email' => 'Bitte geben Sie Ihre E-Mail-Adresse ein', - 'please_confirm' => 'Bitte bestätigen Sie das Passwort', - 'password_err' => 'Die zweimal eingegebenen Passwörter sind inkonsistent!', - 'email_err' => 'Bitte geben Sie die richtige E-Mail-Adresse ein!', - 'check_form' => 'Bitte überprüfen Sie, ob das Formular korrekt ausgefüllt ist', - 'email_or_password_error' => 'E-Mail- oder Passwortfehler!', - 'customer_inactive' => 'Benutzer wurde deaktiviert', - 'login_successfully' => 'erfolgreich angemeldet', - 'register_success' => 'erfolgreich registriert', - 'third_party_logins' => 'erwähnenswert', + 'index' => 'Benutzeranmeldung und Registrierung', + 'login_and_sign' => 'anmelden/registrieren', + 'home' => 'home', + 'library' => 'persönliches Zentrum', + 'login' => 'Anmeldung', + 'already' => 'Schon unser Kunde? ', + 'description' => 'Schon unser Kunde? ', + 'email' => 'Mail', + 'email_address' => 'E-Mail-Adresse', + 'passwort' => 'Passwort', + 'forget_password' => 'Passwort vergessen', + 'new' => 'neues Konto', + 'not_already' => 'Noch kein registrierter Kunde? ', + 'confirm_password' => 'Passwort bestätigen', + 'register' => 'registrieren', + 'enter_password' => 'Bitte geben Sie Ihr Passwort ein', + 'enter_email' => 'Bitte geben Sie Ihre E-Mail-Adresse ein', + 'please_confirm' => 'Bitte bestätigen Sie das Passwort', + 'password_err' => 'Die zweimal eingegebenen Passwörter sind inkonsistent!', + 'email_err' => 'Bitte geben Sie die richtige E-Mail-Adresse ein!', + 'check_form' => 'Bitte überprüfen Sie, ob das Formular korrekt ausgefüllt ist', + 'email_or_password_error' => 'E-Mail- oder Passwortfehler!', + 'customer_inactive' => 'Benutzer wurde deaktiviert', + 'login_successfully' => 'erfolgreich angemeldet', + 'register_success' => 'erfolgreich registriert', + 'third_party_logins' => 'erwähnenswert', ]; diff --git a/resources/lang/de/shop/order.php b/resources/lang/de/shop/order.php index a7982f09..23e0a896 100644 --- a/resources/lang/de/shop/order.php +++ b/resources/lang/de/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => 'ungültige Bestellung', - 'confirm_order' => 'Benutzer bestätigt Erhalt', - 'cancel_order' => 'Benutzer storniert die Bestellung', - 'order_already_paid' => 'Bestellung bezahlt', + 'invalid_order' => 'ungültige Bestellung', + 'confirm_order' => 'Benutzer bestätigt Erhalt', + 'cancel_order' => 'Benutzer storniert die Bestellung', + 'order_already_paid' => 'Bestellung bezahlt', ]; diff --git a/resources/lang/de/shop/products.php b/resources/lang/de/shop/products.php index 5c725d88..58062a26 100644 --- a/resources/lang/de/shop/products.php +++ b/resources/lang/de/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => 'Suche', - 'add_to_favorites' => 'Zu Favoriten hinzufügen', - 'add_to_cart' => 'Zum Warenkorb hinzufügen', - 'buy_now' => 'Jetzt kaufen', - 'product_details' => 'Produktdetails', - 'in_stock' => 'auf Lager', - 'out_stock' => 'nicht auf Lager', - 'modell' => 'Modell', + 'search' => 'Suche', + 'add_to_favorites' => 'Zu Favoriten hinzufügen', + 'add_to_cart' => 'Zum Warenkorb hinzufügen', + 'buy_now' => 'Jetzt kaufen', + 'product_details' => 'Produktdetails', + 'in_stock' => 'auf Lager', + 'out_stock' => 'nicht auf Lager', + 'modell' => 'Modell', ]; diff --git a/resources/lang/de/shop/steps.php b/resources/lang/de/shop/steps.php index e8aac416..1566d6c8 100644 --- a/resources/lang/de/shop/steps.php +++ b/resources/lang/de/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'schritt', - 'cart' => 'Warenkorb', - 'checkout' => 'Kasse', - 'submitted_successfully' => 'erfolgreich eingereicht', - 'payment' => 'Zahlung', + 'index' => 'schritt', + 'cart' => 'Warenkorb', + 'checkout' => 'Kasse', + 'submitted_successfully' => 'erfolgreich eingereicht', + 'payment' => 'Zahlung', ]; diff --git a/resources/lang/de/shop/wishlist.php b/resources/lang/de/shop/wishlist.php index 8d18e046..4c85a165 100644 --- a/resources/lang/de/shop/wishlist.php +++ b/resources/lang/de/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'Der Sammlung erfolgreich hinzugefügt', - 'remove_wishlist_success' => 'Sammlung erfolgreich entfernt', + 'add_wishlist_success' => 'Der Sammlung erfolgreich hinzugefügt', + 'remove_wishlist_success' => 'Sammlung erfolgreich entfernt', ]; diff --git a/resources/lang/en/address.php b/resources/lang/en/address.php index 08e1fe99..eb5e0853 100644 --- a/resources/lang/en/address.php +++ b/resources/lang/en/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Edit Address', - 'name' => 'Name', - 'phone' => 'Phone', + 'index' => 'Edit Address', + 'name' => 'Name', + 'phone' => 'Phone', 'country_id' => 'Country ID', - 'zone' => 'Zone', - 'zone_id' => 'Zone ID', - 'address_1' => 'Address 1', - 'address_2' => 'Address 2', - 'address' => 'Address', + 'zone' => 'Zone', + 'zone_id' => 'Zone ID', + 'address_1' => 'Address 1', + 'address_2' => 'Address 2', + 'address' => 'Address', 'enter_city' => 'Enter city', - 'post_code' => 'Zip Code', - 'default' => 'Default', + 'post_code' => 'Zip Code', + 'default' => 'Default', ]; diff --git a/resources/lang/en/admin/admin_roles.php b/resources/lang/en/admin/admin_roles.php index 42677b72..3f27fab4 100644 --- a/resources/lang/en/admin/admin_roles.php +++ b/resources/lang/en/admin/admin_roles.php @@ -10,11 +10,11 @@ */ return [ - 'select_all' => 'Select All', - 'unselect_all' => 'Unselect All', - 'role' => 'Role', - 'role_name' => 'Role Name', + 'select_all' => 'Select All', + 'unselect_all' => 'Unselect All', + 'role' => 'Role', + 'role_name' => 'Role Name', 'role_management' => 'Role Management', - 'permission' => 'Permission', - 'error_roles' => 'Please select at least one role', + 'permission' => 'Permission', + 'error_roles' => 'Please select at least one role', ]; diff --git a/resources/lang/en/admin/attribute.php b/resources/lang/en/admin/attribute.php index 71a5bd59..f1d380ef 100644 --- a/resources/lang/en/admin/attribute.php +++ b/resources/lang/en/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'Attribute', - 'attribute_info' => 'Attribute information', - 'create_at' => 'Create attribute', - 'attribute_value' => 'Cttribute value', - 'set_attribute' => 'Configuration attribute', - 'add_attribute' => 'Add attribute value', + 'index' => 'Attribute', + 'attribute_info' => 'Attribute information', + 'create_at' => 'Create attribute', + 'attribute_value' => 'Cttribute value', + 'set_attribute' => 'Configuration attribute', + 'add_attribute' => 'Add attribute value', 'before_attribute' => 'Please select the left attribute first', - 'btn_at' => 'Go now', - 'btn_later' => 'Later', - 'to_info_values' => 'Please go to the details page to edit attribute values', + 'btn_at' => 'Go now', + 'btn_later' => 'Later', + 'to_info_values' => 'Please go to the details page to edit attribute values', ]; diff --git a/resources/lang/en/admin/attribute_groups.php b/resources/lang/en/admin/attribute_groups.php index 35c8a56e..c831aa76 100644 --- a/resources/lang/en/admin/attribute_groups.php +++ b/resources/lang/en/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => 'Attribute group', + 'index' => 'Attribute group', 'create_at_groups' => 'Create attribute group', ]; diff --git a/resources/lang/en/admin/brand.php b/resources/lang/en/admin/brand.php index ab0dd99b..8e5e24b3 100644 --- a/resources/lang/en/admin/brand.php +++ b/resources/lang/en/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => 'Brand', + 'index' => 'Brand', - 'brands_index' => 'Index', + 'brands_index' => 'Index', 'brands_create' => 'Create', - 'brands_show' => 'Detail', + 'brands_show' => 'Detail', 'brands_update' => 'Edit', 'brands_delete' => 'Delete', - 'error_upload' => 'Please upload icon' + 'error_upload' => 'Please upload icon', ]; diff --git a/resources/lang/en/admin/builder.php b/resources/lang/en/admin/builder.php index 2a2a5965..d47366a5 100644 --- a/resources/lang/en/admin/builder.php +++ b/resources/lang/en/admin/builder.php @@ -11,240 +11,240 @@ */ return [ - 'heading_title' => 'Page editing', - 'modules_instructions' => 'Available modules, click Add to page', - 'text_floor_prompt' => 'Settings', - 'text_new_page' => 'Add new page', - 'text_quit' => 'Quit', - 'text_save' => 'Save', - 'text_view_page' => 'View page', - 'text_module' => 'Module', - 'text_module_title' => 'Module Title', - 'text_menu' => 'Navigation', - 'text_drag_sort' => 'Drag to sort', - 'text_set_up' => 'Setup', - 'text_delete' => 'Remove', - 'text_floor' => 'Floor', - 'text_add_module' => 'Add module', - 'text_to_menu' => 'Edit Menu', - 'text_other' => 'Other', - 'text_preparing' => 'Preparing...', - 'text_floor_setting' => 'Floor setting', - 'text_background_color' => 'Background color', - 'text_sure' => 'OK', - 'text_page_name' => 'Please enter the name of the new page', - 'text_is_save' => 'Please make sure that the current page data has been saved! ', - 'text_pop_ads' => 'Pop-up ads', - 'text_style_setting' => 'Style Settings', - 'text_is_save_data' => 'Before switching pages, please make sure that the current page data has been saved? ', - 'text_hint' => 'Hint', - 'text_cancel' => 'Cancel', - 'text_created_success' => 'Page created successfully', - 'text_html_none' => 'Module loading error, HTML data is empty! ', - 'text_is_delete' => 'Are you sure you want to delete', - 'text_enable' => 'Enable', - 'text_set_title' => 'Set title', - 'text_set_subtitle' => 'Set subtitle', - 'text_suggested_size' => 'Suggested size (width x height):', - 'text_word' => 'Text', - 'text_add_pictures' => 'Add pictures', - 'text_refresh_cookie' => 'Refresh Cookie', - 'text_popup_hint' => 'Note: When the user clicks close, it will no longer be displayed until the browser is closed and reopened. For local testing, click "Refresh Cookie", then refresh the browser, and the pop-up window can be launched again. ', - 'text_cookie_refresh_success' => 'Cookie refresh successfully, refresh the browser to see the content of the pop-up window. ', - 'text_add_hot_links' => 'Add Hot Links', - 'text_add' => 'Add', - 'text_margin_top' => 'Module margin-top', - 'text_margin_bottom' => 'Module margin-bottom', - 'text_file_manager' => 'File Manager', - 'modules_link' => 'Link', - 'modules_choose_link' => 'Choose link', - 'text_select_link' => 'Please select the link page to jump to', - 'text_no' => 'No', - 'text_search' => 'Search', - 'text_is_newpage' => 'new window:', - 'text_manage' => 'Management', - 'text_title_cover' => 'Title (overwrite the link name selected below)', - 'text_enter_link' => 'Please enter the link address', - 'text_states' => 'States', - 'text_disable' => 'Disable', - 'text_no_data' => 'Data does not exist or has been deleted', - 'text_to_add' => 'Go to add', - 'text_category' => 'Category', - 'text_information' => 'Information', - 'text_manufacturer' => 'Brand', - 'text_static' => 'Fixed connection', - 'text_custom' => 'Custom', - 'text_top_text' => 'Top text', - 'text_edit_page_name' => 'Edit page name', - 'text_page_name_no' => 'Name cannot be empty', - 'custom_name' => 'Custom Name', + 'heading_title' => 'Page editing', + 'modules_instructions' => 'Available modules, click Add to page', + 'text_floor_prompt' => 'Settings', + 'text_new_page' => 'Add new page', + 'text_quit' => 'Quit', + 'text_save' => 'Save', + 'text_view_page' => 'View page', + 'text_module' => 'Module', + 'text_module_title' => 'Module Title', + 'text_menu' => 'Navigation', + 'text_drag_sort' => 'Drag to sort', + 'text_set_up' => 'Setup', + 'text_delete' => 'Remove', + 'text_floor' => 'Floor', + 'text_add_module' => 'Add module', + 'text_to_menu' => 'Edit Menu', + 'text_other' => 'Other', + 'text_preparing' => 'Preparing...', + 'text_floor_setting' => 'Floor setting', + 'text_background_color' => 'Background color', + 'text_sure' => 'OK', + 'text_page_name' => 'Please enter the name of the new page', + 'text_is_save' => 'Please make sure that the current page data has been saved! ', + 'text_pop_ads' => 'Pop-up ads', + 'text_style_setting' => 'Style Settings', + 'text_is_save_data' => 'Before switching pages, please make sure that the current page data has been saved? ', + 'text_hint' => 'Hint', + 'text_cancel' => 'Cancel', + 'text_created_success' => 'Page created successfully', + 'text_html_none' => 'Module loading error, HTML data is empty! ', + 'text_is_delete' => 'Are you sure you want to delete', + 'text_enable' => 'Enable', + 'text_set_title' => 'Set title', + 'text_set_subtitle' => 'Set subtitle', + 'text_suggested_size' => 'Suggested size (width x height):', + 'text_word' => 'Text', + 'text_add_pictures' => 'Add pictures', + 'text_refresh_cookie' => 'Refresh Cookie', + 'text_popup_hint' => 'Note: When the user clicks close, it will no longer be displayed until the browser is closed and reopened. For local testing, click "Refresh Cookie", then refresh the browser, and the pop-up window can be launched again. ', + 'text_cookie_refresh_success' => 'Cookie refresh successfully, refresh the browser to see the content of the pop-up window. ', + 'text_add_hot_links' => 'Add Hot Links', + 'text_add' => 'Add', + 'text_margin_top' => 'Module margin-top', + 'text_margin_bottom' => 'Module margin-bottom', + 'text_file_manager' => 'File Manager', + 'modules_link' => 'Link', + 'modules_choose_link' => 'Choose link', + 'text_select_link' => 'Please select the link page to jump to', + 'text_no' => 'No', + 'text_search' => 'Search', + 'text_is_newpage' => 'new window:', + 'text_manage' => 'Management', + 'text_title_cover' => 'Title (overwrite the link name selected below)', + 'text_enter_link' => 'Please enter the link address', + 'text_states' => 'States', + 'text_disable' => 'Disable', + 'text_no_data' => 'Data does not exist or has been deleted', + 'text_to_add' => 'Go to add', + 'text_category' => 'Category', + 'text_information' => 'Information', + 'text_manufacturer' => 'Brand', + 'text_static' => 'Fixed connection', + 'text_custom' => 'Custom', + 'text_top_text' => 'Top text', + 'text_edit_page_name' => 'Edit page name', + 'text_page_name_no' => 'Name cannot be empty', + 'custom_name' => 'Custom Name', // 固定连接 - 'text_static_product_latest' => 'Latest products', - 'text_static_product_special' => 'Special products', + 'text_static_product_latest' => 'Latest products', + 'text_static_product_special' => 'Special products', 'text_static_product_manufacturer' => 'Brand Zone', - 'text_static_account_account' => 'Member Center', - 'text_static_account_order' => 'History orders', - 'text_static_account_wishlist' => 'Favorite List', - 'text_static_affiliate_login' => 'Affiliate Member', - 'text_static_account_newsletter' => 'Subscribe for consultation', - 'text_static_information_contact' => 'Contact us', - 'text_static_information_sitemap' => 'Site Map', - 'text_static_information_faq' => 'FAQ', - 'text_static_account_voucher' => 'Gift Voucher', - 'text_static_account_login' => 'Login', - 'text_static_account_register' => 'Register', - 'text_static_checkout_cart' => 'Shopping Cart', - 'text_static_blog_home' => 'Blog', + 'text_static_account_account' => 'Member Center', + 'text_static_account_order' => 'History orders', + 'text_static_account_wishlist' => 'Favorite List', + 'text_static_affiliate_login' => 'Affiliate Member', + 'text_static_account_newsletter' => 'Subscribe for consultation', + 'text_static_information_contact' => 'Contact us', + 'text_static_information_sitemap' => 'Site Map', + 'text_static_information_faq' => 'FAQ', + 'text_static_account_voucher' => 'Gift Voucher', + 'text_static_account_login' => 'Login', + 'text_static_account_register' => 'Register', + 'text_static_checkout_cart' => 'Shopping Cart', + 'text_static_blog_home' => 'Blog', - 'text_edit_product' => 'Edit product details', - 'text_edit_home' => 'Edit Home', - 'text_edit_mb_home' => 'Edit mobile home', - 'text_footer_edit' => 'Edit Footer', - 'text_header_edit' => 'Edit Header', - 'text_save_refresh' => 'Save and refresh', - 'text_save_refresh_header' => 'Save (refresh)', - 'text_service_icon' => 'Service Icon', - 'text_describe' => 'Description', - 'text_add_link' => 'Add link', - 'text_is_btn' => 'Whether to display the button', - 'text_phone' => 'Phone', - 'text_address' => 'Address', - 'text_email' => 'Mailbox', - 'text_copyright' => 'Copyright / Image', - 'text_yq_link' => 'Friendly Link', - 'text_link_bar' => 'Link bar', - 'text_introduce' => 'Introduce', - 'text_up_logo' => 'Upload logo', - 'text_hot_keywords' => 'Hot search keywords', - 'text_title' => 'Title', - 'text_text_notific' => 'Text notification', - 'text_only_home' => 'Only home show', - 'text_background_color' => 'Background color', - 'text_font_color' => 'Font Color', - 'text_image' => 'Image', - 'text_show' => 'Show', - 'text_is_phone' => 'Show phone', - 'text_half_angle' => 'Use half-width commas to separate', - 'text_prompt_words' => 'Prompt words', - 'text_search_bar' => 'Search bar', - 'text_btn_text' => 'Button text', - 'text_banner_ad' => 'Banner ad', - 'text_l_c' => 'Language/Currency column', - 'text_top_color' => 'Upper part color', - 'text_title_color' => 'Title color', - 'text_color' => 'Color', - 'text_left_text' => 'Left text', - 'text_right_icon' => 'Pay icon on the right', - 'text_bgi' => 'Background image', - 'text_btn' => 'Button', + 'text_edit_product' => 'Edit product details', + 'text_edit_home' => 'Edit Home', + 'text_edit_mb_home' => 'Edit mobile home', + 'text_footer_edit' => 'Edit Footer', + 'text_header_edit' => 'Edit Header', + 'text_save_refresh' => 'Save and refresh', + 'text_save_refresh_header' => 'Save (refresh)', + 'text_service_icon' => 'Service Icon', + 'text_describe' => 'Description', + 'text_add_link' => 'Add link', + 'text_is_btn' => 'Whether to display the button', + 'text_phone' => 'Phone', + 'text_address' => 'Address', + 'text_email' => 'Mailbox', + 'text_copyright' => 'Copyright / Image', + 'text_yq_link' => 'Friendly Link', + 'text_link_bar' => 'Link bar', + 'text_introduce' => 'Introduce', + 'text_up_logo' => 'Upload logo', + 'text_hot_keywords' => 'Hot search keywords', + 'text_title' => 'Title', + 'text_text_notific' => 'Text notification', + 'text_only_home' => 'Only home show', + 'text_background_color' => 'Background color', + 'text_font_color' => 'Font Color', + 'text_image' => 'Image', + 'text_show' => 'Show', + 'text_is_phone' => 'Show phone', + 'text_half_angle' => 'Use half-width commas to separate', + 'text_prompt_words' => 'Prompt words', + 'text_search_bar' => 'Search bar', + 'text_btn_text' => 'Button text', + 'text_banner_ad' => 'Banner ad', + 'text_l_c' => 'Language/Currency column', + 'text_top_color' => 'Upper part color', + 'text_title_color' => 'Title color', + 'text_color' => 'Color', + 'text_left_text' => 'Left text', + 'text_right_icon' => 'Pay icon on the right', + 'text_bgi' => 'Background image', + 'text_btn' => 'Button', // page - 'page_product_title_size' => 'Product title font size', - 'page_product_title_color' => 'Product title color', - 'page_product_price_color' => 'Product price color', - 'page_product_thumb_position' => 'Thumbnail Position', - 'page_product_image' => 'Product image', - 'page_product_bottom' => 'Bottom', - 'page_product_left' => 'Left', - 'page_product_magnifying_style' => 'Magnifying glass style', - 'page_product_magnifying_window' => 'External window', - 'page_product_magnifying_inner' => 'Internal suspension', - 'page_product_magnifying_lens' => 'Internal magnifying glass', - 'page_product_share' => 'Share', - 'page_product_share_code' => 'Share code', - 'page_product_general_settings' => 'General settings', - 'page_product_font_size' => 'Font Size', + 'page_product_title_size' => 'Product title font size', + 'page_product_title_color' => 'Product title color', + 'page_product_price_color' => 'Product price color', + 'page_product_thumb_position' => 'Thumbnail Position', + 'page_product_image' => 'Product image', + 'page_product_bottom' => 'Bottom', + 'page_product_left' => 'Left', + 'page_product_magnifying_style' => 'Magnifying glass style', + 'page_product_magnifying_window' => 'External window', + 'page_product_magnifying_inner' => 'Internal suspension', + 'page_product_magnifying_lens' => 'Internal magnifying glass', + 'page_product_share' => 'Share', + 'page_product_share_code' => 'Share code', + 'page_product_general_settings' => 'General settings', + 'page_product_font_size' => 'Font Size', // ModuleS List - 'modules_photo_text' => 'Photo-text', - 'modules_video_module' => 'Video Module', - 'modules_customer_reviews' => 'Customer reviews', - 'modules_images_link' => 'Multi-images link', - 'modules_background_icon_text' => 'Background Icon', - 'modules_slideshow_category' => 'Slideshow Category', - 'modules_bargain' => 'Bargain', - 'modules_bestseller' => 'Bestseller', - 'modules_blog' => 'Blog', - 'modules_carousel' => 'Carousel Icon', - 'modules_category' => 'Category', - 'modules_coupon' => 'Coupon', - 'modules_flash_sale' => 'Flash Sale', - 'modules_group_buying' => 'Group Buying', - 'modules_html' => 'Html', - 'modules_icon_text' => 'Icon Text', - 'modules_image_100' => 'Single image', - 'modules_image_200' => 'Two image', - 'modules_image_300' => 'Three image', - 'modules_image_301' => 'Three image Pro', - 'modules_image_400' => 'Four image', - 'modules_image_401' => 'Four image Pro', - 'modules_latest' => 'New Products', - 'modules_manufacturer' => 'Manufacturer', - 'modules_product' => 'Product', - 'modules_product_tab' => 'Product Tab', - 'modules_slideshow' => 'Slideshow', - 'modules_quantity' => 'Display quantity limit', - 'modules_manage_bargain' => 'Manage bargain goods', - 'modules_manage_blog' => 'Manage Blog', - 'modules_no_blog' => 'There is no article, please go to [Content Management -> Blog Management to configure articles. ', - 'modules_slides_per_view' => 'One screen display quantity', - 'modules_enter_content' => 'Please enter content', - 'modules_full_screen' => 'Whether to full screen', - 'modules_content' => 'Content', - 'modules_edit_content' => 'Edit content', - 'modules_select_image' => 'Select image', - 'modules_quantity_line' => 'Display several in one line', - 'modules_please_choose' => 'Please choose', - 'modules_choose' => 'Choose', - 'modules_add_category' => 'Add category', - 'modules_choose_category' => 'Choose a category', - 'modules_set_coupon' => 'Coupon Configuration', - 'modules_no_coupon' => 'No coupon data', - 'modules_manage_flash' => 'Manage flash products', - 'modules_manage_group' => 'Manage group goods', - 'modules_no_state' => 'The current module is not enabled or not configured, please go to the background [Module Management to configure this module first. ', - 'modules_grid_mode' => 'Grid Mode', - 'modules_more_link' => 'More links', - 'modules_choose_brand' => 'Choose Brand', - 'modules_set_product' => 'Configuration product', - 'modules_keywords_search' => 'Please enter keywords to search', - 'modules_test_name' => 'Test name', - 'modules_please_products' => 'Please add products', - 'modules_image_size' => 'Image size', - 'modules_height' => 'High', - 'modules_width' => 'Width', - 'modules_category_style' => 'Category Style', - 'modules_down' => 'Down', - 'modules_left' => 'Left', - 'modules_category_no' => 'Do not classify', - 'modules_review_name' => 'Name', - 'modules_profession' => 'Profession', - 'modules_video_cover' => 'Video Cover', - 'modules_video' => 'Video', - 'mobile_search' => 'Search bar', - 'mobile_search_normal' => 'Not fixed at the top of the screen', - 'mobile_search_hide' => 'Do not display the top search bar', - 'mobile_search_fixed' => 'Fixed at the top of the screen (default)', + 'modules_photo_text' => 'Photo-text', + 'modules_video_module' => 'Video Module', + 'modules_customer_reviews' => 'Customer reviews', + 'modules_images_link' => 'Multi-images link', + 'modules_background_icon_text' => 'Background Icon', + 'modules_slideshow_category' => 'Slideshow Category', + 'modules_bargain' => 'Bargain', + 'modules_bestseller' => 'Bestseller', + 'modules_blog' => 'Blog', + 'modules_carousel' => 'Carousel Icon', + 'modules_category' => 'Category', + 'modules_coupon' => 'Coupon', + 'modules_flash_sale' => 'Flash Sale', + 'modules_group_buying' => 'Group Buying', + 'modules_html' => 'Html', + 'modules_icon_text' => 'Icon Text', + 'modules_image_100' => 'Single image', + 'modules_image_200' => 'Two image', + 'modules_image_300' => 'Three image', + 'modules_image_301' => 'Three image Pro', + 'modules_image_400' => 'Four image', + 'modules_image_401' => 'Four image Pro', + 'modules_latest' => 'New Products', + 'modules_manufacturer' => 'Manufacturer', + 'modules_product' => 'Product', + 'modules_product_tab' => 'Product Tab', + 'modules_slideshow' => 'Slideshow', + 'modules_quantity' => 'Display quantity limit', + 'modules_manage_bargain' => 'Manage bargain goods', + 'modules_manage_blog' => 'Manage Blog', + 'modules_no_blog' => 'There is no article, please go to [Content Management -> Blog Management to configure articles. ', + 'modules_slides_per_view' => 'One screen display quantity', + 'modules_enter_content' => 'Please enter content', + 'modules_full_screen' => 'Whether to full screen', + 'modules_content' => 'Content', + 'modules_edit_content' => 'Edit content', + 'modules_select_image' => 'Select image', + 'modules_quantity_line' => 'Display several in one line', + 'modules_please_choose' => 'Please choose', + 'modules_choose' => 'Choose', + 'modules_add_category' => 'Add category', + 'modules_choose_category' => 'Choose a category', + 'modules_set_coupon' => 'Coupon Configuration', + 'modules_no_coupon' => 'No coupon data', + 'modules_manage_flash' => 'Manage flash products', + 'modules_manage_group' => 'Manage group goods', + 'modules_no_state' => 'The current module is not enabled or not configured, please go to the background [Module Management to configure this module first. ', + 'modules_grid_mode' => 'Grid Mode', + 'modules_more_link' => 'More links', + 'modules_choose_brand' => 'Choose Brand', + 'modules_set_product' => 'Configuration product', + 'modules_keywords_search' => 'Please enter keywords to search', + 'modules_test_name' => 'Test name', + 'modules_please_products' => 'Please add products', + 'modules_image_size' => 'Image size', + 'modules_height' => 'High', + 'modules_width' => 'Width', + 'modules_category_style' => 'Category Style', + 'modules_down' => 'Down', + 'modules_left' => 'Left', + 'modules_category_no' => 'Do not classify', + 'modules_review_name' => 'Name', + 'modules_profession' => 'Profession', + 'modules_video_cover' => 'Video Cover', + 'modules_video' => 'Video', + 'mobile_search' => 'Search bar', + 'mobile_search_normal' => 'Not fixed at the top of the screen', + 'mobile_search_hide' => 'Do not display the top search bar', + 'mobile_search_fixed' => 'Fixed at the top of the screen (default)', // Menu - 'main_menu' => 'Main Menu', - 'please_add_data' => 'Please add data', - 'add_main_menu' => 'Add main menu', - 'main_menu_name_link' => 'Main menu name/link', - 'main_menu_label' => 'Main menu label', - 'label_background_color' => 'Label background color', - 'label_text_color' => 'Label text color', - 'submenu_group' => 'Submenu (group)', - 'add_menu_group' => 'Add menu group', - 'full_screen' => 'Whether full screen', - 'menu' => 'Menu', - 'add_submenu_link' => 'Add submenu link', - 'type' => 'Type', + 'main_menu' => 'Main Menu', + 'please_add_data' => 'Please add data', + 'add_main_menu' => 'Add main menu', + 'main_menu_name_link' => 'Main menu name/link', + 'main_menu_label' => 'Main menu label', + 'label_background_color' => 'Label background color', + 'label_text_color' => 'Label text color', + 'submenu_group' => 'Submenu (group)', + 'add_menu_group' => 'Add menu group', + 'full_screen' => 'Whether full screen', + 'menu' => 'Menu', + 'add_submenu_link' => 'Add submenu link', + 'type' => 'Type', - // footer - 'footer_edit' => 'Footer editor', - 'sub_title' => 'Sub Title', - 'introduction' => 'Introduction', - 'copyright_settings' => 'Copyright settings', + // footer + 'footer_edit' => 'Footer editor', + 'sub_title' => 'Sub Title', + 'introduction' => 'Introduction', + 'copyright_settings' => 'Copyright settings', ]; diff --git a/resources/lang/en/admin/category.php b/resources/lang/en/admin/category.php index e8d94d0e..599b44af 100644 --- a/resources/lang/en/admin/category.php +++ b/resources/lang/en/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Category', - 'edit_category' => 'Edit Category', - 'upper_category' => 'Upper Category', + 'index' => 'Category', + 'edit_category' => 'Edit Category', + 'upper_category' => 'Upper Category', - 'categories_index' => 'Index', + 'categories_index' => 'Index', 'categories_create' => 'Create', - 'categories_show' => 'Detail', + 'categories_show' => 'Detail', 'categories_update' => 'Edit', - 'categories_delete' => 'Delete' + 'categories_delete' => 'Delete', ]; diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php index fd5d0ea6..b91731bf 100644 --- a/resources/lang/en/admin/common.php +++ b/resources/lang/en/admin/common.php @@ -10,69 +10,69 @@ */ return [ - 'admin_panel' => 'Admin Panel', - 'edit' => 'Edit', - 'status' => 'Status', - 'action' => 'Action', - 'install' => 'Install', - 'uninstall' => 'Uninstall', + 'admin_panel' => 'Admin Panel', + 'edit' => 'Edit', + 'status' => 'Status', + 'action' => 'Action', + 'install' => 'Install', + 'uninstall' => 'Uninstall', // errors - 'forbidden' => 'Forbidden', - 'has_no_permission' => 'You have no permission, please contact with administrator.', + 'forbidden' => 'Forbidden', + 'has_no_permission' => 'You have no permission, please contact with administrator.', // header - 'home' => 'Home', - 'order' => 'Orders', - 'rma' => 'RMA', - 'rma_reason' => 'RMA Reason', - 'product' => 'Products', - 'brand' => 'Brands', - 'category' => 'Categories', - 'customer_group' => 'Customer Groups', - 'customer' => 'Customers', - 'content' => 'Contents', - 'setting' => 'Settings', - 'plugin' => 'Plugin', - 'marketing' => 'Plugin Marketing', - 'admin_user' => 'Admin User', - 'admin_role' => 'Admin Role', - 'region' => 'Region', - 'tax_rate' => 'Tax Rate', - 'tax_class' => 'Tax Class', - 'currency' => 'Currency', - 'language' => 'Language', - 'zone' => 'Zone', - 'country' => 'Country', - 'file_manager' => 'File Manager', - 'access_frontend' => 'Frontend', + 'home' => 'Home', + 'order' => 'Orders', + 'rma' => 'RMA', + 'rma_reason' => 'RMA Reason', + 'product' => 'Products', + 'brand' => 'Brands', + 'category' => 'Categories', + 'customer_group' => 'Customer Groups', + 'customer' => 'Customers', + 'content' => 'Contents', + 'setting' => 'Settings', + 'plugin' => 'Plugin', + 'marketing' => 'Plugin Marketing', + 'admin_user' => 'Admin User', + 'admin_role' => 'Admin Role', + 'region' => 'Region', + 'tax_rate' => 'Tax Rate', + 'tax_class' => 'Tax Class', + 'currency' => 'Currency', + 'language' => 'Language', + 'zone' => 'Zone', + 'country' => 'Country', + 'file_manager' => 'File Manager', + 'access_frontend' => 'Frontend', // sidebar 'attribute_groups_index' => 'Attribute Group', - 'attributes_index' => 'Attributes', - 'settings_index' => 'Setting', - 'admin_users_index' => 'Admin Users', - 'plugins_index' => 'Plugins', - 'marketing_index' => 'Plugin Marketing', - 'regions_index' => 'Regions', - 'tax_rates_index' => 'Tax Rates', - 'pages_index' => 'Information', - 'tax_classes_index' => 'Tax Classes', - 'currencies_index' => 'Currencies', - 'languages_index' => 'Languages', - 'design_index' => 'Page Builder', - 'design_footer_index' => 'Footer Builder', - 'design_menu_index' => 'Menu Builder', - 'categories_index' => 'Categories', - 'products_index' => 'Products', - 'products_trashed' => 'Trashed', - 'customers_trashed' => 'Trashed', - 'brands_index' => 'Brands', - 'orders_index' => 'Orders', - 'rmas_index' => 'RMA', - 'rma_reasons_index' => 'Rma Reasons', - 'customers_index' => 'Customers', - 'customer_groups_index' => 'Customer Groups', - 'countries_index' => 'Countries', - 'zones_index' => 'Zones', + 'attributes_index' => 'Attributes', + 'settings_index' => 'Setting', + 'admin_users_index' => 'Admin Users', + 'plugins_index' => 'Plugins', + 'marketing_index' => 'Plugin Marketing', + 'regions_index' => 'Regions', + 'tax_rates_index' => 'Tax Rates', + 'pages_index' => 'Information', + 'tax_classes_index' => 'Tax Classes', + 'currencies_index' => 'Currencies', + 'languages_index' => 'Languages', + 'design_index' => 'Page Builder', + 'design_footer_index' => 'Footer Builder', + 'design_menu_index' => 'Menu Builder', + 'categories_index' => 'Categories', + 'products_index' => 'Products', + 'products_trashed' => 'Trashed', + 'customers_trashed' => 'Trashed', + 'brands_index' => 'Brands', + 'orders_index' => 'Orders', + 'rmas_index' => 'RMA', + 'rma_reasons_index' => 'Rma Reasons', + 'customers_index' => 'Customers', + 'customer_groups_index' => 'Customer Groups', + 'countries_index' => 'Countries', + 'zones_index' => 'Zones', ]; diff --git a/resources/lang/en/admin/country.php b/resources/lang/en/admin/country.php index edd2e2f2..4d5bf2c2 100644 --- a/resources/lang/en/admin/country.php +++ b/resources/lang/en/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => 'Country Name', + 'country_name' => 'Country Name', - 'countries_index' => 'Country List', + 'countries_index' => 'Country List', 'countries_create' => 'Create Country', 'countries_update' => 'Update Country', 'countries_delete' => 'Delete Country', diff --git a/resources/lang/en/admin/currency.php b/resources/lang/en/admin/currency.php index 420ccf4d..fbe546be 100644 --- a/resources/lang/en/admin/currency.php +++ b/resources/lang/en/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => 'Index', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'Index', 'currencies_create' => 'Create', - 'currencies_show' => 'Detail', + 'currencies_show' => 'Detail', 'currencies_update' => 'Edit', - 'currencies_delete' => 'Delete' + 'currencies_delete' => 'Delete', ]; diff --git a/resources/lang/en/admin/customer.php b/resources/lang/en/admin/customer.php index d1227205..92476845 100644 --- a/resources/lang/en/admin/customer.php +++ b/resources/lang/en/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => 'Index', - 'customers_create' => 'Create', - 'customers_show' => 'Detail', - 'customers_update' => 'Edit', - 'customers_delete' => 'Delete', + 'customers_index' => 'Index', + 'customers_create' => 'Create', + 'customers_show' => 'Detail', + 'customers_update' => 'Edit', + 'customers_delete' => 'Delete', - 'user_info' => 'User Info', - 'address_management' => 'Address', - 'user_name' => 'User Name', - 'password_info' => 'Leave blank to keep the original password unchanged', - 'add_address' => 'Add address', - 'no_address' => 'The current account has no address', - 'edit_address' => 'Edit address', - 'address' => 'Address', - 'choose_country' => 'Choose Country', - 'zones' => 'Zones', - 'choose_zones' => 'Choose Zones', - 'enter_city' => 'Enter city', - 'city' => 'City', - 'zipcode' => 'Zipcode', - 'address_1' => 'address 1', - 'address_2' => 'address 2', + 'user_info' => 'User Info', + 'address_management' => 'Address', + 'user_name' => 'User Name', + 'password_info' => 'Leave blank to keep the original password unchanged', + 'add_address' => 'Add address', + 'no_address' => 'The current account has no address', + 'edit_address' => 'Edit address', + 'address' => 'Address', + 'choose_country' => 'Choose Country', + 'zones' => 'Zones', + 'choose_zones' => 'Choose Zones', + 'enter_city' => 'Enter city', + 'city' => 'City', + 'zipcode' => 'Zipcode', + 'address_1' => 'address 1', + 'address_2' => 'address 2', - 'cannot_delete_root' => 'Cannot delete root admin user', - 'error_email' => 'Please enter the correct email format', + 'cannot_delete_root' => 'Cannot delete root admin user', + 'error_email' => 'Please enter the correct email format', 'confirm_delete_address' => 'Are you sure you want to delete the address?', ]; diff --git a/resources/lang/en/admin/customer_group.php b/resources/lang/en/admin/customer_group.php index b5b5e422..0ebedb04 100644 --- a/resources/lang/en/admin/customer_group.php +++ b/resources/lang/en/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Customer Groups', - 'consumption_limit' => 'consumption limit', - 'discount_rate' => 'discount rate', - 'reward_points_factor' => 'reward points', - 'integral_factor' => 'integral coefficient', + 'index' => 'Customer Groups', + 'consumption_limit' => 'consumption limit', + 'discount_rate' => 'discount rate', + 'reward_points_factor' => 'reward points', + 'integral_factor' => 'integral coefficient', - 'customer_groups_index' => 'Index', + 'customer_groups_index' => 'Index', 'customer_groups_create' => 'Create', - 'customer_groups_show' => 'Detail', + 'customer_groups_show' => 'Detail', 'customer_groups_update' => 'Edit', 'customer_groups_delete' => 'Delete', - 'default_cannot_delete' => 'Default customer group cannot be deleted', + 'default_cannot_delete' => 'Default customer group cannot be deleted', ]; diff --git a/resources/lang/en/admin/dashboard.php b/resources/lang/en/admin/dashboard.php index 8b8c35bc..2a83044e 100644 --- a/resources/lang/en/admin/dashboard.php +++ b/resources/lang/en/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => 'Customer View', - 'order_total' => 'Order Total', - 'customer_new' => 'Customer New', - 'order_amount' => 'Order Amount', - 'yesterday' => 'Yesterday', - 'day_before' => 'Last day', + 'order_total' => 'Order Total', + 'customer_new' => 'Customer New', + 'order_amount' => 'Order Amount', + 'yesterday' => 'Yesterday', + 'day_before' => 'Last day', - 'order_report' => 'Order Report', - 'latest_month' => 'Latest Month', - 'latest_week' => 'Latest Week', - 'latest_year' => 'Latest Year', + 'order_report' => 'Order Report', + 'latest_month' => 'Latest Month', + 'latest_week' => 'Latest Week', + 'latest_year' => 'Latest Year', ]; diff --git a/resources/lang/en/admin/design_builder.php b/resources/lang/en/admin/design_builder.php index c2ba11e8..3c18b65d 100644 --- a/resources/lang/en/admin/design_builder.php +++ b/resources/lang/en/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'Brand Module', - 'module_banner' => 'Banner Module', + 'module_brand' => 'Brand Module', + 'module_banner' => 'Banner Module', 'module_four_image_pro' => 'For Image PRO Module', - 'module_slideshow' => 'Slideshow Module', - 'module_tab_products' => 'Tab Products Module', + 'module_slideshow' => 'Slideshow Module', + 'module_tab_products' => 'Tab Products Module', ]; diff --git a/resources/lang/en/admin/file_manager.php b/resources/lang/en/admin/file_manager.php index 3bb815fd..294955f6 100644 --- a/resources/lang/en/admin/file_manager.php +++ b/resources/lang/en/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'Create', - 'file_manager_show' => 'View', - 'file_manager_update' => 'Rename', - 'file_manager_delete' => 'Delete', + 'file_manager_create' => 'Create', + 'file_manager_show' => 'View', + 'file_manager_update' => 'Rename', + 'file_manager_delete' => 'Delete', 'directory_already_exist' => 'The directory not exist!', - 'directory_not_empty' => 'The directory not empty!', - 'target_not_exist' => 'The target file/directory not exist!', - 'create_folder' => 'Create folder', - 'rename' => 'Rename', - 'download' => 'Download', - 'upload_files' => 'Upload Files', - 'click_upload' => 'Click upload, or drag image here', - 'image_uploading' => 'Image Uploading', - 'no_file' => 'No File', - 'picture_space' => 'Picture Space', - 'show_pc' => 'Please go to the PC side to operate', + 'directory_not_empty' => 'The directory not empty!', + 'target_not_exist' => 'The target file/directory not exist!', + 'create_folder' => 'Create folder', + 'rename' => 'Rename', + 'download' => 'Download', + 'upload_files' => 'Upload Files', + 'click_upload' => 'Click upload, or drag image here', + 'image_uploading' => 'Image Uploading', + 'no_file' => 'No File', + 'picture_space' => 'Picture Space', + 'show_pc' => 'Please go to the PC side to operate', - 'confirm_delete_file' => 'Do you want to delete the selected file', - 'confirm_delete_folder' => 'The folder deletion operation is in progress, all files in the folder will be deleted, do you want to confirm?', - 'new_folder' => 'New folder', - 'can_empty' => 'Can not be empty', - 'finish' => 'Finish', - 'uploading' => 'loading...', - 'file_manager' => 'File Manager', + 'confirm_delete_file' => 'Do you want to delete the selected file', + 'confirm_delete_folder' => 'The folder deletion operation is in progress, all files in the folder will be deleted, do you want to confirm?', + 'new_folder' => 'New folder', + 'can_empty' => 'Can not be empty', + 'finish' => 'Finish', + 'uploading' => 'loading...', + 'file_manager' => 'File Manager', ]; diff --git a/resources/lang/en/admin/language.php b/resources/lang/en/admin/language.php index e2316c6c..7a47602f 100644 --- a/resources/lang/en/admin/language.php +++ b/resources/lang/en/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => 'Index', - 'languages_create' => 'Create', - 'languages_show' => 'Detail', - 'languages_update' => 'Update', - 'languages_delete' => 'Delete', + 'languages_index' => 'Index', + 'languages_create' => 'Create', + 'languages_show' => 'Detail', + 'languages_update' => 'Update', + 'languages_delete' => 'Delete', 'error_default_language_cannot_delete' => 'The default language cannot be deleted! ', - 'help_install' => 'Note: To install a new language, you need to configure the products, categories, navigation, homepage modules, page footers, etc. of the corresponding language, otherwise there will be abnormal page display', + 'help_install' => 'Note: To install a new language, you need to configure the products, categories, navigation, homepage modules, page footers, etc. of the corresponding language, otherwise there will be abnormal page display', ]; diff --git a/resources/lang/en/admin/login.php b/resources/lang/en/admin/login.php index 62ce3267..1b798ea6 100644 --- a/resources/lang/en/admin/login.php +++ b/resources/lang/en/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => 'Login to Admin Panel', - 'log_in' => 'Log In', + 'log_in' => 'Log In', ]; diff --git a/resources/lang/en/admin/marketing.php b/resources/lang/en/admin/marketing.php index 659918de..98fb63fa 100644 --- a/resources/lang/en/admin/marketing.php +++ b/resources/lang/en/admin/marketing.php @@ -10,25 +10,25 @@ */ return [ - 'marketing_list' => 'Plugin Marketing', - 'marketing_show' => 'Plugin Detail', - 'set_token' => 'Set Token', - 'get_token_text' => 'Log in to BeikeShop official website personal center - bind domain name, add current domain name', - 'get_token' => 'Get Token', - 'download_count' => 'download count', - 'last_update' => 'last update', - 'text_version' => 'version', - 'text_compatibility' => 'compatibility', - 'text_author' => 'plug-in author', - 'download_plugin' => 'download plugin', + 'marketing_list' => 'Plugin Marketing', + 'marketing_show' => 'Plugin Detail', + 'set_token' => 'Set Token', + 'get_token_text' => 'Log in to BeikeShop official website personal center - bind domain name, add current domain name', + 'get_token' => 'Get Token', + 'download_count' => 'download count', + 'last_update' => 'last update', + 'text_version' => 'version', + 'text_compatibility' => 'compatibility', + 'text_author' => 'plug-in author', + 'download_plugin' => 'download plugin', 'download_description' => 'Plugin description', - 'text_free' => 'free', - 'btn_buy' => 'Buy', - 'text_pay' => 'Payment Amount', - 'select_pay' => 'select payment method', - 'wxpay' => 'WeChat scan code payment!', - 'pay_success_title' => 'Payment successful!', - 'pay_success_text' => 'The plug-in purchase is successful, click OK to refresh the page', - 'ali_pay_success' => 'Payment completed? ', - 'ali_pay_text' => 'Payment has been completed, please refresh the page', + 'text_free' => 'free', + 'btn_buy' => 'Buy', + 'text_pay' => 'Payment Amount', + 'select_pay' => 'select payment method', + 'wxpay' => 'WeChat scan code payment!', + 'pay_success_title' => 'Payment successful!', + 'pay_success_text' => 'The plug-in purchase is successful, click OK to refresh the page', + 'ali_pay_success' => 'Payment completed? ', + 'ali_pay_text' => 'Payment has been completed, please refresh the page', ]; diff --git a/resources/lang/en/admin/order.php b/resources/lang/en/admin/order.php index 900a87f7..ef48c44d 100644 --- a/resources/lang/en/admin/order.php +++ b/resources/lang/en/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => 'Order List', + 'list' => 'Order List', - 'order_quantity' => 'Order Quantity', - 'order_amount' => 'Order Amount', - 'orders_index' => 'Index', - 'orders_create' => 'Create', - 'orders_show' => 'Detail', - 'orders_export' => 'Export', - 'orders_update' => 'Update', - 'orders_delete' => 'Delete', - 'notify' => 'Whether to remind', + 'order_quantity' => 'Order Quantity', + 'order_amount' => 'Order Amount', + 'orders_index' => 'Index', + 'orders_create' => 'Create', + 'orders_show' => 'Detail', + 'orders_export' => 'Export', + 'orders_update' => 'Update', + 'orders_delete' => 'Delete', + 'notify' => 'Whether to remind', 'orders_update_status' => 'Update Status', - 'error_status' => 'Please select a status', + 'error_status' => 'Please select a status', ]; diff --git a/resources/lang/en/admin/page.php b/resources/lang/en/admin/page.php index 7a0cd0b3..9c49a7b5 100644 --- a/resources/lang/en/admin/page.php +++ b/resources/lang/en/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Information', - 'info_title' => 'Information Title', + 'index' => 'Information', + 'info_title' => 'Information Title', 'info_content' => 'Content', - 'pages_index' => 'Index', + 'pages_index' => 'Index', 'pages_create' => 'Create', - 'pages_show' => 'Detail', + 'pages_show' => 'Detail', 'pages_update' => 'Edit', - 'pages_delete' => 'Delete' + 'pages_delete' => 'Delete', ]; diff --git a/resources/lang/en/admin/plugin.php b/resources/lang/en/admin/plugin.php index 1c3d7fb2..7f73103b 100644 --- a/resources/lang/en/admin/plugin.php +++ b/resources/lang/en/admin/plugin.php @@ -10,24 +10,24 @@ */ return [ - 'plugins_index' => 'Index', - 'plugins_import' => 'Import', - 'plugins_show' => 'Detail', - 'plugins_update' => 'Update', + 'plugins_index' => 'Index', + 'plugins_import' => 'Import', + 'plugins_show' => 'Detail', + 'plugins_update' => 'Update', 'plugins_update_status' => 'Update Status', - 'plugins_install' => 'Install', - 'plugins_uninstall' => 'Uninstall', + 'plugins_install' => 'Install', + 'plugins_uninstall' => 'Uninstall', - 'plugin_list' => 'Plugin List', - 'plugin_code' => 'Code', - 'plugin_type' => 'Type', - 'plugin_description' => 'Description', - 'plugin_upload' => 'Upload(Only for zip file)', + 'plugin_list' => 'Plugin List', + 'plugin_code' => 'Code', + 'plugin_type' => 'Type', + 'plugin_description' => 'Description', + 'plugin_upload' => 'Upload(Only for zip file)', - 'shipping' => 'Shipping', - 'payment' => 'Payment', - 'social' => 'Social', - 'total' => 'Total', - 'view' => 'View', - 'social' => 'Social', + 'shipping' => 'Shipping', + 'payment' => 'Payment', + 'social' => 'Social', + 'total' => 'Total', + 'view' => 'View', + 'social' => 'Social', ]; diff --git a/resources/lang/en/admin/product.php b/resources/lang/en/admin/product.php index 147e827e..a022e776 100644 --- a/resources/lang/en/admin/product.php +++ b/resources/lang/en/admin/product.php @@ -10,38 +10,38 @@ */ return [ - 'products_index' => 'Index', - 'products_create' => 'Create', - 'products_show' => 'Detail', - 'products_update' => 'Edit', - 'products_delete' => 'Delete', - 'products_trashed' => 'Trashed', - 'products_restore' => 'restore', - 'clear_restore' => 'Empty Recycle Bin', + 'products_index' => 'Index', + 'products_create' => 'Create', + 'products_show' => 'Detail', + 'products_update' => 'Edit', + 'products_delete' => 'Delete', + 'products_trashed' => 'Trashed', + 'products_restore' => 'restore', + 'clear_restore' => 'Empty Recycle Bin', - 'batch_delete' => 'Batch Delete', - 'batch_active' => 'Batch Active', - 'batch_inactive' => 'Batch Inactive', + 'batch_delete' => 'Batch Delete', + 'batch_active' => 'Batch Active', + 'batch_inactive' => 'Batch Inactive', - 'basic_information' => 'basic information', - 'product_details' => 'Product details', - 'product_relations' => 'Related goods', - 'stocks' => 'goods inventory', - 'model' => 'model', - 'price' => 'price', - 'origin_price' => 'original price', - 'cost_price' => 'cost price', - 'quantity' => 'quantity', - 'enable_multi_spec' => 'Enable multi-spec', - 'image_help' => 'The first picture will be used as the main picture of the product, and multiple pictures can be uploaded at the same time, and the position of multiple pictures can be adjusted at will', - 'add_variable' => 'Add Specs', - 'add_variable_value' => 'Add Specification Value', - 'add_variable_image' => 'Add Spec Image', - 'default_main_product' => 'Default main product', - 'modify_order' => 'Double-click to modify, drag to adjust the order', + 'basic_information' => 'basic information', + 'product_details' => 'Product details', + 'product_relations' => 'Related goods', + 'stocks' => 'goods inventory', + 'model' => 'model', + 'price' => 'price', + 'origin_price' => 'original price', + 'cost_price' => 'cost price', + 'quantity' => 'quantity', + 'enable_multi_spec' => 'Enable multi-spec', + 'image_help' => 'The first picture will be used as the main picture of the product, and multiple pictures can be uploaded at the same time, and the position of multiple pictures can be adjusted at will', + 'add_variable' => 'Add Specs', + 'add_variable_value' => 'Add Specification Value', + 'add_variable_image' => 'Add Spec Image', + 'default_main_product' => 'Default main product', + 'modify_order' => 'Double-click to modify, drag to adjust the order', - 'confirm_batch_product' => 'Are you sure you want to delete the selected products in batches? ', - 'confirm_batch_status' => 'Confirm to modify the status of the selected products in batches? ', - 'confirm_batch_restore' => 'Confirm to restore the selected product? ', + 'confirm_batch_product' => 'Are you sure you want to delete the selected products in batches? ', + 'confirm_batch_status' => 'Confirm to modify the status of the selected products in batches? ', + 'confirm_batch_restore' => 'Confirm to restore the selected product? ', 'confirm_delete_restore' => 'Are you sure you want to empty the recycle bin? ', ]; diff --git a/resources/lang/en/admin/region.php b/resources/lang/en/admin/region.php index 0177f8e5..e509ef5a 100644 --- a/resources/lang/en/admin/region.php +++ b/resources/lang/en/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'Area Group', - 'regions_index' => 'Index', + 'index' => 'Area Group', + 'regions_index' => 'Index', 'regions_create' => 'Create', - 'regions_show' => 'Detail', + 'regions_show' => 'Detail', 'regions_update' => 'Edit', 'regions_delete' => 'Delete', - 'name' => 'Name', - 'describe' => 'Describe', - 'country' => 'Country', - 'zone' => 'Zone', + 'name' => 'Name', + 'describe' => 'Describe', + 'country' => 'Country', + 'zone' => 'Zone', ]; diff --git a/resources/lang/en/admin/rma.php b/resources/lang/en/admin/rma.php index 6ee0c0a6..c2119c68 100644 --- a/resources/lang/en/admin/rma.php +++ b/resources/lang/en/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'Rmas', + 'index' => 'Rmas', - 'rmas_index' => 'Index', - 'rmas_show' => 'Show', - 'rmas_update' => 'Update', - 'rmas_delete' => 'Delete', + 'rmas_index' => 'Index', + 'rmas_show' => 'Show', + 'rmas_update' => 'Update', + 'rmas_delete' => 'Delete', - 'customers_name' => 'Customers Name', - 'quantity' => 'Quantity', - 'service_type' => 'Service Type', - 'rma_details' => 'Rma Details', - 'reasons_return' => 'Reasons Return', - 'current_state' => 'Current State', - 'modify_status' => 'Modify Status', - 'remarks' => 'Remarks', - 'update_status' => 'Update Status', + 'customers_name' => 'Customers Name', + 'quantity' => 'Quantity', + 'service_type' => 'Service Type', + 'rma_details' => 'Rma Details', + 'reasons_return' => 'Reasons Return', + 'current_state' => 'Current State', + 'modify_status' => 'Modify Status', + 'remarks' => 'Remarks', + 'update_status' => 'Update Status', 'operation_history' => 'Operation History', ]; diff --git a/resources/lang/en/admin/rma_reason.php b/resources/lang/en/admin/rma_reason.php index 5f60d664..cb9c6c26 100644 --- a/resources/lang/en/admin/rma_reason.php +++ b/resources/lang/en/admin/rma_reason.php @@ -10,11 +10,11 @@ */ return [ - 'rule' => 'Rule', - 'based_on' => 'Based On', - 'priority' => 'Priority', - 'rma_reasons_index' => 'Index', + 'rule' => 'Rule', + 'based_on' => 'Based On', + 'priority' => 'Priority', + 'rma_reasons_index' => 'Index', 'rma_reasons_create' => 'Create', 'rma_reasons_update' => 'Update', - 'rma_reasons_delete' => 'Delete' + 'rma_reasons_delete' => 'Delete', ]; diff --git a/resources/lang/en/admin/role.php b/resources/lang/en/admin/role.php index 8144f475..54c71ac9 100644 --- a/resources/lang/en/admin/role.php +++ b/resources/lang/en/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => 'Index', - 'admin_roles_create' => 'Create', - 'admin_roles_show' => 'Detail', - 'admin_roles_update' => 'Edit', - 'admin_roles_delete' => 'Delete', - 'select_one_at_least' => 'Please select one permission at least!' + 'admin_roles_index' => 'Index', + 'admin_roles_create' => 'Create', + 'admin_roles_show' => 'Detail', + 'admin_roles_update' => 'Edit', + 'admin_roles_delete' => 'Delete', + 'select_one_at_least' => 'Please select one permission at least!', ]; diff --git a/resources/lang/en/admin/setting.php b/resources/lang/en/admin/setting.php index 1c733e7f..289a913d 100644 --- a/resources/lang/en/admin/setting.php +++ b/resources/lang/en/admin/setting.php @@ -10,62 +10,62 @@ */ return [ - 'index' => 'System Settings', - 'settings_index' => 'View Setting', - 'settings_update' => 'Update Setting', - 'design_index' => 'Design Builder', - 'design_footer_index' => 'Design Footer', - 'design_menu_index' => 'Design Menu', - 'product_per_page' => 'The Number of Per Page', + 'index' => 'System Settings', + 'settings_index' => 'View Setting', + 'settings_update' => 'Update Setting', + 'design_index' => 'Design Builder', + 'design_footer_index' => 'Design Footer', + 'design_menu_index' => 'Design Menu', + 'product_per_page' => 'The Number of Per Page', - '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', + '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', - 'payment_address' => 'Billing Address', + 'guest_checkout' => 'visitor checkout', + 'theme_default' => 'Default Theme', + 'theme_black' => 'Black Theme', + 'shipping_address' => 'Shipping Address', + 'payment_address' => 'Billing Address', - 'meta_title' => 'Meta Title', - 'meta_description' => 'Meta Description', - 'meta_keywords' => 'Meta Keyword', - 'telephone' => 'Contact Phone', - 'email' => 'Mailbox', - 'default_address' => 'Default Address', - 'default_country_set' => 'Default Country Setting', - 'default_zone_set' => 'Default Province Setting', - 'default_language' => 'Default Language', - 'default_currency' => 'Default Currency', + 'meta_title' => 'Meta Title', + 'meta_description' => 'Meta Description', + 'meta_keywords' => 'Meta Keyword', + 'telephone' => 'Contact Phone', + 'email' => 'Mailbox', + 'default_address' => 'Default Address', + 'default_country_set' => 'Default Country Setting', + 'default_zone_set' => 'Default Province Setting', + 'default_language' => 'Default Language', + 'default_currency' => 'Default Currency', 'default_customer_group' => 'Default Customer Group', - 'admin_name' => 'Background Directory', - 'admin_name_info' => 'Management background directory, the default is admin', - 'enable_tax' => 'Enable Tax', - 'enable_tax_info' => 'Whether to enable tax calculation', - 'tax_address' => 'Tax Address', - 'tax_address_info' => 'According to what address to calculate tax', - 'logo' => 'Website Logo', - 'favicon' => 'Favicon', - 'favicon_info' => 'The small icon displayed on the browser tab must be in PNG format and the size is: 32*32', - 'placeholder_image' => 'Placeholder Image', + 'admin_name' => 'Background Directory', + 'admin_name_info' => 'Management background directory, the default is admin', + 'enable_tax' => 'Enable Tax', + 'enable_tax_info' => 'Whether to enable tax calculation', + 'tax_address' => 'Tax Address', + 'tax_address_info' => 'According to what address to calculate tax', + 'logo' => 'Website Logo', + 'favicon' => 'Favicon', + 'favicon_info' => 'The small icon displayed on the browser tab must be in PNG format and the size is: 32*32', + 'placeholder_image' => 'Placeholder Image', 'placeholder_image_info' => 'The placeholder image displayed when there is no image or the image is not found, recommended size: 500*500', - 'head_code' => 'Insert code', - 'head_code_info' => 'The code in the input box will be inserted into the head of the front-end page, which can be used to count the code or add special plug-ins, etc', + 'head_code' => 'Insert code', + 'head_code_info' => 'The code in the input box will be inserted into the head of the front-end page, which can be used to count the code or add special plug-ins, etc', ]; diff --git a/resources/lang/en/admin/tax_class.php b/resources/lang/en/admin/tax_class.php index a3dd194d..6e07d802 100644 --- a/resources/lang/en/admin/tax_class.php +++ b/resources/lang/en/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Tax', - 'rule' => 'Rule', - 'based_on' => 'Based', - 'priority' => 'Priority', - 'tax_classes_index' => 'Index', + 'index' => 'Tax', + 'rule' => 'Rule', + 'based_on' => 'Based', + 'priority' => 'Priority', + 'tax_classes_index' => 'Index', 'tax_classes_create' => 'Create', - 'tax_classes_show' => 'Detail', + 'tax_classes_show' => 'Detail', 'tax_classes_update' => 'Edit', - 'tax_classes_delete' => 'Delete' + 'tax_classes_delete' => 'Delete', ]; diff --git a/resources/lang/en/admin/tax_rate.php b/resources/lang/en/admin/tax_rate.php index f4e614d1..6de99e89 100644 --- a/resources/lang/en/admin/tax_rate.php +++ b/resources/lang/en/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => 'Tax Rate', + 'index' => 'Tax Rate', 'tax_classes_index' => 'Tax Classes', - 'tax' => 'Tax', - 'tax_rate' => 'Tax Rate', - 'type' => 'Type', - 'area' => 'Area', - 'percentage' => 'Percentage', - 'fixed_tax_rate' => 'Fixed Tax Rate', - 'tax_rates_index' => 'Index', - 'tax_rates_create' => 'Create', - 'tax_rates_show' => 'Detail', - 'tax_rates_update' => 'Edit', - 'tax_rates_delete' => 'Delete' + 'tax' => 'Tax', + 'tax_rate' => 'Tax Rate', + 'type' => 'Type', + 'area' => 'Area', + 'percentage' => 'Percentage', + 'fixed_tax_rate' => 'Fixed Tax Rate', + 'tax_rates_index' => 'Index', + 'tax_rates_create' => 'Create', + 'tax_rates_show' => 'Detail', + 'tax_rates_update' => 'Edit', + 'tax_rates_delete' => 'Delete', ]; diff --git a/resources/lang/en/admin/user.php b/resources/lang/en/admin/user.php index 05dbf153..865baeaa 100644 --- a/resources/lang/en/admin/user.php +++ b/resources/lang/en/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'Index', - 'admin_users_create' => 'Create', - 'admin_users_show' => 'Detail', - 'admin_users_update' => 'Edit', - 'admin_users_delete' => 'Delete', + 'admin_users_index' => 'Index', + 'admin_users_create' => 'Create', + 'admin_users_show' => 'Detail', + 'admin_users_update' => 'Edit', + 'admin_users_delete' => 'Delete', 'verify_code_expired' => 'The verify code expired (10 minute), please retry.', - 'verify_code_error' => 'Verify code error!', - 'account_not_exist' => 'Account not exist!', + 'verify_code_error' => 'Verify code error!', + 'account_not_exist' => 'Account not exist!', ]; diff --git a/resources/lang/en/admin/zone.php b/resources/lang/en/admin/zone.php index 74ac38b0..c16db3d3 100644 --- a/resources/lang/en/admin/zone.php +++ b/resources/lang/en/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => 'Province Name', + 'zone_name' => 'Province Name', 'country_of_origin' => 'Country Of Origin', - 'zones_index' => 'Province List', - 'zones_create' => 'Create Province', - 'zones_update' => 'Update Province', - 'zones_delete' => 'Delete Province', + 'zones_index' => 'Province List', + 'zones_create' => 'Create Province', + 'zones_update' => 'Update Province', + 'zones_delete' => 'Delete Province', - 'error_country' => 'Please select a country', + 'error_country' => 'Please select a country', ]; diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index 6598e2c0..24e063b5 100644 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => 'These credentials do not match our records.', + 'failed' => 'These credentials do not match our records.', 'password' => 'The provided password is incorrect.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', diff --git a/resources/lang/en/brand.php b/resources/lang/en/brand.php index 3af4f314..07942fe4 100644 --- a/resources/lang/en/brand.php +++ b/resources/lang/en/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => 'Name', - 'icon' => 'Logo', + 'name' => 'Name', + 'icon' => 'Logo', 'first_letter' => 'First Letter', ]; diff --git a/resources/lang/en/cart.php b/resources/lang/en/cart.php index 50204a72..5d109611 100644 --- a/resources/lang/en/cart.php +++ b/resources/lang/en/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => 'Quantity', + 'sku_id' => 'SKU ID', + 'quantity' => 'Quantity', 'stock_out' => 'Stock Out', ]; diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php index b458dd2d..1ec442af 100644 --- a/resources/lang/en/common.php +++ b/resources/lang/en/common.php @@ -10,75 +10,75 @@ */ return [ - 'error_required' => 'Please fill out the :name', // 这个有用别删了，:name 是一个变量 + 'error_required' => 'Please fill out the :name', // 这个有用别删了，:name 是一个变量 'error_input_required' => 'Input box cannot be empty', - 'error_form' => 'Please check the form for errors', - 'email' => 'Email', - 'unauthenticated' => 'Please login first', - 'success' => 'Success', - 'no_data' => 'No data～', - 'empty_items' => 'Empty Items', - 'created_success' => 'Created Successfully!', - 'deleted_success' => 'Deleted Successfully!', - 'restored_success' => 'Restore Successfully!', - 'updated_success' => 'Updated Successfully!', - 'edit_success' => 'Modify Success!', - 'get_success' => 'Get Successfully!', - 'all' => 'All', - 'status' => 'Status', - 'enable' => 'Enable', - 'disable' => 'Disable', - 'enabled' => 'Enabled', - 'disabled' => 'Disabled', - 'home' => 'Home', - 'submit' => 'Submit', - 'title' => 'Title', - 'save' => 'Save', - 'cancel' => 'Cancel', - 'confirm' => 'Confirm', - 'no' => 'No', - 'yes' => 'Yes', - 'delete' => 'Delete', - 'sign_out' => 'Sign Out', - 'contact_us' => 'Contact us', - 'input' => 'Type your search here', - 'filter' => 'Filter', - 'reset' => 'Reset', - 'export' => 'Export', - 'edit' => 'Edit', - 'action' => 'Action', - 'add' => 'Add', - 'please_choose' => 'Please Choose', - 'recommend_size' => 'Recommend Size', - 'pick_datetime' => 'Pick Datetime', - 'confirm_delete' => 'You sure you want to delete it?', - 'text_hint' => 'Hint', - 'restore' => 'Restore', - 'name' => 'Name', - 'image' => 'Image', - 'data' => 'Data', - 'view' => 'View', - 'phone' => 'Phone', - 'exit' => 'Exit', - 'return' => 'Return', - 'language' => 'Language', - 'select_all' => 'Select All', - 'menu' => 'Menu', - 'whether_open' => 'Status', - 'default' => 'Default', - 'to_setting' => 'to configure', + 'error_form' => 'Please check the form for errors', + 'email' => 'Email', + 'unauthenticated' => 'Please login first', + 'success' => 'Success', + 'no_data' => 'No data～', + 'empty_items' => 'Empty Items', + 'created_success' => 'Created Successfully!', + 'deleted_success' => 'Deleted Successfully!', + 'restored_success' => 'Restore Successfully!', + 'updated_success' => 'Updated Successfully!', + 'edit_success' => 'Modify Success!', + 'get_success' => 'Get Successfully!', + 'all' => 'All', + 'status' => 'Status', + 'enable' => 'Enable', + 'disable' => 'Disable', + 'enabled' => 'Enabled', + 'disabled' => 'Disabled', + 'home' => 'Home', + 'submit' => 'Submit', + 'title' => 'Title', + 'save' => 'Save', + 'cancel' => 'Cancel', + 'confirm' => 'Confirm', + 'no' => 'No', + 'yes' => 'Yes', + 'delete' => 'Delete', + 'sign_out' => 'Sign Out', + 'contact_us' => 'Contact us', + 'input' => 'Type your search here', + 'filter' => 'Filter', + 'reset' => 'Reset', + 'export' => 'Export', + 'edit' => 'Edit', + 'action' => 'Action', + 'add' => 'Add', + 'please_choose' => 'Please Choose', + 'recommend_size' => 'Recommend Size', + 'pick_datetime' => 'Pick Datetime', + 'confirm_delete' => 'You sure you want to delete it?', + 'text_hint' => 'Hint', + 'restore' => 'Restore', + 'name' => 'Name', + 'image' => 'Image', + 'data' => 'Data', + 'view' => 'View', + 'phone' => 'Phone', + 'exit' => 'Exit', + 'return' => 'Return', + 'language' => 'Language', + 'select_all' => 'Select All', + 'menu' => 'Menu', + 'whether_open' => 'Status', + 'default' => 'Default', + 'to_setting' => 'to configure', - 'id' => 'ID', - 'created_at' => 'Created At', - 'updated_at' => 'Updated At', - 'sort_order' => 'Sort Order', - 'error_page' => 'The data you accessed does not exist or has been deleted~', - 'error_page_btn' => 'Return to previous page', + 'id' => 'ID', + 'created_at' => 'Created At', + 'updated_at' => 'Updated At', + 'sort_order' => 'Sort Order', + 'error_page' => 'The data you accessed does not exist or has been deleted~', + 'error_page_btn' => 'Return to previous page', - 'order' => [ - 'unpaid' => 'Unpaid', - 'paid' => 'Paid', - 'shipped' => 'Shipped', + 'order' => [ + 'unpaid' => 'Unpaid', + 'paid' => 'Paid', + 'shipped' => 'Shipped', 'completed' => 'Completed', 'cancelled' => 'Cancelled', ], diff --git a/resources/lang/en/currency.php b/resources/lang/en/currency.php index f07da547..9cd32fd0 100644 --- a/resources/lang/en/currency.php +++ b/resources/lang/en/currency.php @@ -9,13 +9,13 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => 'Name', - 'code' => 'Code', - 'icon' => 'Icon', - 'symbol_left' => 'Symbol Left', - 'symbol_right' => 'Symbol Right', - 'value' => 'Value', - 'decimal_place' => 'Decimal Place', + 'name' => 'Name', + 'code' => 'Code', + 'icon' => 'Icon', + 'symbol_left' => 'Symbol Left', + 'symbol_right' => 'Symbol Right', + 'value' => 'Value', + 'decimal_place' => 'Decimal Place', ]; diff --git a/resources/lang/en/customer.php b/resources/lang/en/customer.php index 41cf8e41..a45eafb1 100644 --- a/resources/lang/en/customer.php +++ b/resources/lang/en/customer.php @@ -10,10 +10,10 @@ */ return [ - 'name' => 'Name', - 'email' => 'Email', - 'from' => 'From', - 'customer_group' => 'Group', - 'password' => 'Password', + 'name' => 'Name', + 'email' => 'Email', + 'from' => 'From', + 'customer_group' => 'Group', + 'password' => 'Password', 'customer_group_id' => 'Customer Group', ]; diff --git a/resources/lang/en/customer_group.php b/resources/lang/en/customer_group.php index 319ca019..8eaf08b2 100644 --- a/resources/lang/en/customer_group.php +++ b/resources/lang/en/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => 'Level', - 'name' => 'Customer Group Name', + 'name' => 'Customer Group Name', ]; diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index cbdc6cac..d753123e 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -10,19 +10,18 @@ */ return [ - 'order_success' => 'Order submitted successfully', - 'order_update' => 'Order status update', - 'order_success_info' => 'Your order has been successfully submitted, the following is the order details', - 'not_oneself' => 'non-personal operations can be ignored. ', - 'customer_name' => 'Dear :name user, hello! ', - 'sincerely' => 'Sincerely', - 'team' => 'Team', - 'order_update_status' => 'The status of your order :number is updated', - 'welcome_register' => 'Welcome To Register', - 'register_end' => 'Complete registration, please click the button below to return to the mall. ', - 'btn_buy_now' => 'Buy Now', - 'retrieve_password_title' => 'Retrieve password', - 'retrieve_password_text' => 'You are retrieving your password, please click the button below to complete the operation. ', - 'retrieve_password_btn' => 'Click to reset password' + 'order_success' => 'Order submitted successfully', + 'order_update' => 'Order status update', + 'order_success_info' => 'Your order has been successfully submitted, the following is the order details', + 'not_oneself' => 'non-personal operations can be ignored. ', + 'customer_name' => 'Dear :name user, hello! ', + 'sincerely' => 'Sincerely', + 'team' => 'Team', + 'order_update_status' => 'The status of your order :number is updated', + 'welcome_register' => 'Welcome To Register', + 'register_end' => 'Complete registration, please click the button below to return to the mall. ', + 'btn_buy_now' => 'Buy Now', + 'retrieve_password_title' => 'Retrieve password', + 'retrieve_password_text' => 'You are retrieving your password, please click the button below to complete the operation. ', + 'retrieve_password_btn' => 'Click to reset password', ]; - diff --git a/resources/lang/en/order.php b/resources/lang/en/order.php index 5a8bee37..32799ca5 100644 --- a/resources/lang/en/order.php +++ b/resources/lang/en/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'number' => 'Number', - 'customer_name' => 'Customer', - 'payment_method' => 'Payment Method', - 'email' => 'Email', - 'telephone' => 'Telephone', - 'created_at' => 'Created', - 'updated_at' => 'Updated', - 'status' => 'Status', - 'status_format' => 'Status', - 'total' => 'Total', - 'express_number' => 'Express Number', - 'express_company' => 'Express Company', - 'order_shipments' => 'shipment information', + 'id' => 'ID', + 'number' => 'Number', + 'customer_name' => 'Customer', + 'payment_method' => 'Payment Method', + 'email' => 'Email', + 'telephone' => 'Telephone', + 'created_at' => 'Created', + 'updated_at' => 'Updated', + 'status' => 'Status', + 'status_format' => 'Status', + 'total' => 'Total', + 'express_number' => 'Express Number', + 'express_company' => 'Express Company', + 'order_shipments' => 'shipment information', - 'address_info' => 'Address Information', - 'shipping_address' => 'Shipping Address', - 'payment_address' => 'Payment Address', - 'order_status' => 'Order Status', - 'product_sub_price' => 'Subtotal', - 'current_status' => 'Current', - 'change_to_status' => 'Change To', - 'comment' => 'Comment', - 'submit_status' => 'Submit', + 'address_info' => 'Address Information', + 'shipping_address' => 'Shipping Address', + 'payment_address' => 'Payment Address', + 'order_status' => 'Order Status', + 'product_sub_price' => 'Subtotal', + 'current_status' => 'Current', + 'change_to_status' => 'Change To', + 'comment' => 'Comment', + 'submit_status' => 'Submit', - 'product_info' => 'Product Information', - 'product_name' => 'Product Name', - 'product_price' => 'Unit Price', - 'product_quantity' => 'Quantity', - 'product_sku' => 'SKU', + 'product_info' => 'Product Information', + 'product_name' => 'Product Name', + 'product_price' => 'Unit Price', + 'product_quantity' => 'Quantity', + 'product_sku' => 'SKU', - 'action_history' => 'Action History', - 'history_status' => 'Status', - 'history_comment' => 'Comment', + 'action_history' => 'Action History', + 'history_status' => 'Status', + 'history_comment' => 'Comment', 'history_created_at' => 'Created At', - 'unpaid' => 'Unpaid', - 'paid' => 'Paid', - 'shipped' => 'Shipped', - 'completed' => 'Completed', - 'cancelled' => 'Cancelled', + 'unpaid' => 'Unpaid', + 'paid' => 'Paid', + 'shipped' => 'Shipped', + 'completed' => 'Completed', + 'cancelled' => 'Cancelled', ]; diff --git a/resources/lang/en/page.php b/resources/lang/en/page.php index 1437e774..bc22b12d 100644 --- a/resources/lang/en/page.php +++ b/resources/lang/en/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => 'Title', + 'title' => 'Title', 'content' => 'Content', ]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index d4814118..fcab34b2 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -14,6 +14,6 @@ return [ */ 'previous' => '« Previous', - 'next' => 'Next »', + 'next' => 'Next »', ]; diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php index 2345a56b..526795fb 100644 --- a/resources/lang/en/passwords.php +++ b/resources/lang/en/passwords.php @@ -13,10 +13,10 @@ return [ | */ - 'reset' => 'Your password has been reset!', - 'sent' => 'We have emailed your password reset link!', + 'reset' => 'Your password has been reset!', + 'sent' => 'We have emailed your password reset link!', 'throttled' => 'Please wait before retrying.', - 'token' => 'This password reset token is invalid.', - 'user' => "We can't find a user with that email address.", + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that email address.", ]; diff --git a/resources/lang/en/product.php b/resources/lang/en/product.php index 31382f7b..d01f4c59 100644 --- a/resources/lang/en/product.php +++ b/resources/lang/en/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => 'Name', - 'sku' => 'SKU', - 'price' => 'Price', - 'origin_price' => 'Origin Price', - 'cost_price' => 'Cost Price', - 'brand' => 'Brand', - 'category' => 'Category', - 'model' => 'Model', - 'quantity' => 'Quantity', - 'image' => 'Image', + 'name' => 'Name', + 'sku' => 'SKU', + 'price' => 'Price', + 'origin_price' => 'Origin Price', + 'cost_price' => 'Cost Price', + 'brand' => 'Brand', + 'category' => 'Category', + 'model' => 'Model', + 'quantity' => 'Quantity', + 'image' => 'Image', - 'active' => 'Active', - 'inactive' => 'Inactive', + 'active' => 'Active', + 'inactive' => 'Inactive', 'has_been_inactive' => 'The product has been inactive', ]; diff --git a/resources/lang/en/rma.php b/resources/lang/en/rma.php index 0a0b25f5..fb23b5d9 100644 --- a/resources/lang/en/rma.php +++ b/resources/lang/en/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => 'Order', + 'order_id' => 'Order', 'order_product_id' => 'Order Product', - 'customer_id' => 'Customer', - 'quantity' => 'Quantity', - 'opened' => 'Opened', - 'rma_reason_id' => 'Reason ID', - 'type' => 'Type', + 'customer_id' => 'Customer', + 'quantity' => 'Quantity', + 'opened' => 'Opened', + 'rma_reason_id' => 'Reason ID', + 'type' => 'Type', - 'status_pending' => 'Pending', - 'status_rejected' => 'Rejected', - 'status_approved' => 'Approved', - 'status_shipped' => 'Shipped', + 'status_pending' => 'Pending', + 'status_rejected' => 'Rejected', + 'status_approved' => 'Approved', + 'status_shipped' => 'Shipped', 'status_completed' => 'Completed', - 'type_return' => 'Return', - 'type_exchange' => 'Exchange', - 'type_repair' => 'Repair', - 'type_reissue' => 'Reissue', - 'type_refund' => 'Refund' + 'type_return' => 'Return', + 'type_exchange' => 'Exchange', + 'type_repair' => 'Repair', + 'type_reissue' => 'Reissue', + 'type_refund' => 'Refund', ]; diff --git a/resources/lang/en/shop/account.php b/resources/lang/en/shop/account.php index 2eedd6bc..8da5c170 100644 --- a/resources/lang/en/shop/account.php +++ b/resources/lang/en/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'Account', - 'revise_info' => 'Modify Information', - 'collect' => 'Collect', - 'coupon' => 'Coupon', - 'my_order' => 'My Order', - 'orders' => 'All Orders', - 'pending_payment' => 'Pending Payment', - 'pending_send' => 'To be delivered', - 'pending_receipt' => 'Pending Receipt', - 'after_sales' => 'After Sales', - 'no_order' => "You don't have an order yet!", - 'to_buy' => 'To place an order', - 'order_number' => 'Order Number', - 'order_time' => 'Order Time', - 'state' => 'State', - 'amount' => 'Amount', - 'check_details' => 'Check Details', - 'all' => 'All', - 'items' => 'Items', + 'index' => 'Account', + 'revise_info' => 'Modify Information', + 'collect' => 'Collect', + 'coupon' => 'Coupon', + 'my_order' => 'My Order', + 'orders' => 'All Orders', + 'pending_payment' => 'Pending Payment', + 'pending_send' => 'To be delivered', + 'pending_receipt' => 'Pending Receipt', + 'after_sales' => 'After Sales', + 'no_order' => "You don't have an order yet!", + 'to_buy' => 'To place an order', + 'order_number' => 'Order Number', + 'order_time' => 'Order Time', + 'state' => 'State', + 'amount' => 'Amount', + 'check_details' => 'Check Details', + 'all' => 'All', + 'items' => 'Items', 'verify_code_expired' => 'The verify code expired (10 minute), please retry.', - 'verify_code_error' => 'Verify code error!', - 'account_not_exist' => 'Account not exist!', + 'verify_code_error' => 'Verify code error!', + 'account_not_exist' => 'Account not exist!', - 'edit' => [ - 'index' => 'Edit', - 'modify_avatar' => 'Modify Avatar', - 'suggest' => 'Upload a JPG or PNG image. 300 x 300 is recommended.', - 'name' => 'Name', - 'email' => 'Email', - 'crop' => 'Crop', + 'edit' => [ + 'index' => 'Edit', + 'modify_avatar' => 'Modify Avatar', + 'suggest' => 'Upload a JPG or PNG image. 300 x 300 is recommended.', + 'name' => 'Name', + 'email' => 'Email', + 'crop' => 'Crop', 'password_edit_success' => 'Change password successfully!', - 'origin_password_fail' => 'Origin password incorrect!', + 'origin_password_fail' => 'Origin password incorrect!', ], - 'wishlist' => [ - 'index' => 'Wishlist', - 'product' => 'Product', - 'price' => 'Price', + 'wishlist' => [ + 'index' => 'Wishlist', + 'product' => 'Product', + 'price' => 'Price', 'check_details' => 'Check Details', ], - 'order' => [ - 'index' => 'Order', - 'completed' => 'Completed', - 'cancelled' => 'Cancelled', + 'order' => [ + 'index' => 'Order', + 'completed' => 'Completed', + 'cancelled' => 'Cancelled', 'order_details' => 'Order Details', - 'amount' => 'Amount', - 'state' => 'State', - 'order_number' => 'Order Number', - 'check' => 'Check', + 'amount' => 'Amount', + 'state' => 'State', + 'order_number' => 'Order Number', + 'check' => 'Check', - 'order_info' => [ - 'index' => 'Order Info', - 'order_details' => 'Order Details', - 'to_pay' => 'Pay', - 'cancel' => 'Cancel', - 'confirm_receipt' => 'Confirm the receipt of goods', - 'order_number' => 'Order Number', - 'order_date' => 'Order Date', - 'state' => 'State', - 'order_amount' => 'Order Amount', - 'order_items' => 'Order Items', + 'order_info' => [ + 'index' => 'Order Info', + 'order_details' => 'Order Details', + 'to_pay' => 'Pay', + 'cancel' => 'Cancel', + 'confirm_receipt' => 'Confirm the receipt of goods', + 'order_number' => 'Order Number', + 'order_date' => 'Order Date', + 'state' => 'State', + 'order_amount' => 'Order Amount', + 'order_items' => 'Order Items', 'apply_after_sales' => 'Apply for after-sales', - 'order_total' => 'Order Total', - 'logistics_status' => 'Logistics Status', - 'order_status' => 'Order Status', - 'remark' => 'Remark', - 'update_time' => 'Update Time', + 'order_total' => 'Order Total', + 'logistics_status' => 'Logistics Status', + 'order_status' => 'Order Status', + 'remark' => 'Remark', + 'update_time' => 'Update Time', ], 'order_success' => [ - 'order_success' => 'Congratulations, the order was successfully generated!', - 'order_number' => 'Order Number', - 'amounts_payable' => 'Amount ', - 'payment_method' => 'Payment Method ', - 'view_order' => 'View Order ', - 'pay_now' => 'Pay Now ', - 'kind_tips' => 'Reminder: Your order has been successfully generated, please complete the payment as soon as possible~ ', - 'also' => 'You can also', - 'continue_purchase' => 'continue to purchase', + 'order_success' => 'Congratulations, the order was successfully generated!', + 'order_number' => 'Order Number', + 'amounts_payable' => 'Amount ', + 'payment_method' => 'Payment Method ', + 'view_order' => 'View Order ', + 'pay_now' => 'Pay Now ', + 'kind_tips' => 'Reminder: Your order has been successfully generated, please complete the payment as soon as possible~ ', + 'also' => 'You can also', + 'continue_purchase' => 'continue to purchase', 'contact_customer_service' => 'If you have any questions during the order process, you can contact our customer service staff at any time', - 'emaill' => 'email', - 'service_hotline' => 'Service Hotline', + 'emaill' => 'email', + 'service_hotline' => 'Service Hotline', ], ], - 'addresses' => [ - 'index' => 'Addresses', - 'add_address' => 'Add New Address', + 'addresses' => [ + 'index' => 'Addresses', + 'add_address' => 'Add New Address', 'default_address' => 'Default Address', - 'delete' => 'Delete', - 'edit' => 'Edit', - 'enter_name' => 'Please type in your name', - 'enter_phone' => 'Please type your phone number', - 'enter_address' => 'Please enter detailed address 1', + 'delete' => 'Delete', + 'edit' => 'Edit', + 'enter_name' => 'Please type in your name', + 'enter_phone' => 'Please type your phone number', + 'enter_address' => 'Please enter detailed address 1', 'select_province' => 'Please select province', - 'enter_city' => 'Please fill in the city', - 'confirm_delete' => 'Are you sure you want to delete the address?', - 'hint' => 'Hint', - 'check_form' => 'Please check that the form is filled out correctly', + 'enter_city' => 'Please fill in the city', + 'confirm_delete' => 'Are you sure you want to delete the address?', + 'hint' => 'Hint', + 'check_form' => 'Please check that the form is filled out correctly', ], - 'rma' => [ - 'index' => 'Rma', - 'commodity' => 'Commodity', - 'quantity' => 'Quantity', - 'service_type' => 'Service Type', + 'rma' => [ + 'index' => 'Rma', + 'commodity' => 'Commodity', + 'quantity' => 'Quantity', + 'service_type' => 'Service Type', 'return_reason' => 'Reason For Return', 'creation_time' => 'Creation Time', - 'check' => 'Check', + 'check' => 'Check', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'After-sales Details', ], - 'rma_form' => [ - 'index' => 'Submit after-sales information', - 'service_type' => 'Service Type', + 'rma_form' => [ + 'index' => 'Submit after-sales information', + 'service_type' => 'Service Type', 'return_quantity' => 'Return Quantity', - 'unpacked' => 'Unpacked', - 'return_reason' => 'Reason For Return', - 'remark' => 'Remark', - ] - ] + 'unpacked' => 'Unpacked', + 'return_reason' => 'Reason For Return', + 'remark' => 'Remark', + ], + ], ]; diff --git a/resources/lang/en/shop/carts.php b/resources/lang/en/shop/carts.php index e7a17c02..ca7bc4f1 100644 --- a/resources/lang/en/shop/carts.php +++ b/resources/lang/en/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'Cart', - 'added_to_cart' => 'Added To Cart', - 'select_all' => 'Select All', - 'commodity' => 'Commodity', - 'quantity' => 'Quantity', - 'subtotal' => 'Subtotal', - 'product_total' => 'Product Total', - 'order_total' => 'Order Total', - 'shipping_fee' => 'Shipping Fee', - 'all' => 'All', - 'selected' => 'Selected', - 'to_checkout' => 'Checkout', - 'cart_empty' => 'Your shopping cart is empty', - 'go_buy' => 'You can go and see what you want to buy', - 'go_shopping' => 'Go Shopping', - 'must_select' => 'Please select at least one product', - 'mini' => 'Your cart', - 'delete' => 'Delete', - 'check_cart' => 'Shopping Cart', + 'index' => 'Cart', + 'added_to_cart' => 'Added To Cart', + 'select_all' => 'Select All', + 'commodity' => 'Commodity', + 'quantity' => 'Quantity', + 'subtotal' => 'Subtotal', + 'product_total' => 'Product Total', + 'order_total' => 'Order Total', + 'shipping_fee' => 'Shipping Fee', + 'all' => 'All', + 'selected' => 'Selected', + 'to_checkout' => 'Checkout', + 'cart_empty' => 'Your shopping cart is empty', + 'go_buy' => 'You can go and see what you want to buy', + 'go_shopping' => 'Go Shopping', + 'must_select' => 'Please select at least one product', + 'mini' => 'Your cart', + 'delete' => 'Delete', + 'check_cart' => 'Shopping Cart', - 'invalid_customer' => 'Invalid customer.', - 'empty_selected_products' => 'Empty selected products.', + 'invalid_customer' => 'Invalid customer.', + 'empty_selected_products' => 'Empty selected products.', 'invalid_shipping_address' => 'Invalid shipping address', - 'invalid_payment_address' => 'Invalid payment address.', - 'invalid_shipping_method' => 'Invalid shipping method.', - 'invalid_payment_method' => 'Invalid payment method.', + 'invalid_payment_address' => 'Invalid payment address.', + 'invalid_shipping_method' => 'Invalid shipping method.', + 'invalid_payment_method' => 'Invalid payment method.', ]; diff --git a/resources/lang/en/shop/checkout.php b/resources/lang/en/shop/checkout.php index 3fab152e..7e78df87 100644 --- a/resources/lang/en/shop/checkout.php +++ b/resources/lang/en/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'Checkout', - 'address' => 'Address', - 'payment_address' => 'Payment Address', + 'index' => 'Checkout', + 'address' => 'Address', + 'payment_address' => 'Payment Address', 'same_as_shipping_address' => 'Same As Shipping Address', - 'chosen' => 'Chosen', - 'edit' => 'Edit', - 'choose_another_address' => 'Choose Another Address', - 'add_new_address' => 'Add New Address', - 'payment_method' => 'Payment Method', - 'delivery_method' => 'Delivery Method', - 'cart_totals' => 'Cart Totals', - 'submit_order' => 'Submit Order', - 'enter_name' => 'Please type in your name', - 'enter_phone' => 'Please type your phone number', - 'enter_address' => 'Please enter detailed address 1', - 'select_province' => 'Please select province', - 'enter_city' => 'Please fill in the city ', - 'check_form' => 'Please check that the form is filled out correctly', - 'error_payment_address' => 'Please select a billing address', + 'chosen' => 'Chosen', + 'edit' => 'Edit', + 'choose_another_address' => 'Choose Another Address', + 'add_new_address' => 'Add New Address', + 'payment_method' => 'Payment Method', + 'delivery_method' => 'Delivery Method', + 'cart_totals' => 'Cart Totals', + 'submit_order' => 'Submit Order', + 'enter_name' => 'Please type in your name', + 'enter_phone' => 'Please type your phone number', + 'enter_address' => 'Please enter detailed address 1', + 'select_province' => 'Please select province', + 'enter_city' => 'Please fill in the city ', + 'check_form' => 'Please check that the form is filled out correctly', + 'error_payment_address' => 'Please select a billing address', - 'payment' => [ - 'index' => 'Please Pay', - 'please_pay' => 'Order placed successfully, please pay', - 'order_number' => 'Order Number', + 'payment' => [ + 'index' => 'Please Pay', + 'please_pay' => 'Order placed successfully, please pay', + 'order_number' => 'Order Number', 'amounts_payable' => 'Amount', - 'payment_method' => 'Payment Method', - ] + 'payment_method' => 'Payment Method', + ], ]; diff --git a/resources/lang/en/shop/common.php b/resources/lang/en/shop/common.php index 087f3c78..da10009b 100644 --- a/resources/lang/en/shop/common.php +++ b/resources/lang/en/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => 'Home', - 'submit' => 'Submit', - 'cancel' => 'Cancel', + 'home' => 'Home', + 'submit' => 'Submit', + 'cancel' => 'Cancel', 'confirm' => 'Confirm', - 'no' => 'No', - 'yes' => 'Yes', + 'no' => 'No', + 'yes' => 'Yes', ]; diff --git a/resources/lang/en/shop/currency.php b/resources/lang/en/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/en/shop/currency.php +++ b/resources/lang/en/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/en/shop/forgotten.php b/resources/lang/en/shop/forgotten.php index 97414815..3ee6c04f 100644 --- a/resources/lang/en/shop/forgotten.php +++ b/resources/lang/en/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'Forgot Password', - 'follow_prompt' => 'Please follow the prompts to retrieve your password', - 'email_forCode' => 'Please enter your email address to get the verification code', - 'enter_password' => 'Please enter a new password', - 'email' => 'Email', - 'email_address' => 'Email Address', - 'verification_code' => 'Verification Code', - 'password' => 'Password', - 'confirm_password' => 'Confirm Password', - 'send_code' => 'Send Code', - 'to_back' => 'Back to previous step', - 'enter_password' => 'Please enter password', - 'enter_email' => 'Please input your email', - 'please_confirm' => 'Please confirm your password', - 'password_err' => 'The passwords entered twice do not match!', - 'email_err' => 'Please enter a valid email address!', - 'enter_code' => 'Please enter verification code', + 'index' => 'Forgot Password', + 'follow_prompt' => 'Please follow the prompts to retrieve your password', + 'email_forCode' => 'Please enter your email address to get the verification code', + 'enter_password' => 'Please enter a new password', + 'email' => 'Email', + 'email_address' => 'Email Address', + 'verification_code' => 'Verification Code', + 'password' => 'Password', + 'confirm_password' => 'Confirm Password', + 'send_code' => 'Send Code', + 'to_back' => 'Back to previous step', + 'enter_password' => 'Please enter password', + 'enter_email' => 'Please input your email', + 'please_confirm' => 'Please confirm your password', + 'password_err' => 'The passwords entered twice do not match!', + 'email_err' => 'Please enter a valid email address!', + 'enter_code' => 'Please enter verification code', 'verification_code_sent' => 'Verification code has sent. Please input the code', - 'password_updated' => 'Password updated', + 'password_updated' => 'Password updated', ]; diff --git a/resources/lang/en/shop/login.php b/resources/lang/en/shop/login.php index 4e95f2ed..202fbf23 100644 --- a/resources/lang/en/shop/login.php +++ b/resources/lang/en/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'User login and registration', - 'login_and_sign' => 'Login/Sign In', - 'home' => 'Home', - 'library' => 'Library', - 'login' => 'Login', - 'already' => 'Already our customer?', - 'description' => 'Already our customer?', - 'email' => 'Email', - 'email_address' => 'Email Address', - 'password' => 'Password', - 'forget_password' => 'Forget password', - 'new' => 'New Account', - 'not_already' => 'Not yet our registered customer?', - 'confirm_password' => 'Confirm Password', - 'register' => 'Register', - 'enter_password' => 'Please enter password', - 'enter_email' => 'Please input your email', - 'please_confirm' => 'Please confirm your password', - 'password_err' => 'The passwords entered twice do not match!', - 'email_err' => 'Please enter a valid email address!', - 'check_form' => 'Please check that the form is filled out correctly', + 'index' => 'User login and registration', + 'login_and_sign' => 'Login/Sign In', + 'home' => 'Home', + 'library' => 'Library', + 'login' => 'Login', + 'already' => 'Already our customer?', + 'description' => 'Already our customer?', + 'email' => 'Email', + 'email_address' => 'Email Address', + 'password' => 'Password', + 'forget_password' => 'Forget password', + 'new' => 'New Account', + 'not_already' => 'Not yet our registered customer?', + 'confirm_password' => 'Confirm Password', + 'register' => 'Register', + 'enter_password' => 'Please enter password', + 'enter_email' => 'Please input your email', + 'please_confirm' => 'Please confirm your password', + 'password_err' => 'The passwords entered twice do not match!', + 'email_err' => 'Please enter a valid email address!', + 'check_form' => 'Please check that the form is filled out correctly', 'email_or_password_error' => 'Email or Password is incorrect!', - 'customer_inactive' => 'The customer is inactive!', - 'login_successfully' => 'Login successfully!', - 'register_success' => 'Registered successfully', - 'third_party_logins' => 'Third-party Login', + 'customer_inactive' => 'The customer is inactive!', + 'login_successfully' => 'Login successfully!', + 'register_success' => 'Registered successfully', + 'third_party_logins' => 'Third-party Login', ]; diff --git a/resources/lang/en/shop/order.php b/resources/lang/en/shop/order.php index 4adb9902..a36f8f9b 100644 --- a/resources/lang/en/shop/order.php +++ b/resources/lang/en/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => 'Invalid order', - 'confirm_order' => 'Customer confirm received package', - 'cancel_order' => 'Customer cancel the order', + 'invalid_order' => 'Invalid order', + 'confirm_order' => 'Customer confirm received package', + 'cancel_order' => 'Customer cancel the order', 'order_already_paid' => 'The order is paid already', ]; diff --git a/resources/lang/en/shop/products.php b/resources/lang/en/shop/products.php index 928e4242..7c348c74 100644 --- a/resources/lang/en/shop/products.php +++ b/resources/lang/en/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => 'Search', + 'search' => 'Search', 'add_to_favorites' => 'Add To Favorites', - 'add_to_cart' => 'Add to Shopping Cart', - 'buy_now' => 'Buy Now', - 'product_details' => 'Product Details', - 'in_stock' => 'In Stock', - 'out_stock' => 'Out Stock', - 'model' => 'Model', + 'add_to_cart' => 'Add to Shopping Cart', + 'buy_now' => 'Buy Now', + 'product_details' => 'Product Details', + 'in_stock' => 'In Stock', + 'out_stock' => 'Out Stock', + 'model' => 'Model', ]; diff --git a/resources/lang/en/shop/steps.php b/resources/lang/en/shop/steps.php index add8cddc..e364278c 100644 --- a/resources/lang/en/shop/steps.php +++ b/resources/lang/en/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'Steps', - 'cart' => 'Cart', - 'checkout' => 'Checkout', + 'index' => 'Steps', + 'cart' => 'Cart', + 'checkout' => 'Checkout', 'submitted_successfully' => 'Place Order', - 'payment' => 'Payment', + 'payment' => 'Payment', ]; diff --git a/resources/lang/en/shop/wishlist.php b/resources/lang/en/shop/wishlist.php index d6177fce..f9a0fae1 100644 --- a/resources/lang/en/shop/wishlist.php +++ b/resources/lang/en/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'Add to wishlist successfully', + 'add_wishlist_success' => 'Add to wishlist successfully', 'remove_wishlist_success' => 'Remove from wishlist successfully', ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 5f8a2e7c..0b9bd581 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -13,119 +13,119 @@ return [ | */ - 'accepted' => 'The :attribute must be accepted.', - 'accepted_if' => 'The :attribute must be accepted when :other is :value.', - 'active_url' => 'The :attribute is not a valid URL.', - 'after' => 'The :attribute must be a date after :date.', - 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', - 'alpha' => 'The :attribute must only contain letters.', - 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.', - 'alpha_num' => 'The :attribute must only contain letters and numbers.', - 'array' => 'The :attribute must be an array.', - 'before' => 'The :attribute must be a date before :date.', - 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', - 'between' => [ + 'accepted' => 'The :attribute must be accepted.', + 'accepted_if' => 'The :attribute must be accepted when :other is :value.', + 'active_url' => 'The :attribute is not a valid URL.', + 'after' => 'The :attribute must be a date after :date.', + 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', + 'alpha' => 'The :attribute must only contain letters.', + 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.', + 'alpha_num' => 'The :attribute must only contain letters and numbers.', + 'array' => 'The :attribute must be an array.', + 'before' => 'The :attribute must be a date before :date.', + 'before_or_equal' => 'The :attribute must be a date before or equal to :date.', + 'between' => [ 'numeric' => 'The :attribute must be between :min and :max.', - 'file' => 'The :attribute must be between :min and :max kilobytes.', - 'string' => 'The :attribute must be between :min and :max characters.', - 'array' => 'The :attribute must have between :min and :max items.', + 'file' => 'The :attribute must be between :min and :max kilobytes.', + 'string' => 'The :attribute must be between :min and :max characters.', + 'array' => 'The :attribute must have between :min and :max items.', ], - 'boolean' => 'The :attribute field must be true or false.', - 'confirmed' => 'The :attribute confirmation does not match.', - 'current_password' => 'The password is incorrect.', - 'date' => 'The :attribute is not a valid date.', - 'date_equals' => 'The :attribute must be a date equal to :date.', - 'date_format' => 'The :attribute does not match the format :format.', - 'declined' => 'The :attribute must be declined.', - 'declined_if' => 'The :attribute must be declined when :other is :value.', - 'different' => 'The :attribute and :other must be different.', - 'digits' => 'The :attribute must be :digits digits.', - 'digits_between' => 'The :attribute must be between :min and :max digits.', - 'dimensions' => 'The :attribute has invalid image dimensions.', - 'distinct' => 'The :attribute field has a duplicate value.', - 'email' => 'The :attribute must be a valid email address.', - 'ends_with' => 'The :attribute must end with one of the following: :values.', - 'exists' => 'The selected :attribute is invalid.', - 'file' => 'The :attribute must be a file.', - 'filled' => 'The :attribute field must have a value.', - 'gt' => [ + 'boolean' => 'The :attribute field must be true or false.', + 'confirmed' => 'The :attribute confirmation does not match.', + 'current_password' => 'The password is incorrect.', + 'date' => 'The :attribute is not a valid date.', + 'date_equals' => 'The :attribute must be a date equal to :date.', + 'date_format' => 'The :attribute does not match the format :format.', + 'declined' => 'The :attribute must be declined.', + 'declined_if' => 'The :attribute must be declined when :other is :value.', + 'different' => 'The :attribute and :other must be different.', + 'digits' => 'The :attribute must be :digits digits.', + 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'dimensions' => 'The :attribute has invalid image dimensions.', + 'distinct' => 'The :attribute field has a duplicate value.', + 'email' => 'The :attribute must be a valid email address.', + 'ends_with' => 'The :attribute must end with one of the following: :values.', + 'exists' => 'The selected :attribute is invalid.', + 'file' => 'The :attribute must be a file.', + 'filled' => 'The :attribute field must have a value.', + 'gt' => [ 'numeric' => 'The :attribute must be greater than :value.', - 'file' => 'The :attribute must be greater than :value kilobytes.', - 'string' => 'The :attribute must be greater than :value characters.', - 'array' => 'The :attribute must have more than :value items.', + 'file' => 'The :attribute must be greater than :value kilobytes.', + 'string' => 'The :attribute must be greater than :value characters.', + 'array' => 'The :attribute must have more than :value items.', ], - 'gte' => [ + 'gte' => [ 'numeric' => 'The :attribute must be greater than or equal to :value.', - 'file' => 'The :attribute must be greater than or equal to :value kilobytes.', - 'string' => 'The :attribute must be greater than or equal to :value characters.', - 'array' => 'The :attribute must have :value items or more.', + 'file' => 'The :attribute must be greater than or equal to :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal to :value characters.', + 'array' => 'The :attribute must have :value items or more.', ], - 'image' => 'The :attribute must be an image.', - 'in' => 'The selected :attribute is invalid.', - 'in_array' => 'The :attribute field does not exist in :other.', - 'integer' => 'The :attribute must be an integer.', - 'ip' => 'The :attribute must be a valid IP address.', - 'ipv4' => 'The :attribute must be a valid IPv4 address.', - 'ipv6' => 'The :attribute must be a valid IPv6 address.', - 'json' => 'The :attribute must be a valid JSON string.', - 'lt' => [ + 'image' => 'The :attribute must be an image.', + 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', + 'integer' => 'The :attribute must be an integer.', + 'ip' => 'The :attribute must be a valid IP address.', + 'ipv4' => 'The :attribute must be a valid IPv4 address.', + 'ipv6' => 'The :attribute must be a valid IPv6 address.', + 'json' => 'The :attribute must be a valid JSON string.', + 'lt' => [ 'numeric' => 'The :attribute must be less than :value.', - 'file' => 'The :attribute must be less than :value kilobytes.', - 'string' => 'The :attribute must be less than :value characters.', - 'array' => 'The :attribute must have less than :value items.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', ], - 'lte' => [ + 'lte' => [ 'numeric' => 'The :attribute must be less than or equal to :value.', - 'file' => 'The :attribute must be less than or equal to :value kilobytes.', - 'string' => 'The :attribute must be less than or equal to :value characters.', - 'array' => 'The :attribute must not have more than :value items.', + 'file' => 'The :attribute must be less than or equal to :value kilobytes.', + 'string' => 'The :attribute must be less than or equal to :value characters.', + 'array' => 'The :attribute must not have more than :value items.', ], - 'max' => [ + 'max' => [ 'numeric' => 'The :attribute must not be greater than :max.', - 'file' => 'The :attribute must not be greater than :max kilobytes.', - 'string' => 'The :attribute must not be greater than :max characters.', - 'array' => 'The :attribute must not have more than :max items.', + 'file' => 'The :attribute must not be greater than :max kilobytes.', + 'string' => 'The :attribute must not be greater than :max characters.', + 'array' => 'The :attribute must not have more than :max items.', ], - 'mimes' => 'The :attribute must be a file of type: :values.', - 'mimetypes' => 'The :attribute must be a file of type: :values.', - 'min' => [ + 'mimes' => 'The :attribute must be a file of type: :values.', + 'mimetypes' => 'The :attribute must be a file of type: :values.', + 'min' => [ 'numeric' => 'The :attribute must be at least :min.', - 'file' => 'The :attribute must be at least :min kilobytes.', - 'string' => 'The :attribute must be at least :min characters.', - 'array' => 'The :attribute must have at least :min items.', + 'file' => 'The :attribute must be at least :min kilobytes.', + 'string' => 'The :attribute must be at least :min characters.', + 'array' => 'The :attribute must have at least :min items.', ], - 'multiple_of' => 'The :attribute must be a multiple of :value.', - 'not_in' => 'The selected :attribute is invalid.', - 'not_regex' => 'The :attribute format is invalid.', - 'numeric' => 'The :attribute must be a number.', - 'password' => 'The password is incorrect.', - 'present' => 'The :attribute field must be present.', - 'prohibited' => 'The :attribute field is prohibited.', - 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.', - 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.', - 'prohibits' => 'The :attribute field prohibits :other from being present.', - 'regex' => 'The :attribute format is invalid.', - 'required' => 'The :attribute field is required.', - 'required_if' => 'The :attribute field is required when :other is :value.', - 'required_unless' => 'The :attribute field is required unless :other is in :values.', - 'required_with' => 'The :attribute field is required when :values is present.', - 'required_with_all' => 'The :attribute field is required when :values are present.', - 'required_without' => 'The :attribute field is required when :values is not present.', + 'multiple_of' => 'The :attribute must be a multiple of :value.', + 'not_in' => 'The selected :attribute is invalid.', + 'not_regex' => 'The :attribute format is invalid.', + 'numeric' => 'The :attribute must be a number.', + 'password' => 'The password is incorrect.', + 'present' => 'The :attribute field must be present.', + 'prohibited' => 'The :attribute field is prohibited.', + 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.', + 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.', + 'prohibits' => 'The :attribute field prohibits :other from being present.', + 'regex' => 'The :attribute format is invalid.', + 'required' => 'The :attribute field is required.', + 'required_if' => 'The :attribute field is required when :other is :value.', + 'required_unless' => 'The :attribute field is required unless :other is in :values.', + 'required_with' => 'The :attribute field is required when :values is present.', + 'required_with_all' => 'The :attribute field is required when :values are present.', + 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', - 'same' => 'The :attribute and :other must match.', - 'size' => [ + 'same' => 'The :attribute and :other must match.', + 'size' => [ 'numeric' => 'The :attribute must be :size.', - 'file' => 'The :attribute must be :size kilobytes.', - 'string' => 'The :attribute must be :size characters.', - 'array' => 'The :attribute must contain :size items.', + 'file' => 'The :attribute must be :size kilobytes.', + 'string' => 'The :attribute must be :size characters.', + 'array' => 'The :attribute must contain :size items.', ], - 'starts_with' => 'The :attribute must start with one of the following: :values.', - 'string' => 'The :attribute must be a string.', - 'timezone' => 'The :attribute must be a valid timezone.', - 'unique' => 'The :attribute has already been taken.', - 'uploaded' => 'The :attribute failed to upload.', - 'url' => 'The :attribute must be a valid URL.', - 'uuid' => 'The :attribute must be a valid UUID.', + 'starts_with' => 'The :attribute must start with one of the following: :values.', + 'string' => 'The :attribute must be a string.', + 'timezone' => 'The :attribute must be a valid timezone.', + 'unique' => 'The :attribute has already been taken.', + 'uploaded' => 'The :attribute failed to upload.', + 'url' => 'The :attribute must be a valid URL.', + 'uuid' => 'The :attribute must be a valid UUID.', /* |-------------------------------------------------------------------------- @@ -138,7 +138,7 @@ return [ | */ - 'custom' => [ + 'custom' => [ 'attribute-name' => [ 'rule-name' => 'custom-message', ], @@ -155,15 +155,15 @@ return [ | */ - 'attributes' => [ - 'descriptions.en.title' => 'Title', + 'attributes' => [ + 'descriptions.en.title' => 'Title', 'descriptions.zh_cn.title' => 'Title', - 'tax_rate' => [ + 'tax_rate' => [ 'name' => 'Tax Rate Name', 'type' => 'Tax Type', 'rate' => 'Tax Rate', - ] + ], ], ]; diff --git a/resources/lang/es/address.php b/resources/lang/es/address.php index fb4b51c0..476335bd 100644 --- a/resources/lang/es/address.php +++ b/resources/lang/es/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Editar dirección', - 'name' => 'Nombre', - 'phone' => 'número de teléfono', + 'index' => 'Editar dirección', + 'name' => 'Nombre', + 'phone' => 'número de teléfono', 'country_id' => 'Identificación del país', - 'zone' => 'provincia', - 'zone_id' => 'Identificación de la provincia', - 'address_1' => 'Dirección 1', - 'address_2' => 'dirección 2', - 'address' => 'Dirección', + 'zone' => 'provincia', + 'zone_id' => 'Identificación de la provincia', + 'address_1' => 'Dirección 1', + 'address_2' => 'dirección 2', + 'address' => 'Dirección', 'enter_city' => 'ingresa la direccion', - 'post_code' => 'codigo postal', - 'default' => 'dirección predeterminada', + 'post_code' => 'codigo postal', + 'default' => 'dirección predeterminada', ]; diff --git a/resources/lang/es/admin/admin_roles.php b/resources/lang/es/admin/admin_roles.php index c36e72f0..8c8be3e7 100644 --- a/resources/lang/es/admin/admin_roles.php +++ b/resources/lang/es/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => 'Comprobar todo', - 'unselect_all' => 'desmarcar', - 'role_name' => 'Nombre de rol', + 'select_all' => 'Comprobar todo', + 'unselect_all' => 'desmarcar', + 'role_name' => 'Nombre de rol', 'role_management' => 'gestión de roles', - 'permission' => 'permiso', - 'error_roles' => 'Seleccione al menos un rol', + 'permission' => 'permiso', + 'error_roles' => 'Seleccione al menos un rol', ]; diff --git a/resources/lang/es/admin/attribute.php b/resources/lang/es/admin/attribute.php index 9897d739..caf7de8c 100644 --- a/resources/lang/es/admin/attribute.php +++ b/resources/lang/es/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'atributo', - 'attribute_info' => 'información del atributo', - 'create_at' => 'crear atributo', - 'attribute_value' => 'valor de atributo', - 'set_attribute' => 'atributo de configuración', - 'add_attribute' => 'agregar valor de atributo', + 'index' => 'atributo', + 'attribute_info' => 'información del atributo', + 'create_at' => 'crear atributo', + 'attribute_value' => 'valor de atributo', + 'set_attribute' => 'atributo de configuración', + 'add_attribute' => 'agregar valor de atributo', 'before_attribute' => 'Seleccione primero el atributo de la izquierda', - 'btn_at' => 'Ir ahora', - 'btn_later' => 'más tarde', - 'to_info_values' => 'Por favor, vaya a la página de detalles para editar los valores de los atributos', + 'btn_at' => 'Ir ahora', + 'btn_later' => 'más tarde', + 'to_info_values' => 'Por favor, vaya a la página de detalles para editar los valores de los atributos', ]; diff --git a/resources/lang/es/admin/attribute_groups.php b/resources/lang/es/admin/attribute_groups.php index 26f7ac18..d6f1d0ef 100644 --- a/resources/lang/es/admin/attribute_groups.php +++ b/resources/lang/es/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => 'grupo de atributos', + 'index' => 'grupo de atributos', 'create_at_groups' => 'crear grupo de atributos', ]; diff --git a/resources/lang/es/admin/brand.php b/resources/lang/es/admin/brand.php index 1ec9dacf..b3816dfb 100644 --- a/resources/lang/es/admin/brand.php +++ b/resources/lang/es/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => 'marca', + 'index' => 'marca', - 'brands_index' => 'lista de marcas', + 'brands_index' => 'lista de marcas', 'brands_create' => 'crear una marca', - 'brands_show' => 'Detalles de la marca', + 'brands_show' => 'Detalles de la marca', 'brands_update' => 'Actualizar la marca', 'brands_delete' => 'quitar marca', - 'error_upload' => 'por favor cargue el icono' + 'error_upload' => 'por favor cargue el icono', ]; diff --git a/resources/lang/es/admin/builder.php b/resources/lang/es/admin/builder.php index 7210707a..d69f3e19 100644 --- a/resources/lang/es/admin/builder.php +++ b/resources/lang/es/admin/builder.php @@ -11,242 +11,242 @@ */ return [ - 'heading_title' => 'edición de página', - 'modules_instructions' => 'Módulos disponibles, haga clic para agregar a la página', - 'text_floor_prompt' => 'Configuración (la configuración del piso debe guardarse y actualizarse para actualizar la página)', - 'text_new_page' => 'Agregar una nueva página', - 'text_quit' => 'abandonar', - 'text_save' => 'ahorrar', - 'text_view_page' => 'Ver página', - 'text_module' => 'módulo', - 'text_module_title' => 'título del módulo', - 'text_menu' => 'Navegación', - 'text_drag_sort' => 'Ordenar arrastrando', - 'text_set_up' => 'instalar', - 'text_delete' => 'Eliminar', - 'text_floor' => 'piso', - 'text_add_module' => 'Agregar módulo', - 'text_to_menu' => 'Editar menú de navegación', - 'text_other' => 'otro', - 'text_preparing' => 'Preparando...', - 'text_floor_setting' => 'configuración de suelo', - 'text_background_color' => 'color de fondo', - 'text_sure' => 'OK', - 'text_page_name' => 'Ingrese un nuevo nombre de página', - 'text_is_save' => '¡Asegúrese de que se hayan guardado los datos de la página actual! ', - 'text_pop_ads' => 'anuncios emergentes', - 'text_style_setting' => 'configuración de estilo', - 'text_is_save_data' => 'Antes de cambiar de página, asegúrese de que se hayan guardado los datos de la página actual. ', - 'text_hint' => 'insinuación', - 'text_cancel' => 'Cancelar', - 'text_created_success' => 'página creada con éxito', - 'text_html_none' => 'Error al cargar el módulo, ¡los datos HTML están vacíos! ', - 'text_is_delete' => 'OK para borrar', - 'text_enable' => 'habilitar', - 'text_set_title' => 'Título de la configuración', - 'text_set_subtitle' => 'Configurar subtítulo', - 'text_suggested_size' => 'Tamaño sugerido (ancho x alto): ', - 'text_word' => 'texto', - 'text_add_pictures' => 'Agregar imágenes', - 'text_refresh_cookie' => 'Actualizar cookie', - 'text_popup_hint' => 'Nota: el clic del usuario para cerrar ya no se mostrará hasta que el navegador se cierre y se vuelva a abrir. Para pruebas locales, puede hacer clic en "Actualizar cookie", luego actualizar el navegador y la ventana emergente se puede activar nuevamente. ', - 'text_cookie_refresh_success' => 'Cookie actualizada correctamente, actualice el navegador para ver el contenido de la ventana emergente. ', - 'text_add_hot_links' => 'Agregar enlaces de búsqueda activa', - 'text_add' => 'añadir', - 'text_margin_top' => 'Relleno del módulo - arriba', - 'text_margin_bottom' => 'relleno del módulo - parte inferior', - 'text_file_manager' => 'administrador de archivos', - 'modules_link' => 'enlace', - 'modules_choose_link' => 'Elegir enlace', - 'text_select_link' => 'Seleccione la página del enlace a la que desea saltar', - 'text_no' => 'no', - 'text_search' => 'busqueda', - 'text_is_newpage' => 'Si se abre una nueva ventana:', - 'text_manage' => 'Administración', - 'text_title_cover' => 'Título (cubre el nombre del enlace seleccionado a continuación)', - 'text_enter_link' => 'Por favor ingrese la dirección del enlace', - 'text_states' => 'estado', - 'text_disable' => 'desactivado', - 'text_no_data' => 'Los datos no existen o han sido eliminados', - 'text_to_add' => 'añadir', - 'text_category' => 'categoría', - 'text_information' => 'página de información', - 'text_manufacturer' => 'marca', - 'text_static' => 'conexión fija', - 'text_custom' => 'personalizado', - 'text_top_text' => 'Texto superior', - 'text_edit_page_name' => 'modificar nombre de página', - 'text_page_name_no' => 'El nombre no puede estar vacío', - 'custom_name' => 'nombre personalizado', + 'heading_title' => 'edición de página', + 'modules_instructions' => 'Módulos disponibles, haga clic para agregar a la página', + 'text_floor_prompt' => 'Configuración (la configuración del piso debe guardarse y actualizarse para actualizar la página)', + 'text_new_page' => 'Agregar una nueva página', + 'text_quit' => 'abandonar', + 'text_save' => 'ahorrar', + 'text_view_page' => 'Ver página', + 'text_module' => 'módulo', + 'text_module_title' => 'título del módulo', + 'text_menu' => 'Navegación', + 'text_drag_sort' => 'Ordenar arrastrando', + 'text_set_up' => 'instalar', + 'text_delete' => 'Eliminar', + 'text_floor' => 'piso', + 'text_add_module' => 'Agregar módulo', + 'text_to_menu' => 'Editar menú de navegación', + 'text_other' => 'otro', + 'text_preparing' => 'Preparando...', + 'text_floor_setting' => 'configuración de suelo', + 'text_background_color' => 'color de fondo', + 'text_sure' => 'OK', + 'text_page_name' => 'Ingrese un nuevo nombre de página', + 'text_is_save' => '¡Asegúrese de que se hayan guardado los datos de la página actual! ', + 'text_pop_ads' => 'anuncios emergentes', + 'text_style_setting' => 'configuración de estilo', + 'text_is_save_data' => 'Antes de cambiar de página, asegúrese de que se hayan guardado los datos de la página actual. ', + 'text_hint' => 'insinuación', + 'text_cancel' => 'Cancelar', + 'text_created_success' => 'página creada con éxito', + 'text_html_none' => 'Error al cargar el módulo, ¡los datos HTML están vacíos! ', + 'text_is_delete' => 'OK para borrar', + 'text_enable' => 'habilitar', + 'text_set_title' => 'Título de la configuración', + 'text_set_subtitle' => 'Configurar subtítulo', + 'text_suggested_size' => 'Tamaño sugerido (ancho x alto): ', + 'text_word' => 'texto', + 'text_add_pictures' => 'Agregar imágenes', + 'text_refresh_cookie' => 'Actualizar cookie', + 'text_popup_hint' => 'Nota: el clic del usuario para cerrar ya no se mostrará hasta que el navegador se cierre y se vuelva a abrir. Para pruebas locales, puede hacer clic en "Actualizar cookie", luego actualizar el navegador y la ventana emergente se puede activar nuevamente. ', + 'text_cookie_refresh_success' => 'Cookie actualizada correctamente, actualice el navegador para ver el contenido de la ventana emergente. ', + 'text_add_hot_links' => 'Agregar enlaces de búsqueda activa', + 'text_add' => 'añadir', + 'text_margin_top' => 'Relleno del módulo - arriba', + 'text_margin_bottom' => 'relleno del módulo - parte inferior', + 'text_file_manager' => 'administrador de archivos', + 'modules_link' => 'enlace', + 'modules_choose_link' => 'Elegir enlace', + 'text_select_link' => 'Seleccione la página del enlace a la que desea saltar', + 'text_no' => 'no', + 'text_search' => 'busqueda', + 'text_is_newpage' => 'Si se abre una nueva ventana:', + 'text_manage' => 'Administración', + 'text_title_cover' => 'Título (cubre el nombre del enlace seleccionado a continuación)', + 'text_enter_link' => 'Por favor ingrese la dirección del enlace', + 'text_states' => 'estado', + 'text_disable' => 'desactivado', + 'text_no_data' => 'Los datos no existen o han sido eliminados', + 'text_to_add' => 'añadir', + 'text_category' => 'categoría', + 'text_information' => 'página de información', + 'text_manufacturer' => 'marca', + 'text_static' => 'conexión fija', + 'text_custom' => 'personalizado', + 'text_top_text' => 'Texto superior', + 'text_edit_page_name' => 'modificar nombre de página', + 'text_page_name_no' => 'El nombre no puede estar vacío', + 'custom_name' => 'nombre personalizado', // Conexión fija - 'text_static_product_latest' => 'Último producto', - 'text_static_product_special' => 'producto especial', - 'text_static_product_manufacturer' => 'área de la marca', - 'text_static_account_account' => 'Centro de miembros', - 'text_static_account_order' => 'orden histórico', - 'text_static_account_wishlist' => 'Lista de favoritos', - 'text_static_affiliate_login' => 'miembro afiliado', - 'text_static_account_newsletter' => 'Suscribir consulta', - 'text_static_information_contact' => 'Contáctenos', - 'text_static_information_sitemap' => 'Mapa del sitio', - 'text_static_information_faq' => 'Preguntas frecuentes', - 'text_static_account_voucher' => 'vale regalo', - 'text_static_account_login' => 'Iniciar sesión', - 'text_static_account_register' => 'Registrarse', - 'text_static_checkout_cart' => 'carrito de compras', - 'text_static_blog_home' => 'blog', + 'text_static_product_latest' => 'Último producto', + 'text_static_product_special' => 'producto especial', + 'text_static_product_manufacturer' => 'área de la marca', + 'text_static_account_account' => 'Centro de miembros', + 'text_static_account_order' => 'orden histórico', + 'text_static_account_wishlist' => 'Lista de favoritos', + 'text_static_affiliate_login' => 'miembro afiliado', + 'text_static_account_newsletter' => 'Suscribir consulta', + 'text_static_information_contact' => 'Contáctenos', + 'text_static_information_sitemap' => 'Mapa del sitio', + 'text_static_information_faq' => 'Preguntas frecuentes', + 'text_static_account_voucher' => 'vale regalo', + 'text_static_account_login' => 'Iniciar sesión', + 'text_static_account_register' => 'Registrarse', + 'text_static_checkout_cart' => 'carrito de compras', + 'text_static_blog_home' => 'blog', - 'text_edit_product' => 'Editar detalles del producto', - 'text_edit_home' => 'Editar inicio', - 'text_edit_mb_home' => 'Editar página de inicio móvil', - 'text_footer_edit' => 'Editar pie de página', - 'text_header_edit' => 'Editar encabezado', - 'text_save_refresh' => 'Guardar y actualizar', - 'text_save_refresh_header' => 'Guardar (encabezado de actualización)', - 'text_service_icon' => 'icono de servicio', - 'text_describe' => 'descriptor', - 'text_add_link' => 'Añadir enlace', - 'text_is_btn' => 'si mostrar el botón', - 'text_phone' => 'Teléfono', - 'text_address' => 'Dirección', - 'text_email' => 'Correo', - 'text_copyright' => 'derechos de autor/imagen', - 'text_yq_link' => 'Enlace de amistad', - 'text_link_bar' => 'barra de enlaces', - 'text_introduce' => 'Introducción', - 'text_up_logo' => 'Subir logotipo', - 'text_hot_keywords' => 'palabras clave de búsqueda activa', - 'text_title' => 'título', - 'text_text_notific' => 'notificación de texto', - 'text_only_home' => 'Solo se muestra en la página de inicio', - 'text_background_color' => 'color de fondo', - 'text_font_color' => 'color de fuente', - 'text_image' => 'imagen', - 'text_show' => 'mostrar', - 'text_is_phone' => 'Mostrar número de teléfono de contacto', - 'text_half_angle' => 'Usar comas de medio ancho para separar', - 'text_prompt_words' => 'texto de indicación', - 'text_search_bar' => 'barra de búsqueda', - 'text_btn_text' => 'texto del botón', - 'text_banner_ad' => 'banner publicitario', - 'text_l_c' => 'columna de idioma/moneda', - 'text_top_color' => 'Color superior', - 'text_title_color' => 'color del título', - 'text_color' => 'color', - 'text_left_text' => 'texto izquierdo', - 'text_right_icon' => 'icono de pago derecho', - 'text_bgi' => 'imagen de fondo', - 'text_btn' => 'botón', + 'text_edit_product' => 'Editar detalles del producto', + 'text_edit_home' => 'Editar inicio', + 'text_edit_mb_home' => 'Editar página de inicio móvil', + 'text_footer_edit' => 'Editar pie de página', + 'text_header_edit' => 'Editar encabezado', + 'text_save_refresh' => 'Guardar y actualizar', + 'text_save_refresh_header' => 'Guardar (encabezado de actualización)', + 'text_service_icon' => 'icono de servicio', + 'text_describe' => 'descriptor', + 'text_add_link' => 'Añadir enlace', + 'text_is_btn' => 'si mostrar el botón', + 'text_phone' => 'Teléfono', + 'text_address' => 'Dirección', + 'text_email' => 'Correo', + 'text_copyright' => 'derechos de autor/imagen', + 'text_yq_link' => 'Enlace de amistad', + 'text_link_bar' => 'barra de enlaces', + 'text_introduce' => 'Introducción', + 'text_up_logo' => 'Subir logotipo', + 'text_hot_keywords' => 'palabras clave de búsqueda activa', + 'text_title' => 'título', + 'text_text_notific' => 'notificación de texto', + 'text_only_home' => 'Solo se muestra en la página de inicio', + 'text_background_color' => 'color de fondo', + 'text_font_color' => 'color de fuente', + 'text_image' => 'imagen', + 'text_show' => 'mostrar', + 'text_is_phone' => 'Mostrar número de teléfono de contacto', + 'text_half_angle' => 'Usar comas de medio ancho para separar', + 'text_prompt_words' => 'texto de indicación', + 'text_search_bar' => 'barra de búsqueda', + 'text_btn_text' => 'texto del botón', + 'text_banner_ad' => 'banner publicitario', + 'text_l_c' => 'columna de idioma/moneda', + 'text_top_color' => 'Color superior', + 'text_title_color' => 'color del título', + 'text_color' => 'color', + 'text_left_text' => 'texto izquierdo', + 'text_right_icon' => 'icono de pago derecho', + 'text_bgi' => 'imagen de fondo', + 'text_btn' => 'botón', // page - 'page_product_title_size' => 'Tamaño de fuente del título del producto', - 'page_product_title_color' => 'Color del título del producto', - 'page_product_price_color' => 'Color del precio del producto', - 'page_product_thumb_position' => 'posición de la miniatura', - 'page_product_image' => 'imagen del producto', - 'page_product_bottom' => 'abajo', - 'page_product_left' => 'lado izquierdo', - 'page_product_magnifying_style' => 'estilo de lupa', - 'page_product_magnifying_window' => 'ventana externa', - 'page_product_magnifying_inner' => 'suspensión interna', - 'page_product_magnifying_lens' => 'lupa interna', - 'page_product_share' => 'Compartir', - 'page_product_share_code' => 'Compartir código', - 'page_product_general_settings' => 'Configuración general', - 'page_product_font_size' => 'tamaño de fuente', + 'page_product_title_size' => 'Tamaño de fuente del título del producto', + 'page_product_title_color' => 'Color del título del producto', + 'page_product_price_color' => 'Color del precio del producto', + 'page_product_thumb_position' => 'posición de la miniatura', + 'page_product_image' => 'imagen del producto', + 'page_product_bottom' => 'abajo', + 'page_product_left' => 'lado izquierdo', + 'page_product_magnifying_style' => 'estilo de lupa', + 'page_product_magnifying_window' => 'ventana externa', + 'page_product_magnifying_inner' => 'suspensión interna', + 'page_product_magnifying_lens' => 'lupa interna', + 'page_product_share' => 'Compartir', + 'page_product_share_code' => 'Compartir código', + 'page_product_general_settings' => 'Configuración general', + 'page_product_font_size' => 'tamaño de fuente', // ModuleS List - 'modules_photo_text' => 'mezcla de imagen y texto', - 'modules_video_module' => 'módulo de vídeo', - 'modules_customer_reviews' => 'opiniones de clientes', - 'modules_images_link' => 'enlace multiimagen', - 'modules_background_icon_text' => 'texto del icono de fondo', - 'modules_slideshow_category' => 'categoría de presentación de diapositivas', - 'modules_bargain' => 'ganga', - 'modules_bestseller' => 'Superventas', - 'modules_blog' => 'blog', - 'modules_carousel' => 'Ícono de Swing Bo', - 'modules_category' => 'módulo de categoría', - 'modules_coupon' => 'cupon', - 'modules_flash_sale' => 'Pico de materias primas', - 'modules_group_buying' => 'grupo de compra', - 'modules_html' => 'texto enriquecido', - 'modules_icon_text' => 'icono de texto', - 'modules_image_100' => 'Módulo de imagen única', - 'modules_image_200' => 'una línea dos imágenes', - 'modules_image_300' => 'una línea tres imágenes', - 'modules_image_301' => 'una línea tres imágenes-pro', - 'modules_image_400' => 'una línea cuatro imágenes', - 'modules_image_401' => 'una línea cuatro imágenes-pro', - 'modules_latest' => 'último producto', - 'modules_manufacturer' => 'lista de marcas', - 'modulos_producto' => 'producto', - 'modules_product_tab' => 'ficha productos', - 'modules_slideshow' => 'presentación de diapositivas', - 'modules_quantity' => 'Mostrar límite de cantidad', - 'modules_manage_bargain' => 'Administrar artículos de negociación', - 'modules_manage_blog' => 'Blog de Gestión', - 'modules_no_blog' => 'No hay artículos, vaya a [Administración de contenido -> Administración de blogs] para configurar los artículos. ', - 'modules_slides_per_view' => 'Número de visualización de una pantalla', - 'modules_enter_content' => 'Por favor ingrese el contenido', - 'modules_full_screen' => 'Si pantalla completa', - 'modules_content' => 'contenido', - 'modules_edit_content' => 'editar contenido', - 'modules_select_image' => 'seleccionar imagen', - 'modules_quantity_line' => 'una línea muestra varias', - 'modules_please_choose' => 'por favor elige', - 'modules_choose' => 'elegir', - 'modules_add_category' => 'Añadir categoría', - 'modules_choose_category' => 'Elegir categoría', - 'modules_set_coupon' => 'Configuración de cupones', - 'modules_no_coupon' => 'Sin datos de cupón', - 'modules_manage_flash' => 'Gestionar productos de punta', - 'modules_manage_group' => 'Gestionar productos de grupo', - 'modules_no_state' => 'El módulo actual no está habilitado o configurado, vaya al fondo [administración de módulos] para configurar este módulo. ', - 'modules_grid_mode' => 'modo de cuadrícula', - 'modules_more_link' => 'más enlaces', - 'modules_choose_brand' => 'Elige una marca', - 'modules_set_product' => 'Configurar productos', - 'modules_keywords_search' => 'Ingrese la palabra clave de búsqueda', - 'modules_test_name' => 'nombre de prueba', - 'modules_please_products' => 'agregue productos', - 'modules_image_size' => 'tamaño de imagen', - 'modules_height' => 'alto', - 'modules_width' => 'ancho', - 'modules_category_style' => 'estilo de visualización de categoría', - 'modules_down' => 'abajo', - 'modules_left' => 'izquierda', - 'modules_category_no' => 'No categorizar', - 'modules_review_name' => 'nombre', - 'modules_profession' => 'profesional', - 'modules_video_cover' => 'portada de vídeo', - 'modules_video' => 'video', + 'modules_photo_text' => 'mezcla de imagen y texto', + 'modules_video_module' => 'módulo de vídeo', + 'modules_customer_reviews' => 'opiniones de clientes', + 'modules_images_link' => 'enlace multiimagen', + 'modules_background_icon_text' => 'texto del icono de fondo', + 'modules_slideshow_category' => 'categoría de presentación de diapositivas', + 'modules_bargain' => 'ganga', + 'modules_bestseller' => 'Superventas', + 'modules_blog' => 'blog', + 'modules_carousel' => 'Ícono de Swing Bo', + 'modules_category' => 'módulo de categoría', + 'modules_coupon' => 'cupon', + 'modules_flash_sale' => 'Pico de materias primas', + 'modules_group_buying' => 'grupo de compra', + 'modules_html' => 'texto enriquecido', + 'modules_icon_text' => 'icono de texto', + 'modules_image_100' => 'Módulo de imagen única', + 'modules_image_200' => 'una línea dos imágenes', + 'modules_image_300' => 'una línea tres imágenes', + 'modules_image_301' => 'una línea tres imágenes-pro', + 'modules_image_400' => 'una línea cuatro imágenes', + 'modules_image_401' => 'una línea cuatro imágenes-pro', + 'modules_latest' => 'último producto', + 'modules_manufacturer' => 'lista de marcas', + 'modulos_producto' => 'producto', + 'modules_product_tab' => 'ficha productos', + 'modules_slideshow' => 'presentación de diapositivas', + 'modules_quantity' => 'Mostrar límite de cantidad', + 'modules_manage_bargain' => 'Administrar artículos de negociación', + 'modules_manage_blog' => 'Blog de Gestión', + 'modules_no_blog' => 'No hay artículos, vaya a [Administración de contenido -> Administración de blogs] para configurar los artículos. ', + 'modules_slides_per_view' => 'Número de visualización de una pantalla', + 'modules_enter_content' => 'Por favor ingrese el contenido', + 'modules_full_screen' => 'Si pantalla completa', + 'modules_content' => 'contenido', + 'modules_edit_content' => 'editar contenido', + 'modules_select_image' => 'seleccionar imagen', + 'modules_quantity_line' => 'una línea muestra varias', + 'modules_please_choose' => 'por favor elige', + 'modules_choose' => 'elegir', + 'modules_add_category' => 'Añadir categoría', + 'modules_choose_category' => 'Elegir categoría', + 'modules_set_coupon' => 'Configuración de cupones', + 'modules_no_coupon' => 'Sin datos de cupón', + 'modules_manage_flash' => 'Gestionar productos de punta', + 'modules_manage_group' => 'Gestionar productos de grupo', + 'modules_no_state' => 'El módulo actual no está habilitado o configurado, vaya al fondo [administración de módulos] para configurar este módulo. ', + 'modules_grid_mode' => 'modo de cuadrícula', + 'modules_more_link' => 'más enlaces', + 'modules_choose_brand' => 'Elige una marca', + 'modules_set_product' => 'Configurar productos', + 'modules_keywords_search' => 'Ingrese la palabra clave de búsqueda', + 'modules_test_name' => 'nombre de prueba', + 'modules_please_products' => 'agregue productos', + 'modules_image_size' => 'tamaño de imagen', + 'modules_height' => 'alto', + 'modules_width' => 'ancho', + 'modules_category_style' => 'estilo de visualización de categoría', + 'modules_down' => 'abajo', + 'modules_left' => 'izquierda', + 'modules_category_no' => 'No categorizar', + 'modules_review_name' => 'nombre', + 'modules_profession' => 'profesional', + 'modules_video_cover' => 'portada de vídeo', + 'modules_video' => 'video', // mobile - 'mobile_search' => 'barra de búsqueda', - 'mobile_search_normal' => 'No fijo en la parte superior de la pantalla', - 'mobile_search_hide' => 'No mostrar la barra de búsqueda superior', - 'mobile_search_fixed' => 'fijo en la parte superior de la pantalla (predeterminado)', + 'mobile_search' => 'barra de búsqueda', + 'mobile_search_normal' => 'No fijo en la parte superior de la pantalla', + 'mobile_search_hide' => 'No mostrar la barra de búsqueda superior', + 'mobile_search_fixed' => 'fijo en la parte superior de la pantalla (predeterminado)', // Menu - 'main_menu' => 'menú principal', - 'please_add_data' => 'por favor agregue datos', - 'add_main_menu' => 'Agregar menú principal', - 'main_menu_name_link' => 'menú principal nombre/enlace', - 'main_menu_label' => 'Etiqueta del menú principal', - 'label_background_color' => 'color de fondo de la etiqueta', - 'label_text_color' => 'color del texto de la etiqueta', - 'submenu_group' => 'submenu (grupo)', - 'add_menu_group' => 'Añadir grupo de menú', - 'full_screen' => 'Si pantalla completa', - 'menú' => 'menú', - 'add_submenu_link' => 'Agregar enlace de submenú', - 'type' => 'tipo', + 'main_menu' => 'menú principal', + 'please_add_data' => 'por favor agregue datos', + 'add_main_menu' => 'Agregar menú principal', + 'main_menu_name_link' => 'menú principal nombre/enlace', + 'main_menu_label' => 'Etiqueta del menú principal', + 'label_background_color' => 'color de fondo de la etiqueta', + 'label_text_color' => 'color del texto de la etiqueta', + 'submenu_group' => 'submenu (grupo)', + 'add_menu_group' => 'Añadir grupo de menú', + 'full_screen' => 'Si pantalla completa', + 'menú' => 'menú', + 'add_submenu_link' => 'Agregar enlace de submenú', + 'type' => 'tipo', // footer - 'footer_edit' => 'editor de pie de página', - 'sub_title' => 'subtitular', - 'introduction' => 'Introducción', - 'copyright_settings' => 'Configuración de derechos de autor', + 'footer_edit' => 'editor de pie de página', + 'sub_title' => 'subtitular', + 'introduction' => 'Introducción', + 'copyright_settings' => 'Configuración de derechos de autor', ]; diff --git a/resources/lang/es/admin/category.php b/resources/lang/es/admin/category.php index a73da698..7650ec87 100644 --- a/resources/lang/es/admin/category.php +++ b/resources/lang/es/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Clasificación', - 'edit_category' => 'Editar categoria', - 'upper_category' => 'subtítulos', + 'index' => 'Clasificación', + 'edit_category' => 'Editar categoria', + 'upper_category' => 'subtítulos', - 'categories_index' => 'Lista de categoría', + 'categories_index' => 'Lista de categoría', 'categories_create' => 'Crear una taxonomía', - 'categories_show' => 'Detalles de la categoría', + 'categories_show' => 'Detalles de la categoría', 'categories_update' => 'Actualizar clasificación', 'categories_delete' => 'eliminar categoría', ]; diff --git a/resources/lang/es/admin/common.php b/resources/lang/es/admin/common.php index 33cde4c4..ecdc6f9d 100644 --- a/resources/lang/es/admin/common.php +++ b/resources/lang/es/admin/common.php @@ -10,65 +10,65 @@ */ return [ - 'admin_panel' => 'Gestión tras bambalinas', - 'edit' => 'editar', - 'status' => 'estado', - 'action' => 'funcionar', - 'install' => 'Instalar', - 'uninstall' => 'desinstalar', + 'admin_panel' => 'Gestión tras bambalinas', + 'edit' => 'editar', + 'status' => 'estado', + 'action' => 'funcionar', + 'install' => 'Instalar', + 'uninstall' => 'desinstalar', // errors - 'forbidden' => 'Sin acceso', - 'has_no_permission' => 'No tiene permiso para acceder a esta página, comuníquese con el administrador de su sistema.', + 'forbidden' => 'Sin acceso', + 'has_no_permission' => 'No tiene permiso para acceder a esta página, comuníquese con el administrador de su sistema.', // header - 'home' => 'Administrar Inicio', - 'order' => 'Gestión de pedidos', - 'rma' => 'Gestión del servicio postventa', - 'rma_reason' => 'Gestión de motivos de devolución', - 'product' => 'gestión de mercancías', - 'brand' => 'gestión de la marca', - 'category' => 'Gestión de clasificaciones', - 'customer_group' => 'Gestión de grupos de clientes', - 'customer' => 'gestión de clientes', - 'content' => 'Gestión de contenido', - 'setting' => 'ajustes del sistema', - 'plugin' => 'Gestión de complementos', - 'admin_user' => 'usuario de fondo', - 'admin_role' => 'rol del usuario', - 'region' => 'Agrupación regional', - 'tax_rate' => 'gestión de tipos impositivos', - 'tax_class' => 'gestión fiscal', - 'currency' => 'administración del dinero', - 'language' => 'manejo de idiomas', - 'zone' => 'Gestión de provincia', - 'country' => 'Administración del Estado', - 'file_manager' => 'administrador de archivos', - 'access_frontend' => 'Visita la recepción', + 'home' => 'Administrar Inicio', + 'order' => 'Gestión de pedidos', + 'rma' => 'Gestión del servicio postventa', + 'rma_reason' => 'Gestión de motivos de devolución', + 'product' => 'gestión de mercancías', + 'brand' => 'gestión de la marca', + 'category' => 'Gestión de clasificaciones', + 'customer_group' => 'Gestión de grupos de clientes', + 'customer' => 'gestión de clientes', + 'content' => 'Gestión de contenido', + 'setting' => 'ajustes del sistema', + 'plugin' => 'Gestión de complementos', + 'admin_user' => 'usuario de fondo', + 'admin_role' => 'rol del usuario', + 'region' => 'Agrupación regional', + 'tax_rate' => 'gestión de tipos impositivos', + 'tax_class' => 'gestión fiscal', + 'currency' => 'administración del dinero', + 'language' => 'manejo de idiomas', + 'zone' => 'Gestión de provincia', + 'country' => 'Administración del Estado', + 'file_manager' => 'administrador de archivos', + 'access_frontend' => 'Visita la recepción', // sidebar - 'settings_index' => 'ajustes del sistema', - 'admin_users_index' => 'usuario de fondo', - 'plugins_index' => 'Lista de complementos', - 'regions_index' => 'Agrupación regional', - 'tax_rates_index' => 'configuración de la tasa de impuestos', - 'tax_classes_index' => 'categoría fiscal', - 'currencies_index' => 'administración del dinero', - 'languages_index' => 'manejo de idiomas', - 'design_index' => 'Decoración hogareña', - 'pages_index' => 'página de información', - 'design_footer_index' => 'Decoración de pie de página', - 'design_menu_index' => 'Configuración de navegación', - 'categories_index' => 'Categorías', - 'products_index' => 'gestión de mercancías', - 'products_trashed' => 'papelera de reciclaje', - 'customers_trashed' => 'papelera de reciclaje', - 'brands_index' => 'producto de marca', - 'orders_index' => 'Lista de orden', - 'rmas_index' => 'Gestión postventa', - 'rma_reasons_index' => 'Motivo posventa', - 'customers_index' => 'Lista de clientes', + 'settings_index' => 'ajustes del sistema', + 'admin_users_index' => 'usuario de fondo', + 'plugins_index' => 'Lista de complementos', + 'regions_index' => 'Agrupación regional', + 'tax_rates_index' => 'configuración de la tasa de impuestos', + 'tax_classes_index' => 'categoría fiscal', + 'currencies_index' => 'administración del dinero', + 'languages_index' => 'manejo de idiomas', + 'design_index' => 'Decoración hogareña', + 'pages_index' => 'página de información', + 'design_footer_index' => 'Decoración de pie de página', + 'design_menu_index' => 'Configuración de navegación', + 'categories_index' => 'Categorías', + 'products_index' => 'gestión de mercancías', + 'products_trashed' => 'papelera de reciclaje', + 'customers_trashed' => 'papelera de reciclaje', + 'brands_index' => 'producto de marca', + 'orders_index' => 'Lista de orden', + 'rmas_index' => 'Gestión postventa', + 'rma_reasons_index' => 'Motivo posventa', + 'customers_index' => 'Lista de clientes', 'customer_groups_index' => 'grupo de clientes', - 'countries_index' => 'Administración del Estado', - 'zones_index' => 'Gestión de provincia', + 'countries_index' => 'Administración del Estado', + 'zones_index' => 'Gestión de provincia', ]; diff --git a/resources/lang/es/admin/country.php b/resources/lang/es/admin/country.php index 8560b08f..568f3797 100644 --- a/resources/lang/es/admin/country.php +++ b/resources/lang/es/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => 'Nombre del país', + 'country_name' => 'Nombre del país', - 'countries_index' => 'lista de países', + 'countries_index' => 'lista de países', 'countries_create' => 'crear un país', 'countries_update' => 'actualizar país', ]; diff --git a/resources/lang/es/admin/currency.php b/resources/lang/es/admin/currency.php index daff46d1..9b2abd4a 100644 --- a/resources/lang/es/admin/currency.php +++ b/resources/lang/es/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => 'Lista de monedas', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'Lista de monedas', 'currencies_create' => 'Crear moneda', - 'currencies_show' => 'Detalles de moneda', + 'currencies_show' => 'Detalles de moneda', 'currencies_update' => 'actualizar moneda', 'currencies_delete' => 'borrar moneda', ]; diff --git a/resources/lang/es/admin/customer.php b/resources/lang/es/admin/customer.php index cf922fce..7dec59e3 100644 --- a/resources/lang/es/admin/customer.php +++ b/resources/lang/es/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => 'Lista de clientes', - 'customers_create' => 'crear cliente', - 'customers_show' => 'Detalles del cliente', - 'customers_update' => 'actualizar cliente', - 'customers_delete' => 'borrar cliente', + 'customers_index' => 'Lista de clientes', + 'customers_create' => 'crear cliente', + 'customers_show' => 'Detalles del cliente', + 'customers_update' => 'actualizar cliente', + 'customers_delete' => 'borrar cliente', - 'user_info' => 'Información de usuario', - 'address_management' => 'gestión de direcciones', - 'user_name' => 'nombre de usuario', - 'password_info' => 'Déjelo en blanco para mantener la contraseña original sin cambios', - 'add_address' => 'Añadir dirección', - 'no_address' => 'La cuenta corriente no tiene dirección', - 'edit_address' => 'Editar dirección', - 'address' => 'Dirección', - 'choose_country' => 'Elige un país', - 'zones' => 'provincia', - 'choose_zones' => 'seleccionar provincia', - 'enter_city' => 'entrar en la ciudad', - 'city' => 'Ciudad', - 'zipcode' => 'codigo postal', - 'address_1' => 'Dirección detallada 1', - 'address_2' => 'Dirección detallada 2', + 'user_info' => 'Información de usuario', + 'address_management' => 'gestión de direcciones', + 'user_name' => 'nombre de usuario', + 'password_info' => 'Déjelo en blanco para mantener la contraseña original sin cambios', + 'add_address' => 'Añadir dirección', + 'no_address' => 'La cuenta corriente no tiene dirección', + 'edit_address' => 'Editar dirección', + 'address' => 'Dirección', + 'choose_country' => 'Elige un país', + 'zones' => 'provincia', + 'choose_zones' => 'seleccionar provincia', + 'enter_city' => 'entrar en la ciudad', + 'city' => 'Ciudad', + 'zipcode' => 'codigo postal', + 'address_1' => 'Dirección detallada 1', + 'address_2' => 'Dirección detallada 2', - 'cannot_delete_root' => 'No se puede eliminar la cuenta raíz', - 'error_email' => 'Ingrese el formato de correo electrónico correcto', + 'cannot_delete_root' => 'No se puede eliminar la cuenta raíz', + 'error_email' => 'Ingrese el formato de correo electrónico correcto', 'confirm_delete_address' => '¿Está seguro de que desea eliminar la dirección?', ]; diff --git a/resources/lang/es/admin/customer_group.php b/resources/lang/es/admin/customer_group.php index 4ac73e0a..82d33a36 100644 --- a/resources/lang/es/admin/customer_group.php +++ b/resources/lang/es/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'grupo de clientes', - 'consumption_limit' => 'límite de consumo', - 'discount_rate' => 'Tasa de descuento', - 'reward_points_factor' => 'Factor de puntos de recompensa', - 'integral_factor' => 'Usa el factor integral', + 'index' => 'grupo de clientes', + 'consumption_limit' => 'límite de consumo', + 'discount_rate' => 'Tasa de descuento', + 'reward_points_factor' => 'Factor de puntos de recompensa', + 'integral_factor' => 'Usa el factor integral', - 'customer_groups_index' => 'lista de grupos de clientes', + 'customer_groups_index' => 'lista de grupos de clientes', 'customer_groups_create' => 'Crear grupo de clientes', - 'customer_groups_show' => 'Detalles del grupo de clientes', + 'customer_groups_show' => 'Detalles del grupo de clientes', 'customer_groups_update' => 'Actualizar grupo de clientes', 'customer_groups_delete' => 'eliminar grupo de clientes', - 'default_cannot_delete' => 'El grupo de clientes predeterminado no se puede eliminar', + 'default_cannot_delete' => 'El grupo de clientes predeterminado no se puede eliminar', ]; diff --git a/resources/lang/es/admin/dashboard.php b/resources/lang/es/admin/dashboard.php index 3d9e5d5a..a6ba4d03 100644 --- a/resources/lang/es/admin/dashboard.php +++ b/resources/lang/es/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => 'Visitas de usuarios', - 'order_total' => 'Volumen de pedidos', - 'customer_new' => 'Usuarios nuevos', - 'order_amount' => 'Ventas', - 'yesterday' => 'el dia de ayer', - 'day_before' => 'que el día anterior', + 'order_total' => 'Volumen de pedidos', + 'customer_new' => 'Usuarios nuevos', + 'order_amount' => 'Ventas', + 'yesterday' => 'el dia de ayer', + 'day_before' => 'que el día anterior', - 'order_report' => 'Estadísticas de pedidos', - 'latest_month' => 'un mes', - 'latest_week' => 'una semana', - 'latest_year' => 'un año', + 'order_report' => 'Estadísticas de pedidos', + 'latest_month' => 'un mes', + 'latest_week' => 'una semana', + 'latest_year' => 'un año', ]; diff --git a/resources/lang/es/admin/design_builder.php b/resources/lang/es/admin/design_builder.php index de79709a..837b521e 100644 --- a/resources/lang/es/admin/design_builder.php +++ b/resources/lang/es/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'Módulo de marca', - 'module_banner' => 'Módulo de banner', + 'module_brand' => 'Módulo de marca', + 'module_banner' => 'Módulo de banner', 'module_four_image_pro' => 'Cuatro imágenes en una línea PRO', - 'module_slideshow' => 'módulo de presentación de diapositivas', - 'module_tab_products' => 'elemento de pestaña', + 'module_slideshow' => 'módulo de presentación de diapositivas', + 'module_tab_products' => 'elemento de pestaña', ]; diff --git a/resources/lang/es/admin/file_manager.php b/resources/lang/es/admin/file_manager.php index 9509c66c..8497a2fe 100644 --- a/resources/lang/es/admin/file_manager.php +++ b/resources/lang/es/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'crear directorio/archivo', - 'file_manager_show' => 'Ver directorio/archivo', - 'file_manager_update' => 'Rebautizar', - 'file_manager_delete' => 'eliminar directorio/archivo', + 'file_manager_create' => 'crear directorio/archivo', + 'file_manager_show' => 'Ver directorio/archivo', + 'file_manager_update' => 'Rebautizar', + 'file_manager_delete' => 'eliminar directorio/archivo', 'directory_already_exist' => 'el directorio ya existe', - 'directory_not_empty' => 'El directorio no está vacío', - 'target_not_exist' => 'El archivo o carpeta original no existe', - 'create_folder' => 'Crear carpeta', - 'rename' => 'Rebautizar', - 'download' => 'descargar', - 'upload_files' => 'subir archivos', - 'click_upload' => 'Haga clic en cargar o arrastre la imagen aquí', - 'image_uploading' => 'carga de imagen', - 'no_file' => 'ningún archivo', - 'picture_space' => 'espacio de imagen', - 'show_pc' => 'Por favor, vaya al lado de la PC para operar', + 'directory_not_empty' => 'El directorio no está vacío', + 'target_not_exist' => 'El archivo o carpeta original no existe', + 'create_folder' => 'Crear carpeta', + 'rename' => 'Rebautizar', + 'download' => 'descargar', + 'upload_files' => 'subir archivos', + 'click_upload' => 'Haga clic en cargar o arrastre la imagen aquí', + 'image_uploading' => 'carga de imagen', + 'no_file' => 'ningún archivo', + 'picture_space' => 'espacio de imagen', + 'show_pc' => 'Por favor, vaya al lado de la PC para operar', - 'confirm_delete_file' => '¿Quieres eliminar el archivo seleccionado?', - 'confirm_delete_folder' => 'La operación de eliminación de carpetas está en curso, se eliminarán todos los archivos de la carpeta, ¿quiere confirmar?', - 'new_folder' => 'nueva carpeta', - 'can_empty' => 'No puede estar vacío', - 'finish' => 'Finalizar', - 'uploading' => 'cargando', - 'file_manager' => 'Administrador de imágenes', + 'confirm_delete_file' => '¿Quieres eliminar el archivo seleccionado?', + 'confirm_delete_folder' => 'La operación de eliminación de carpetas está en curso, se eliminarán todos los archivos de la carpeta, ¿quiere confirmar?', + 'new_folder' => 'nueva carpeta', + 'can_empty' => 'No puede estar vacío', + 'finish' => 'Finalizar', + 'uploading' => 'cargando', + 'file_manager' => 'Administrador de imágenes', ]; diff --git a/resources/lang/es/admin/language.php b/resources/lang/es/admin/language.php index b1e4ea96..c56b81b5 100644 --- a/resources/lang/es/admin/language.php +++ b/resources/lang/es/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => 'Lista de idiomas', - 'languages_create' => 'crear lenguaje', - 'languages_show' => 'Detalles del idioma', - 'languages_update' => 'actualizar idioma', - 'languages_delete' => 'quitar idioma', + 'languages_index' => 'Lista de idiomas', + 'languages_create' => 'crear lenguaje', + 'languages_show' => 'Detalles del idioma', + 'languages_update' => 'actualizar idioma', + 'languages_delete' => 'quitar idioma', 'error_default_language_cannot_delete' => '¡No se puede eliminar el idioma predeterminado! ', - 'help_install' => 'Nota: Para instalar un nuevo idioma, debe configurar los productos, las categorías, la navegación, los módulos de la página de inicio, los pies de página, etc. del idioma correspondiente; de ​​lo contrario, se mostrará una página anormal', + 'help_install' => 'Nota: Para instalar un nuevo idioma, debe configurar los productos, las categorías, la navegación, los módulos de la página de inicio, los pies de página, etc. del idioma correspondiente; de ​​lo contrario, se mostrará una página anormal', ]; diff --git a/resources/lang/es/admin/login.php b/resources/lang/es/admin/login.php index e13b4834..c431fa1d 100644 --- a/resources/lang/es/admin/login.php +++ b/resources/lang/es/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => 'Iniciar sesión en el backend de BeikeShop', - 'log_in' => 'Iniciar sesión', + 'log_in' => 'Iniciar sesión', ]; diff --git a/resources/lang/es/admin/marketing.php b/resources/lang/es/admin/marketing.php index 5a695a7f..14208c6b 100644 --- a/resources/lang/es/admin/marketing.php +++ b/resources/lang/es/admin/marketing.php @@ -10,16 +10,16 @@ */ return [ - 'marketing_list' => 'mercado complementario', - 'marketing_show' => 'detalles del complemento', - 'set_token' => 'Establecer ficha', - 'get_token' => 'Obtener token', - 'download_count' => 'recuento de descargas', - 'last_update' => 'última actualización', - 'text_version' => 'versión', - 'text_compatibility' => 'compatibilidad', - 'text_author' => 'autor del complemento', - 'download_plugin' => 'descargar complemento', - 'download_description' => 'Descripción del complemento', - 'text_free' => 'gratis', + 'marketing_list' => 'mercado complementario', + 'marketing_show' => 'detalles del complemento', + 'set_token' => 'Establecer ficha', + 'get_token' => 'Obtener token', + 'download_count' => 'recuento de descargas', + 'last_update' => 'última actualización', + 'text_version' => 'versión', + 'text_compatibility' => 'compatibilidad', + 'text_author' => 'autor del complemento', + 'download_plugin' => 'descargar complemento', + 'download_description' => 'Descripción del complemento', + 'text_free' => 'gratis', ]; diff --git a/resources/lang/es/admin/order.php b/resources/lang/es/admin/order.php index f76319d7..6c7d358d 100644 --- a/resources/lang/es/admin/order.php +++ b/resources/lang/es/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => 'Lista de orden', + 'list' => 'Lista de orden', - 'order_quantity' => 'cantidad de pedido', - 'order_amount' => 'Total de la orden', - 'orders_index' => 'Lista de orden', - 'orders_create' => 'Crear orden', - 'orders_show' => 'detalles del pedido', - 'orders_export' => 'orden de exportación', - 'orders_update' => 'Orden de actualización', - 'orders_delete' => 'borrar pedido', - 'notificar' => 'Ya sea para recordar', + 'order_quantity' => 'cantidad de pedido', + 'order_amount' => 'Total de la orden', + 'orders_index' => 'Lista de orden', + 'orders_create' => 'Crear orden', + 'orders_show' => 'detalles del pedido', + 'orders_export' => 'orden de exportación', + 'orders_update' => 'Orden de actualización', + 'orders_delete' => 'borrar pedido', + 'notificar' => 'Ya sea para recordar', 'orders_update_status' => 'estado de actualización', - 'error_status' => 'Seleccione un estado', + 'error_status' => 'Seleccione un estado', ]; diff --git a/resources/lang/es/admin/page.php b/resources/lang/es/admin/page.php index ce54ce5a..1929351b 100644 --- a/resources/lang/es/admin/page.php +++ b/resources/lang/es/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'página de información', - 'info_title' => 'título de la información', + 'index' => 'página de información', + 'info_title' => 'título de la información', 'info_content' => 'contenido', - 'pages_index' => 'lista de una sola página', + 'pages_index' => 'lista de una sola página', 'pages_create' => 'Crear una sola página', - 'pages_show' => 'Detalles de una sola página', + 'pages_show' => 'Detalles de una sola página', 'pages_update' => 'edición de una sola página', - 'pages_delete' => 'eliminar una sola página' + 'pages_delete' => 'eliminar una sola página', ]; diff --git a/resources/lang/es/admin/plugin.php b/resources/lang/es/admin/plugin.php index fb787b32..e8e9dd3c 100644 --- a/resources/lang/es/admin/plugin.php +++ b/resources/lang/es/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => 'Lista de complementos', - 'plugins_import' => 'Subir complemento', - 'plugins_show' => 'Detalles del complemento', - 'plugins_update' => 'Actualización del complemento', + 'plugins_index' => 'Lista de complementos', + 'plugins_import' => 'Subir complemento', + 'plugins_show' => 'Detalles del complemento', + 'plugins_update' => 'Actualización del complemento', 'plugins_update_status' => 'estado de actualización', - 'plugins_install' => 'Instalar', - 'plugins_uninstall' => 'desinstalar', + 'plugins_install' => 'Instalar', + 'plugins_uninstall' => 'desinstalar', - 'plugin_list' => 'Lista de complementos', - 'plugin_code' => 'código de complemento', - 'plugin_type' => 'Tipo de complemento', - 'plugin_description' => 'Descripción del complemento', - 'plugin_upload' => 'Complemento de carga (solo se admiten archivos zip)', + 'plugin_list' => 'Lista de complementos', + 'plugin_code' => 'código de complemento', + 'plugin_type' => 'Tipo de complemento', + 'plugin_description' => 'Descripción del complemento', + 'plugin_upload' => 'Complemento de carga (solo se admiten archivos zip)', - 'shipping' => 'Método de entrega', - 'payment' => 'método de pago', - 'total' => 'Cálculo de pedidos', - 'view' => 'modificación de página', + 'shipping' => 'Método de entrega', + 'payment' => 'método de pago', + 'total' => 'Cálculo de pedidos', + 'view' => 'modificación de página', ]; diff --git a/resources/lang/es/admin/product.php b/resources/lang/es/admin/product.php index 00d60759..1f3beeb3 100644 --- a/resources/lang/es/admin/product.php +++ b/resources/lang/es/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => 'Lista de productos', - 'products_create' => 'crear un elemento', - 'products_show' => 'Detalles de producto', - 'products_update' => 'actualizar elemento', - 'products_delete' => 'Eliminar elemento', - 'products_trashed' => 'papelera de reciclaje', - 'products_restore' => 'restaurar papelera de reciclaje', - 'clear_restore' => 'Vaciar papelera de reciclaje', + 'products_index' => 'Lista de productos', + 'products_create' => 'crear un elemento', + 'products_show' => 'Detalles de producto', + 'products_update' => 'actualizar elemento', + 'products_delete' => 'Eliminar elemento', + 'products_trashed' => 'papelera de reciclaje', + 'products_restore' => 'restaurar papelera de reciclaje', + 'clear_restore' => 'Vaciar papelera de reciclaje', + 'batch_delete' => 'eliminación por lotes', + 'batch_active' => 'estantes a granel', + 'batch_inactive' => 'A granel fuera de los estantes', - 'batch_delete' => 'eliminación por lotes', - 'batch_active' => 'estantes a granel', - 'batch_inactive' => 'A granel fuera de los estantes', + 'basic_information' => 'información básica', + 'product_details' => 'Detalles de producto', + 'product_relations' => 'bienes relacionados', + 'stocks' => 'Existencias de materias primas', + 'model' => 'modelo', + 'price' => 'precio', + 'origin_price' => 'precio original', + 'cost_price' => 'precio de coste', + 'quantity' => 'cantidad', + 'enable_multi_spec' => 'Habilitar múltiples especificaciones', + 'image_help' => 'La primera imagen se utilizará como imagen principal del producto, y se pueden cargar varias imágenes al mismo tiempo, y la posición de varias imágenes se puede ajustar a voluntad', + 'add_variable' => 'agregar especificaciones', + 'add_variable_value' => 'Agregar valor de especificación', + 'add_variable_image' => 'Agregar imagen de especificaciones', + 'default_main_product' => 'Producto principal predeterminado', + 'modify_order' => 'Haz doble clic para modificar, arrastra para ajustar el orden', - 'basic_information' => 'información básica', - 'product_details' => 'Detalles de producto', - 'product_relations' => 'bienes relacionados', - 'stocks' => 'Existencias de materias primas', - 'model' => 'modelo', - 'price' => 'precio', - 'origin_price' => 'precio original', - 'cost_price' => 'precio de coste', - 'quantity' => 'cantidad', - 'enable_multi_spec' => 'Habilitar múltiples especificaciones', - 'image_help' => 'La primera imagen se utilizará como imagen principal del producto, y se pueden cargar varias imágenes al mismo tiempo, y la posición de varias imágenes se puede ajustar a voluntad', - 'add_variable' => 'agregar especificaciones', - 'add_variable_value' => 'Agregar valor de especificación', - 'add_variable_image' => 'Agregar imagen de especificaciones', - 'default_main_product' => 'Producto principal predeterminado', - 'modify_order' => 'Haz doble clic para modificar, arrastra para ajustar el orden', - - 'confirm_batch_product' => '¿Está seguro de que desea eliminar los elementos seleccionados de forma masiva?', - 'confirm_batch_status' => '¿Está seguro de que desea editar en masa el estado de los elementos seleccionados?', - 'confirm_batch_restore' => '¿Está seguro de que desea restaurar el elemento seleccionado?', + 'confirm_batch_product' => '¿Está seguro de que desea eliminar los elementos seleccionados de forma masiva?', + 'confirm_batch_status' => '¿Está seguro de que desea editar en masa el estado de los elementos seleccionados?', + 'confirm_batch_restore' => '¿Está seguro de que desea restaurar el elemento seleccionado?', 'confirm_delete_restore' => '¿Está seguro de que desea vaciar la papelera de reciclaje?', ]; diff --git a/resources/lang/es/admin/region.php b/resources/lang/es/admin/region.php index 0bd81a2f..c156321c 100644 --- a/resources/lang/es/admin/region.php +++ b/resources/lang/es/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'grupo de área', - 'regions_index' => 'Lista de grupos de zonas', + 'index' => 'grupo de área', + 'regions_index' => 'Lista de grupos de zonas', 'regions_create' => 'Crear un grupo de zona', - 'regions_show' => 'Detalles del grupo de áreas', + 'regions_show' => 'Detalles del grupo de áreas', 'regions_update' => 'Actualizar grupo de zona', 'regions_delete' => 'eliminar grupo de campos', - 'name' => 'nombre', - 'describe' => 'describir', - 'country' => 'nación', - 'zone' => 'provincia', + 'name' => 'nombre', + 'describe' => 'describir', + 'country' => 'nación', + 'zone' => 'provincia', ]; diff --git a/resources/lang/es/admin/rma.php b/resources/lang/es/admin/rma.php index f6a39acd..ffc25112 100644 --- a/resources/lang/es/admin/rma.php +++ b/resources/lang/es/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'Aplicación postventa', + 'index' => 'Aplicación postventa', - 'rmas_index' => 'Lista de servicios postventa', - 'rmas_show' => 'Detalles del servicio postventa', - 'rmas_update' => 'Actualización del servicio postventa.', - 'rmas_delete' => 'eliminar servicio postventa', + 'rmas_index' => 'Lista de servicios postventa', + 'rmas_show' => 'Detalles del servicio postventa', + 'rmas_update' => 'Actualización del servicio postventa.', + 'rmas_delete' => 'eliminar servicio postventa', - 'customers_name' => 'nombre del cliente', - 'quantity' => 'cantidad', - 'service_type' => 'Tipo de servicio', - 'rma_details' => 'Detalles de la aplicación posventa', - 'reasons_return' => 'motivos de devolución', - 'current_state' => 'estado actual', - 'modify_status' => 'Modificar estado', - 'remarks' => 'observaciones', - 'update_status' => 'actualizar estado', + 'customers_name' => 'nombre del cliente', + 'quantity' => 'cantidad', + 'service_type' => 'Tipo de servicio', + 'rma_details' => 'Detalles de la aplicación posventa', + 'reasons_return' => 'motivos de devolución', + 'current_state' => 'estado actual', + 'modify_status' => 'Modificar estado', + 'remarks' => 'observaciones', + 'update_status' => 'actualizar estado', 'operation_history' => 'historial de operaciones', ]; diff --git a/resources/lang/es/admin/rma_reason.php b/resources/lang/es/admin/rma_reason.php index 80d319d3..5f3f258c 100644 --- a/resources/lang/es/admin/rma_reason.php +++ b/resources/lang/es/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => 'lista de razones', + 'rma_reasons_index' => 'lista de razones', 'rma_reasons_create' => 'motivo de creación', 'rma_reasons_update' => 'motivo de actualización', - 'rma_reasons_delete' => 'eliminar motivo' + 'rma_reasons_delete' => 'eliminar motivo', ]; diff --git a/resources/lang/es/admin/role.php b/resources/lang/es/admin/role.php index bd4fb859..01392494 100644 --- a/resources/lang/es/admin/role.php +++ b/resources/lang/es/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => 'lista de funciones', - 'admin_roles_create' => 'Crear roles', - 'admin_roles_show' => 'detalles de funciones', - 'admin_roles_update' => 'actualizar funciones', - 'admin_roles_delete' => 'eliminar rol', - 'select_one_at_least' => 'Los permisos no pueden estar vacíos, seleccione al menos uno' + 'admin_roles_index' => 'lista de funciones', + 'admin_roles_create' => 'Crear roles', + 'admin_roles_show' => 'detalles de funciones', + 'admin_roles_update' => 'actualizar funciones', + 'admin_roles_delete' => 'eliminar rol', + 'select_one_at_least' => 'Los permisos no pueden estar vacíos, seleccione al menos uno', ]; diff --git a/resources/lang/es/admin/setting.php b/resources/lang/es/admin/setting.php index c88c9da0..f90c265b 100644 --- a/resources/lang/es/admin/setting.php +++ b/resources/lang/es/admin/setting.php @@ -10,62 +10,62 @@ */ return [ - 'index' => 'configuración del sistema', - 'settings_index' => 'Ver configuración del sistema', - 'settings_update' => 'Modificar la configuración del sistema', - 'design_index' => 'Editor de inicio', - 'design_footer_index' => 'editor de pie de página', - 'design_menu_index' => 'Editor de navegación', - 'product_per_page' => 'El número de productos mostrados en cada página', + 'index' => 'configuración del sistema', + 'settings_index' => 'Ver configuración del sistema', + 'settings_update' => 'Modificar la configuración del sistema', + 'design_index' => 'Editor de inicio', + 'design_footer_index' => 'editor de pie de página', + 'design_menu_index' => 'Editor de navegación', + 'product_per_page' => 'El número de productos mostrados en cada página', - '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', + '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', + 'guest_checkout' => 'pago de visitante', - 'theme_default' => 'tema predeterminado', - 'theme_black' => 'tema negro', - 'shipping_address' => 'dirección de envío', - 'payment_address' => 'Dirección de Envio', - 'meta_title' => 'Meta título', - 'meta_description' => 'Meta descripción', - 'meta_keywords' => 'Metapalabra clave', - 'telephone' => 'Teléfono de contacto', - 'email' => 'Correo', - 'default_address' => 'dirección predeterminada', - 'default_country_set' => 'configuración de país predeterminada', - 'default_zone_set' => 'configuración de provincia predeterminada', - 'default_language' => 'idioma predeterminado', - 'default_currency' => 'moneda predeterminada', + 'theme_default' => 'tema predeterminado', + 'theme_black' => 'tema negro', + 'shipping_address' => 'dirección de envío', + 'payment_address' => 'Dirección de Envio', + 'meta_title' => 'Meta título', + 'meta_description' => 'Meta descripción', + 'meta_keywords' => 'Metapalabra clave', + 'telephone' => 'Teléfono de contacto', + 'email' => 'Correo', + 'default_address' => 'dirección predeterminada', + 'default_country_set' => 'configuración de país predeterminada', + 'default_zone_set' => 'configuración de provincia predeterminada', + 'default_language' => 'idioma predeterminado', + 'default_currency' => 'moneda predeterminada', 'default_customer_group' => 'grupo de clientes predeterminado', - 'admin_name' => 'directorio de fondo', - 'admin_name_info' => 'Directorio de fondo de administración, el predeterminado es admin', - 'enable_tax' => 'Habilitar impuestos', - 'enable_tax_info' => 'si habilitar el cálculo de impuestos', - 'tax_address' => 'dirección fiscal', - 'tax_address_info' => 'Según qué dirección calcular el impuesto', - 'logo' => 'Logotipo del sitio web', - 'favicon' => 'favicon', - 'favicon_info' => 'El pequeño icono que se muestra en la pestaña del navegador debe estar en formato PNG y el tamaño es: 32*32', - 'placeholder_image' => 'imagen de marcador de posición', + 'admin_name' => 'directorio de fondo', + 'admin_name_info' => 'Directorio de fondo de administración, el predeterminado es admin', + 'enable_tax' => 'Habilitar impuestos', + 'enable_tax_info' => 'si habilitar el cálculo de impuestos', + 'tax_address' => 'dirección fiscal', + 'tax_address_info' => 'Según qué dirección calcular el impuesto', + 'logo' => 'Logotipo del sitio web', + 'favicon' => 'favicon', + 'favicon_info' => 'El pequeño icono que se muestra en la pestaña del navegador debe estar en formato PNG y el tamaño es: 32*32', + 'placeholder_image' => 'imagen de marcador de posición', 'placeholder_image_info' => 'La imagen del marcador de posición se muestra cuando no hay imagen o no se encuentra la imagen, tamaño recomendado: 500*500', - 'head_code' => 'insertar código', - 'head_code_info' => 'El código en el cuadro de entrada se insertará en el encabezado de la página principal, que se puede usar para contar el código o agregar complementos especiales, etc.', + 'head_code' => 'insertar código', + 'head_code_info' => 'El código en el cuadro de entrada se insertará en el encabezado de la página principal, que se puede usar para contar el código o agregar complementos especiales, etc.', ]; diff --git a/resources/lang/es/admin/tax_class.php b/resources/lang/es/admin/tax_class.php index e3f5d717..455ccf56 100644 --- a/resources/lang/es/admin/tax_class.php +++ b/resources/lang/es/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'categoría fiscal', - 'rule' => 'regla', - 'based_on' => 'basado en', - 'priority' => 'prioridad', - 'tax_classes_index' => 'lista de clases de impuestos', + 'index' => 'categoría fiscal', + 'rule' => 'regla', + 'based_on' => 'basado en', + 'priority' => 'prioridad', + 'tax_classes_index' => 'lista de clases de impuestos', 'tax_classes_create' => 'Crear clases de impuestos', - 'tax_classes_show' => 'detalles de la clase de impuestos', + 'tax_classes_show' => 'detalles de la clase de impuestos', 'tax_classes_update' => 'Actualizar clases de impuestos', 'tax_classes_delete' => 'eliminar clase de impuestos', ]; diff --git a/resources/lang/es/admin/tax_rate.php b/resources/lang/es/admin/tax_rate.php index f3d00b3c..314866a5 100644 --- a/resources/lang/es/admin/tax_rate.php +++ b/resources/lang/es/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => 'configuración de impuestos', + 'index' => 'configuración de impuestos', 'tax_classes_index' => 'configuración de clases de impuestos', - 'tax' => 'tipo de impuesto', - 'tax_rate' => 'tasa de impuesto', - 'type' => 'tipo', - 'area' => 'área', - 'percentage' => 'porcentaje', - 'fixed_tax_rate' => 'tasa impositiva fija', - 'tax_rates_index' => 'lista de tasas de impuestos', - 'tax_rates_create' => 'Crear tasa de impuestos', - 'tax_rates_show' => 'detalles de impuestos', - 'tax_rates_update' => 'Actualizar tasa de impuestos', - 'tax_rates_delete' => 'Eliminar tasa de impuestos', + 'tax' => 'tipo de impuesto', + 'tax_rate' => 'tasa de impuesto', + 'type' => 'tipo', + 'area' => 'área', + 'percentage' => 'porcentaje', + 'fixed_tax_rate' => 'tasa impositiva fija', + 'tax_rates_index' => 'lista de tasas de impuestos', + 'tax_rates_create' => 'Crear tasa de impuestos', + 'tax_rates_show' => 'detalles de impuestos', + 'tax_rates_update' => 'Actualizar tasa de impuestos', + 'tax_rates_delete' => 'Eliminar tasa de impuestos', ]; diff --git a/resources/lang/es/admin/user.php b/resources/lang/es/admin/user.php index 9b1d3248..6b80d557 100644 --- a/resources/lang/es/admin/user.php +++ b/resources/lang/es/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'Lista de usuarios', - 'admin_users_create' => 'crear usuario', - 'admin_users_show' => 'Detalles de usuario', - 'admin_users_update' => 'actualizar usuario', - 'admin_users_delete' => 'eliminar usuarios', + 'admin_users_index' => 'Lista de usuarios', + 'admin_users_create' => 'crear usuario', + 'admin_users_show' => 'Detalles de usuario', + 'admin_users_update' => 'actualizar usuario', + 'admin_users_delete' => 'eliminar usuarios', 'verify_code_expired' => 'Su código de verificación ha caducado (10 minutos), recupérelo', - 'verify_code_error' => 'Tu código de verificación es incorrecto', - 'account_not_exist' => 'La cuenta no existe', + 'verify_code_error' => 'Tu código de verificación es incorrecto', + 'account_not_exist' => 'La cuenta no existe', ]; diff --git a/resources/lang/es/admin/zone.php b/resources/lang/es/admin/zone.php index 971b3427..73afdaaf 100644 --- a/resources/lang/es/admin/zone.php +++ b/resources/lang/es/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => 'nombre de la provincia', + 'zone_name' => 'nombre de la provincia', 'country_of_origin' => 'país de origen', - 'zones_index' => 'Lista de provincias', - 'zones_create' => 'Crear una provincia', - 'zones_update' => 'actualizar provincia', - 'zones_delete' => 'borrar provincia', + 'zones_index' => 'Lista de provincias', + 'zones_create' => 'Crear una provincia', + 'zones_update' => 'actualizar provincia', + 'zones_delete' => 'borrar provincia', - 'error_country' => 'Por favor seleccione un país', + 'error_country' => 'Por favor seleccione un país', ]; diff --git a/resources/lang/es/auth.php b/resources/lang/es/auth.php index f8011581..59ca18fb 100644 --- a/resources/lang/es/auth.php +++ b/resources/lang/es/auth.php @@ -1,7 +1,7 @@ 'nombre de la marca', - 'icon' => 'icono', + 'name' => 'nombre de la marca', + 'icon' => 'icono', 'first_letter' => 'Iniciales', ]; diff --git a/resources/lang/es/cart.php b/resources/lang/es/cart.php index 20fd0352..7321fed9 100644 --- a/resources/lang/es/cart.php +++ b/resources/lang/es/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => 'Cantidad de compra', + 'sku_id' => 'SKU ID', + 'quantity' => 'Cantidad de compra', 'stock_out' => 'Escasez de inventario', ]; diff --git a/resources/lang/es/common.php b/resources/lang/es/common.php index 60f432c6..de393b64 100644 --- a/resources/lang/es/common.php +++ b/resources/lang/es/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => 'Por favor complete :name', // 这个有用别删了，:name 是一个变量 + 'error_required' => 'Por favor complete :name', // 这个有用别删了，:name 是一个变量 'error_input_required' => 'El cuadro de entrada no puede estar vacío', - 'error_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', - 'email' => 'Correo', - 'unauthenticated' => 'por favor ingresa primero', - 'success' => 'éxito', - 'no_data' => 'Aún no hay datos~', - 'empty_items' => 'sin datos', - 'created_success' => 'Creado con éxito!', - 'deleted_success' => 'eliminado con éxito!', - 'restored_success' => 'recuperación exitosa!', - 'updated_success' => 'actualización completada!', - 'edit_success' => 'Modificado con éxito!', - 'get_success' => 'conseguir el éxito!', - 'all' => 'todos', - 'status' => 'estado', - 'enable' => 'habilitar', - 'disable' => 'desactivado', - 'enabled' => 'habilitar', - 'disabled' => 'desactivado', - 'home' => 'página delantera', - 'submit' => 'enviar', - 'title' => 'título', - 'save' => 'ahorrar', - 'cancel' => 'Cancelar', - 'confirm' => 'Por supuesto', - 'no' => 'no', - 'yes' => 'Sí', - 'delete' => 'Eliminar', - 'sign_out' => 'desconectar', - 'contact_us' => 'Contáctenos', - 'input' => 'ingrese su búsqueda aquí', - 'filter' => 'filtrar', - 'reset' => 'Reiniciar', - 'export' => 'exportar', - 'edit' => 'editar', - 'action' => 'funcionar', - 'add' => 'añadir', - 'please_choose' => 'por favor elige', - 'recommend_size' => 'Tamaño recomendado', - 'pick_datetime' => 'período de selección', - 'confirm_delete' => 'Seguro que quieres eliminarlo?', - 'text_hint' => 'insinuación', - 'restore' => 'recuperar', - 'name' => 'nombre', - 'image' => 'imagen', - 'data' => 'datos', - 'view' => 'Controlar', - 'phone' => 'Teléfono', - 'exit' => 'abandonar', - 'return' => 'devolver', - 'language' => 'idioma', - 'select_all' => 'seleccionar todo', - 'sign_out' => 'desconectar', - 'menu' => 'menú', - 'whether_open' => 'Ya sea para abrir', - 'to_setting' => 'para configurar', + 'error_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', + 'email' => 'Correo', + 'unauthenticated' => 'por favor ingresa primero', + 'success' => 'éxito', + 'no_data' => 'Aún no hay datos~', + 'empty_items' => 'sin datos', + 'created_success' => 'Creado con éxito!', + 'deleted_success' => 'eliminado con éxito!', + 'restored_success' => 'recuperación exitosa!', + 'updated_success' => 'actualización completada!', + 'edit_success' => 'Modificado con éxito!', + 'get_success' => 'conseguir el éxito!', + 'all' => 'todos', + 'status' => 'estado', + 'enable' => 'habilitar', + 'disable' => 'desactivado', + 'enabled' => 'habilitar', + 'disabled' => 'desactivado', + 'home' => 'página delantera', + 'submit' => 'enviar', + 'title' => 'título', + 'save' => 'ahorrar', + 'cancel' => 'Cancelar', + 'confirm' => 'Por supuesto', + 'no' => 'no', + 'yes' => 'Sí', + 'delete' => 'Eliminar', + 'sign_out' => 'desconectar', + 'contact_us' => 'Contáctenos', + 'input' => 'ingrese su búsqueda aquí', + 'filter' => 'filtrar', + 'reset' => 'Reiniciar', + 'export' => 'exportar', + 'edit' => 'editar', + 'action' => 'funcionar', + 'add' => 'añadir', + 'please_choose' => 'por favor elige', + 'recommend_size' => 'Tamaño recomendado', + 'pick_datetime' => 'período de selección', + 'confirm_delete' => 'Seguro que quieres eliminarlo?', + 'text_hint' => 'insinuación', + 'restore' => 'recuperar', + 'name' => 'nombre', + 'image' => 'imagen', + 'data' => 'datos', + 'view' => 'Controlar', + 'phone' => 'Teléfono', + 'exit' => 'abandonar', + 'return' => 'devolver', + 'language' => 'idioma', + 'select_all' => 'seleccionar todo', + 'sign_out' => 'desconectar', + 'menu' => 'menú', + 'whether_open' => 'Ya sea para abrir', + 'to_setting' => 'para configurar', - 'id' => 'ID', - 'created_at' => 'tiempo de creación', - 'updated_at' => 'cambiar el tiempo', - 'sort_order' => 'clasificar', - 'error_page' => 'Los datos a los que accedió no existen o han sido eliminados~', - 'error_page_btn' => 'Volver a la página anterior', + 'id' => 'ID', + 'created_at' => 'tiempo de creación', + 'updated_at' => 'cambiar el tiempo', + 'sort_order' => 'clasificar', + 'error_page' => 'Los datos a los que accedió no existen o han sido eliminados~', + 'error_page_btn' => 'Volver a la página anterior', - 'order' => [ - 'unpaid' => 'A pagar', - 'paid' => 'Pagado', - 'shipped' => 'Enviado', + 'order' => [ + 'unpaid' => 'A pagar', + 'paid' => 'Pagado', + 'shipped' => 'Enviado', 'completed' => 'terminado', 'cancelled' => 'Cancelado', - ] + ], ]; - - diff --git a/resources/lang/es/currency.php b/resources/lang/es/currency.php index ec2331b5..9ee748bc 100644 --- a/resources/lang/es/currency.php +++ b/resources/lang/es/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => 'nombre', - 'code' => 'codificación', - 'icon' => 'icono', - 'symbol_left' => 'signo izquierdo', - 'symbol_right' => 'signo correcto', - 'value' => 'valor del tipo de cambio', - 'decimal_place' => 'lugares decimales', + 'name' => 'nombre', + 'code' => 'codificación', + 'icon' => 'icono', + 'symbol_left' => 'signo izquierdo', + 'symbol_right' => 'signo correcto', + 'value' => 'valor del tipo de cambio', + 'decimal_place' => 'lugares decimales', ]; diff --git a/resources/lang/es/customer.php b/resources/lang/es/customer.php index e98a13ca..5cc9c261 100644 --- a/resources/lang/es/customer.php +++ b/resources/lang/es/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => 'Nombre', - 'email' => 'Email', - 'from' => 'fuente registrada', + 'name' => 'Nombre', + 'email' => 'Email', + 'from' => 'fuente registrada', 'customer_group' => 'grupo de usuario', ]; diff --git a/resources/lang/es/customer_group.php b/resources/lang/es/customer_group.php index ece5b259..44e40242 100644 --- a/resources/lang/es/customer_group.php +++ b/resources/lang/es/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => 'calificación', - 'name' => 'nombre del grupo de clientes', + 'name' => 'nombre del grupo de clientes', ]; diff --git a/resources/lang/es/mail.php b/resources/lang/es/mail.php index a557cae4..dabaa371 100644 --- a/resources/lang/es/mail.php +++ b/resources/lang/es/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => 'pedido enviado con éxito', - 'order_update' => 'actualización del estado del pedido', - 'order_success_info' => 'Su pedido se ha enviado con éxito, los siguientes son los detalles del pedido', - 'not_oneself' => 'las operaciones no personales pueden ignorarse. ', - 'customer_name' => 'Estimado :name usuario, ¡hola! ', - 'sinceramente' => 'Sinceramente', - 'equipo' => 'equipo', - 'order_update_status' => 'El estado de su pedido :number está actualizado', - 'welcome_register' => 'bienvenido a registrarse', - 'register_end' => 'Complete el registro, haga clic en el botón de abajo para volver al centro comercial. ', - 'btn_buy_now' => 'comprar ahora', - 'retrieve_password_title' => 'recuperar contraseña', - 'retrieve_password_text' => 'Está recuperando su contraseña, haga clic en el botón de abajo para completar la operación. ', - 'retrieve_password_btn' => 'Haga clic aquí para verificar el correo electrónico', + 'order_success' => 'pedido enviado con éxito', + 'order_update' => 'actualización del estado del pedido', + 'order_success_info' => 'Su pedido se ha enviado con éxito, los siguientes son los detalles del pedido', + 'not_oneself' => 'las operaciones no personales pueden ignorarse. ', + 'customer_name' => 'Estimado :name usuario, ¡hola! ', + 'sinceramente' => 'Sinceramente', + 'equipo' => 'equipo', + 'order_update_status' => 'El estado de su pedido :number está actualizado', + 'welcome_register' => 'bienvenido a registrarse', + 'register_end' => 'Complete el registro, haga clic en el botón de abajo para volver al centro comercial. ', + 'btn_buy_now' => 'comprar ahora', + 'retrieve_password_title' => 'recuperar contraseña', + 'retrieve_password_text' => 'Está recuperando su contraseña, haga clic en el botón de abajo para completar la operación. ', + 'retrieve_password_btn' => 'Haga clic aquí para verificar el correo electrónico', ]; diff --git a/resources/lang/es/order.php b/resources/lang/es/order.php index 1fbdff1d..c4278667 100644 --- a/resources/lang/es/order.php +++ b/resources/lang/es/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'number' => 'Número de orden', - 'customer_name' => 'nombre del cliente', - 'payment_method' => 'método de pago', - 'email' => 'Email', - 'telephone' => 'número de contacto', - 'created_at' => 'tiempo de creación', - 'updated_at' => 'tiempo de actualizacion', - 'status' => 'estado', - 'status_format' => 'estado', - 'total' => 'orden total', - 'express_number' => 'número de pedido urgente', - 'express_company' => 'compañía exprés', - 'order_shipments' => 'información del envío', + 'id' => 'ID', + 'number' => 'Número de orden', + 'customer_name' => 'nombre del cliente', + 'payment_method' => 'método de pago', + 'email' => 'Email', + 'telephone' => 'número de contacto', + 'created_at' => 'tiempo de creación', + 'updated_at' => 'tiempo de actualizacion', + 'status' => 'estado', + 'status_format' => 'estado', + 'total' => 'orden total', + 'express_number' => 'número de pedido urgente', + 'express_company' => 'compañía exprés', + 'order_shipments' => 'información del envío', - 'address_info' => 'Datos del Domicilio', - 'shipping_address' => 'dirección de entrega', - 'payment_address' => 'Dirección de Envio', - 'order_status' => 'Estado del pedido', - 'current_status' => 'estado actual', - 'change_to_status' => 'Modificar estado', - 'comment' => 'Observaciones', - 'submit_status' => 'estado de actualización', + 'address_info' => 'Datos del Domicilio', + 'shipping_address' => 'dirección de entrega', + 'payment_address' => 'Dirección de Envio', + 'order_status' => 'Estado del pedido', + 'current_status' => 'estado actual', + 'change_to_status' => 'Modificar estado', + 'comment' => 'Observaciones', + 'submit_status' => 'estado de actualización', - 'product_info' => 'Información del Producto', - 'product_name' => 'nombre', - 'product_price' => 'precio', - 'product_sub_price' => 'Total parcial', - 'product_quantity' => 'cantidad', - 'product_sku' => 'SKU', + 'product_info' => 'Información del Producto', + 'product_name' => 'nombre', + 'product_price' => 'precio', + 'product_sub_price' => 'Total parcial', + 'product_quantity' => 'cantidad', + 'product_sku' => 'SKU', - 'action_history' => 'Registro de operaciones', - 'history_status' => 'estado', - 'history_comment' => 'Observación', + 'action_history' => 'Registro de operaciones', + 'history_status' => 'estado', + 'history_comment' => 'Observación', 'history_created_at' => 'Actualizado', - 'unpaid' => 'A pagar', - 'paid' => 'Pagado', - 'shipped' => 'Enviado', - 'completed' => 'terminado', - 'cancelled' => 'Cancelado', + 'unpaid' => 'A pagar', + 'paid' => 'Pagado', + 'shipped' => 'Enviado', + 'completed' => 'terminado', + 'cancelled' => 'Cancelado', ]; diff --git a/resources/lang/es/page.php b/resources/lang/es/page.php index 67e1fc2d..17594e29 100644 --- a/resources/lang/es/page.php +++ b/resources/lang/es/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => 'título', + 'title' => 'título', 'content' => 'contenido', ]; diff --git a/resources/lang/es/product.php b/resources/lang/es/product.php index e07c3857..62450eb2 100644 --- a/resources/lang/es/product.php +++ b/resources/lang/es/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => 'nombre', - 'sku' => 'SKU', - 'price' => 'precio', - 'origin_price' => 'precio original', - 'cost_price' => 'precio de coste', - 'brand' => 'marca', - 'category' => 'Clasificación', - 'model' => 'modelo', - 'quantity' => 'en stock', - 'image' => 'imagen', + 'name' => 'nombre', + 'sku' => 'SKU', + 'price' => 'precio', + 'origin_price' => 'precio original', + 'cost_price' => 'precio de coste', + 'brand' => 'marca', + 'category' => 'Clasificación', + 'model' => 'modelo', + 'quantity' => 'en stock', + 'image' => 'imagen', - 'active' => 'en la repisa', - 'inactive' => 'Derribar', + 'active' => 'en la repisa', + 'inactive' => 'Derribar', 'has_been_inactive' => 'Este artículo ha sido descontinuado', ]; diff --git a/resources/lang/es/rma.php b/resources/lang/es/rma.php index bc7c5e28..1eb8e15b 100644 --- a/resources/lang/es/rma.php +++ b/resources/lang/es/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => 'Ordenar', + 'order_id' => 'Ordenar', 'order_product_id' => 'articulo ordenado', - 'customer_id' => 'cliente', - 'quantity' => 'cantidad', - 'opened' => 'desempaquetado', - 'rma_reason_id' => 'razón para regresar', - 'type' => 'Tipo de servicio postventa', + 'customer_id' => 'cliente', + 'quantity' => 'cantidad', + 'opened' => 'desempaquetado', + 'rma_reason_id' => 'razón para regresar', + 'type' => 'Tipo de servicio postventa', - 'status_pending' => 'para ser procesado', - 'status_rejected' => 'rechazado', - 'status_approved' => 'Aprobado (para ser devuelto por el cliente)', - 'status_shipped' => 'Enviado (artículo devuelto)', + 'status_pending' => 'para ser procesado', + 'status_rejected' => 'rechazado', + 'status_approved' => 'Aprobado (para ser devuelto por el cliente)', + 'status_shipped' => 'Enviado (artículo devuelto)', 'status_completed' => 'terminado', - 'type_return' => 'devolver los bienes', - 'type_exchange' => 'intercambio', - 'type_repair' => 'reparar', - 'type_reissue' => 'reeditar producto', - 'type_refund' => 'solo reembolso' + 'type_return' => 'devolver los bienes', + 'type_exchange' => 'intercambio', + 'type_repair' => 'reparar', + 'type_reissue' => 'reeditar producto', + 'type_refund' => 'solo reembolso', ]; diff --git a/resources/lang/es/shop/account.php b/resources/lang/es/shop/account.php index 3b7a47d8..51059dd2 100644 --- a/resources/lang/es/shop/account.php +++ b/resources/lang/es/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'centro personal', - 'revise_info' => 'Modificar información', - 'collect' => 'recoger', - 'coupon' => 'cupón', - 'my_order' => 'Mi pedido', - 'orders' => 'todas las órdenes', - 'pending_payment' => 'Pago pendiente', - 'pending_send' => 'para ser entregado', - 'pending_receipt' => 'recibo pendiente', - 'after_sales' => 'Después de las ventas', - 'no_order' => '¡Todavía no tienes un pedido!', - 'to_buy' => 'encargar', - 'order_number' => 'Número de orden', - 'order_time' => 'tiempo de la orden', - 'state' => 'estado', - 'amount' => 'Monto', - 'check_details' => 'revisa los detalles', - 'all' => 'común', - 'items' => 'Elementos', + 'index' => 'centro personal', + 'revise_info' => 'Modificar información', + 'collect' => 'recoger', + 'coupon' => 'cupón', + 'my_order' => 'Mi pedido', + 'orders' => 'todas las órdenes', + 'pending_payment' => 'Pago pendiente', + 'pending_send' => 'para ser entregado', + 'pending_receipt' => 'recibo pendiente', + 'after_sales' => 'Después de las ventas', + 'no_order' => '¡Todavía no tienes un pedido!', + 'to_buy' => 'encargar', + 'order_number' => 'Número de orden', + 'order_time' => 'tiempo de la orden', + 'state' => 'estado', + 'amount' => 'Monto', + 'check_details' => 'revisa los detalles', + 'all' => 'común', + 'items' => 'Elementos', 'verify_code_expired' => 'Su código de verificación ha caducado (10 minutos), recupérelo', - 'verify_code_error' => 'Tu código de verificación es incorrecto', - 'account_not_exist' => 'La cuenta no existe', + 'verify_code_error' => 'Tu código de verificación es incorrecto', + 'account_not_exist' => 'La cuenta no existe', - 'edit' => [ - 'index' => 'Modificar información personal', - 'modify_avatar' => 'Modificar avatar', - 'suggest' => 'Sube una imagen JPG o PNG. Se recomienda 300 x 300.', - 'name' => 'nombre', - 'email' => 'Correo', - 'crop' => 'cultivo', + 'edit' => [ + 'index' => 'Modificar información personal', + 'modify_avatar' => 'Modificar avatar', + 'suggest' => 'Sube una imagen JPG o PNG. Se recomienda 300 x 300.', + 'name' => 'nombre', + 'email' => 'Correo', + 'crop' => 'cultivo', 'password_edit_success' => 'Restablecimiento de contraseña completo', - 'origin_password_fail' => 'La contraseña original es incorrecta', + 'origin_password_fail' => 'La contraseña original es incorrecta', ], - 'wishlist' => [ - 'index' => 'mi colección', - 'product' => 'producto', - 'price' => 'precio', + 'wishlist' => [ + 'index' => 'mi colección', + 'product' => 'producto', + 'price' => 'precio', 'check_details' => 'revisa los detalles', ], - 'order' => [ - 'index' => 'Mi pedido', - 'completed' => 'Recibo confirmado', - 'cancelled' => 'orden cancelada', + 'order' => [ + 'index' => 'Mi pedido', + 'completed' => 'Recibo confirmado', + 'cancelled' => 'orden cancelada', 'order_details' => 'detalles del pedido', - 'amount' => 'Monto', - 'state' => 'estado', - 'order_number' => 'Número de orden', - 'check' => 'Controlar', + 'amount' => 'Monto', + 'state' => 'estado', + 'order_number' => 'Número de orden', + 'check' => 'Controlar', - 'order_info' => [ - 'index' => 'detalles del pedido', - 'order_details' => 'detalles del pedido', - 'to_pay' => 'pagar', - 'cancel' => 'cancelar orden', - 'confirm_receipt' => 'confirmar la recepción de mercancías', - 'order_number' => 'Número de orden', - 'order_date' => 'fecha de orden', - 'state' => 'estado', - 'order_amount' => 'Total de la orden', - 'order_items' => 'encargar artículos', + 'order_info' => [ + 'index' => 'detalles del pedido', + 'order_details' => 'detalles del pedido', + 'to_pay' => 'pagar', + 'cancel' => 'cancelar orden', + 'confirm_receipt' => 'confirmar la recepción de mercancías', + 'order_number' => 'Número de orden', + 'order_date' => 'fecha de orden', + 'state' => 'estado', + 'order_amount' => 'Total de la orden', + 'order_items' => 'encargar artículos', 'apply_after_sales' => 'Solicitar posventa', - 'order_total' => 'orden total', - 'logistics_status' => 'Estado logístico', - 'order_status' => 'Estado del pedido', - 'remark' => 'Observación', - 'update_time' => '更新时间', + 'order_total' => 'orden total', + 'logistics_status' => 'Estado logístico', + 'order_status' => 'Estado del pedido', + 'remark' => 'Observación', + 'update_time' => '更新时间', ], 'order_success' => [ - 'order_success' => '¡Enhorabuena, el pedido se ha generado correctamente!', - 'order_number' => 'Número de orden', - 'amounts_payable' => 'cantidades a pagar ', - 'payment_method' => 'método de pago ', - 'view_order' => 'Ver detalles de la orden ', - 'pay_now' => 'paga inmediatamente ', - 'kind_tips' => 'Recordatorio: su pedido se ha generado correctamente, complete el pago lo antes posible ~ ', - 'also' => 'Tú también puedes', - 'continue_purchase' => 'seguir comprando', + 'order_success' => '¡Enhorabuena, el pedido se ha generado correctamente!', + 'order_number' => 'Número de orden', + 'amounts_payable' => 'cantidades a pagar ', + 'payment_method' => 'método de pago ', + 'view_order' => 'Ver detalles de la orden ', + 'pay_now' => 'paga inmediatamente ', + 'kind_tips' => 'Recordatorio: su pedido se ha generado correctamente, complete el pago lo antes posible ~ ', + 'also' => 'Tú también puedes', + 'continue_purchase' => 'seguir comprando', 'contact_customer_service' => 'Si tiene alguna pregunta durante el proceso de pedido, puede comunicarse con nuestro personal de servicio al cliente en cualquier momento', - 'emaill' => 'Correo', - 'service_hotline' => 'Línea directa de servicio', + 'emaill' => 'Correo', + 'service_hotline' => 'Línea directa de servicio', ], ], - 'addresses' => [ - 'index' => 'mi dirección', - 'add_address' => 'agregar nueva dirección', + 'addresses' => [ + 'index' => 'mi dirección', + 'add_address' => 'agregar nueva dirección', 'default_address' => 'dirección predeterminada', - 'delete' => 'Eliminar', - 'edit' => 'editar', - 'enter_name' => 'Por favor escriba su nombre', - 'enter_phone' => 'Por favor escriba su número de teléfono', - 'enter_address' => 'Por favor ingrese la dirección detallada 1', + 'delete' => 'Eliminar', + 'edit' => 'editar', + 'enter_name' => 'Por favor escriba su nombre', + 'enter_phone' => 'Por favor escriba su número de teléfono', + 'enter_address' => 'Por favor ingrese la dirección detallada 1', 'select_province' => 'Por favor seleccione provincia', - 'enter_city' => 'Por favor complete la ciudad', - 'confirm_delete' => '¿Está seguro de que desea eliminar la dirección?', - 'hint' => '提示', - 'check_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', + 'enter_city' => 'Por favor complete la ciudad', + 'confirm_delete' => '¿Está seguro de que desea eliminar la dirección?', + 'hint' => '提示', + 'check_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', ], - 'rma' => [ - 'index' => 'mi posventa', - 'commodity' => 'producto', - 'quantity' => 'cantidad', - 'service_type' => 'Tipo de servicio', + 'rma' => [ + 'index' => 'mi posventa', + 'commodity' => 'producto', + 'quantity' => 'cantidad', + 'service_type' => 'Tipo de servicio', 'return_reason' => 'razón para regresar', 'creation_time' => 'tiempo de creación', - 'check' => 'Controlar', + 'check' => 'Controlar', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'Detalles de posventa', ], - 'rma_form' => [ - 'index' => 'Enviar información posventa', - 'service_type' => 'Tipo de servicio', + 'rma_form' => [ + 'index' => 'Enviar información posventa', + 'service_type' => 'Tipo de servicio', 'return_quantity' => 'Cantidad de devolución', - 'unpacked' => 'desempaquetado', - 'return_reason' => 'razón para regresar', - 'remark' => 'Observación', - ] - ] + 'unpacked' => 'desempaquetado', + 'return_reason' => 'razón para regresar', + 'remark' => 'Observación', + ], + ], ]; diff --git a/resources/lang/es/shop/carts.php b/resources/lang/es/shop/carts.php index 2968773b..7cd4e65a 100644 --- a/resources/lang/es/shop/carts.php +++ b/resources/lang/es/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'carrito de compras', - 'added_to_cart' => 'agregado al carrito', - 'select_all' => 'seleccionar todo', - 'commodity' => 'producto', - 'quantity' => 'cantidad', - 'subtotal' => 'Total parcial', - 'product_total' => 'total del producto', - 'order_total' => 'importe total a pagar', - 'shipping_fee' => 'transporte', - 'all' => 'todos', - 'selected' => 'seleccionado', - 'to_checkout' => 'ir a la caja', - 'cart_empty' => 'Su cesta está vacía', - 'go_buy' => 'Puedes ir y ver lo que quieres comprar.', - 'go_shopping' => 'ir de compras', - 'must_select' => 'por favor seleccione por lo menos un producto', - 'mini' => 'tu carrito', - 'delete' => 'Eliminar', - 'check_cart' => 'revisa el carrito de compras', + 'index' => 'carrito de compras', + 'added_to_cart' => 'agregado al carrito', + 'select_all' => 'seleccionar todo', + 'commodity' => 'producto', + 'quantity' => 'cantidad', + 'subtotal' => 'Total parcial', + 'product_total' => 'total del producto', + 'order_total' => 'importe total a pagar', + 'shipping_fee' => 'transporte', + 'all' => 'todos', + 'selected' => 'seleccionado', + 'to_checkout' => 'ir a la caja', + 'cart_empty' => 'Su cesta está vacía', + 'go_buy' => 'Puedes ir y ver lo que quieres comprar.', + 'go_shopping' => 'ir de compras', + 'must_select' => 'por favor seleccione por lo menos un producto', + 'mini' => 'tu carrito', + 'delete' => 'Eliminar', + 'check_cart' => 'revisa el carrito de compras', - 'invalid_customer' => 'Cliente de carrito inválido', - 'empty_selected_products' => 'El artículo seleccionado en el carrito de compras está vacío', + 'invalid_customer' => 'Cliente de carrito inválido', + 'empty_selected_products' => 'El artículo seleccionado en el carrito de compras está vacío', 'invalid_shipping_address' => 'Dirección de envío no válida', - 'invalid_payment_address' => 'Dirección de facturación no válida', - 'invalid_shipping_method' => 'Método de envío no disponible', - 'invalid_payment_method' => 'Método de pago no disponible', + 'invalid_payment_address' => 'Dirección de facturación no válida', + 'invalid_shipping_method' => 'Método de envío no disponible', + 'invalid_payment_method' => 'Método de pago no disponible', ]; diff --git a/resources/lang/es/shop/checkout.php b/resources/lang/es/shop/checkout.php index e6110b7b..867674e1 100644 --- a/resources/lang/es/shop/checkout.php +++ b/resources/lang/es/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'La cuenta, por favor', - 'address' => 'dirección de entrega', - 'payment_address' => 'Dirección de Envio', + 'index' => 'La cuenta, por favor', + 'address' => 'dirección de entrega', + 'payment_address' => 'Dirección de Envio', 'same_as_shipping_address' => 'Dirección de facturación y dirección de envío', - 'chosen' => 'elegido', - 'edit' => 'editar', - 'choose_another_address' => 'Elige otra dirección', - 'add_new_address' => 'agregar nueva dirección', - 'payment_method' => 'método de pago', - 'delivery_method' => 'Método de entrega', - 'cart_totals' => 'Número total de carros', - 'submit_order' => 'Orden de envio', - 'enter_name' => 'Por favor escriba su nombre', - 'enter_phone' => 'Por favor escriba su número de teléfono', - 'enter_address' => 'Por favor ingrese la dirección detallada 1', - 'select_province' => 'Por favor seleccione provincia', - 'enter_city' => 'Por favor complete la ciudad', - 'check_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', - 'error_payment_address' => 'Seleccione una dirección de facturación', + 'chosen' => 'elegido', + 'edit' => 'editar', + 'choose_another_address' => 'Elige otra dirección', + 'add_new_address' => 'agregar nueva dirección', + 'payment_method' => 'método de pago', + 'delivery_method' => 'Método de entrega', + 'cart_totals' => 'Número total de carros', + 'submit_order' => 'Orden de envio', + 'enter_name' => 'Por favor escriba su nombre', + 'enter_phone' => 'Por favor escriba su número de teléfono', + 'enter_address' => 'Por favor ingrese la dirección detallada 1', + 'select_province' => 'Por favor seleccione provincia', + 'enter_city' => 'Por favor complete la ciudad', + 'check_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', + 'error_payment_address' => 'Seleccione una dirección de facturación', - 'payment' => [ - 'index' => 'por favor pague', - 'please_pay' => 'Pedido enviado con éxito, por favor pague', - 'order_number' => 'Número de orden', + 'payment' => [ + 'index' => 'por favor pague', + 'please_pay' => 'Pedido enviado con éxito, por favor pague', + 'order_number' => 'Número de orden', 'amounts_payable' => 'cantidades a pagar', - 'payment_method' => 'método de pago', - ] + 'payment_method' => 'método de pago', + ], ]; diff --git a/resources/lang/es/shop/common.php b/resources/lang/es/shop/common.php index e83bea3b..c3d325e1 100644 --- a/resources/lang/es/shop/common.php +++ b/resources/lang/es/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => 'página delantera', - 'submit' => 'enviar', - 'cancel' => 'Cancelar', + 'home' => 'página delantera', + 'submit' => 'enviar', + 'cancel' => 'Cancelar', 'confirm' => 'Por supuesto', - 'no' => 'no', - 'yes' => 'Sí', + 'no' => 'no', + 'yes' => 'Sí', ]; diff --git a/resources/lang/es/shop/currency.php b/resources/lang/es/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/es/shop/currency.php +++ b/resources/lang/es/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/es/shop/forgotten.php b/resources/lang/es/shop/forgotten.php index 7979a475..1b4a4442 100644 --- a/resources/lang/es/shop/forgotten.php +++ b/resources/lang/es/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'Se te olvidó tu contraseña', - 'follow_prompt' => 'Siga las instrucciones para recuperar su contraseña', - 'email_forCode' => 'Por favor ingrese su dirección de correo electrónico para obtener el código de verificación', - 'enter_password' => 'Por favor ingrese una nueva contraseña', - 'email' => 'Correo', - 'email_address' => 'dirección de correo electrónico', - 'verification_code' => 'código de verificación', - 'password' => 'clave', - 'confirm_password' => 'Confirmar contraseña', - 'send_code' => 'Enviar el código de verificación', - 'to_back' => 'Volver al paso anterior', - 'enter_password' => 'Por favor, ingrese contraseña', - 'enter_email' => 'por favor ingrese su correo electrónico', - 'please_confirm' => 'Por favor, confirme su contraseña', - 'password_err' => 'Las contraseñas ingresadas dos veces no coinciden!', - 'email_err' => 'Por favor, introduce una dirección de correo electrónico válida!', - 'enter_code' => 'por favor ingrese el código de verificación', + 'index' => 'Se te olvidó tu contraseña', + 'follow_prompt' => 'Siga las instrucciones para recuperar su contraseña', + 'email_forCode' => 'Por favor ingrese su dirección de correo electrónico para obtener el código de verificación', + 'enter_password' => 'Por favor ingrese una nueva contraseña', + 'email' => 'Correo', + 'email_address' => 'dirección de correo electrónico', + 'verification_code' => 'código de verificación', + 'password' => 'clave', + 'confirm_password' => 'Confirmar contraseña', + 'send_code' => 'Enviar el código de verificación', + 'to_back' => 'Volver al paso anterior', + 'enter_password' => 'Por favor, ingrese contraseña', + 'enter_email' => 'por favor ingrese su correo electrónico', + 'please_confirm' => 'Por favor, confirme su contraseña', + 'password_err' => 'Las contraseñas ingresadas dos veces no coinciden!', + 'email_err' => 'Por favor, introduce una dirección de correo electrónico válida!', + 'enter_code' => 'por favor ingrese el código de verificación', 'verification_code_sent' => 'El código de verificación ha sido enviado, verifique e ingrese el código de verificación', - 'password_updated' => 'la contraseña ha sido cambiada', + 'password_updated' => 'la contraseña ha sido cambiada', ]; diff --git a/resources/lang/es/shop/login.php b/resources/lang/es/shop/login.php index c67a3b62..66567ed1 100644 --- a/resources/lang/es/shop/login.php +++ b/resources/lang/es/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'Inicio de sesión y registro de usuario', - 'login_and_sign' => 'Iniciar sesión Registrarse', - 'home' => 'página delantera', - 'library' => 'centro personal', - 'login' => 'Iniciar sesión', - 'already' => '¿Ya es nuestro cliente?', - 'description' => '¿Ya es nuestro cliente?', - 'email' => 'correo', - 'email_address' => 'dirección de correo electrónico', - 'password' => 'clave', - 'forget_password' => 'Se te olvidó tu contraseña', - 'new' => 'nueva cuenta', - 'not_already' => '¿Todavía no es nuestro cliente registrado?', - 'confirm_password' => 'Confirmar contraseña', - 'register' => 'Registrarse', - 'enter_password' => 'Por favor, ingrese contraseña', - 'enter_email' => 'por favor ingrese su correo electrónico', - 'please_confirm' => 'Por favor, confirme su contraseña', - 'password_err' => 'Las contraseñas ingresadas dos veces no coinciden!', - 'email_err' => 'Por favor, introduce una dirección de correo electrónico válida!', - 'check_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', + 'index' => 'Inicio de sesión y registro de usuario', + 'login_and_sign' => 'Iniciar sesión Registrarse', + 'home' => 'página delantera', + 'library' => 'centro personal', + 'login' => 'Iniciar sesión', + 'already' => '¿Ya es nuestro cliente?', + 'description' => '¿Ya es nuestro cliente?', + 'email' => 'correo', + 'email_address' => 'dirección de correo electrónico', + 'password' => 'clave', + 'forget_password' => 'Se te olvidó tu contraseña', + 'new' => 'nueva cuenta', + 'not_already' => '¿Todavía no es nuestro cliente registrado?', + 'confirm_password' => 'Confirmar contraseña', + 'register' => 'Registrarse', + 'enter_password' => 'Por favor, ingrese contraseña', + 'enter_email' => 'por favor ingrese su correo electrónico', + 'please_confirm' => 'Por favor, confirme su contraseña', + 'password_err' => 'Las contraseñas ingresadas dos veces no coinciden!', + 'email_err' => 'Por favor, introduce una dirección de correo electrónico válida!', + 'check_form' => 'Por favor, compruebe que el formulario se ha rellenado correctamente.', 'email_or_password_error' => 'Error de correo electrónico o contraseña!', - 'customer_inactive' => 'El usuario está deshabilitado', - 'login_successfully' => 'Inicio de sesión correcto', - 'register_success' => 'registración exitosa', - 'third_party_logins' => 'vale la pena mencionar', + 'customer_inactive' => 'El usuario está deshabilitado', + 'login_successfully' => 'Inicio de sesión correcto', + 'register_success' => 'registración exitosa', + 'third_party_logins' => 'vale la pena mencionar', ]; diff --git a/resources/lang/es/shop/order.php b/resources/lang/es/shop/order.php index e384dad3..f7cae55c 100644 --- a/resources/lang/es/shop/order.php +++ b/resources/lang/es/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => 'pedido inválido', - 'confirm_order' => 'El usuario confirma la recepción', - 'cancel_order' => 'El usuario cancela el pedido', + 'invalid_order' => 'pedido inválido', + 'confirm_order' => 'El usuario confirma la recepción', + 'cancel_order' => 'El usuario cancela el pedido', 'order_already_paid' => 'orden pagada', ]; diff --git a/resources/lang/es/shop/products.php b/resources/lang/es/shop/products.php index c25f1a8a..f991c32d 100644 --- a/resources/lang/es/shop/products.php +++ b/resources/lang/es/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => 'búsqueda', + 'search' => 'búsqueda', 'add_to_favorites' => 'agregar a los favoritos', - 'add_to_cart' => 'agregar al carrito de compras', - 'buy_now' => 'Comprar ahora', - 'product_details' => 'Detalles de producto', - 'in_stock' => 'En stock', - 'out_stock' => 'Agotado', - 'model' => 'modelo', + 'add_to_cart' => 'agregar al carrito de compras', + 'buy_now' => 'Comprar ahora', + 'product_details' => 'Detalles de producto', + 'in_stock' => 'En stock', + 'out_stock' => 'Agotado', + 'model' => 'modelo', ]; diff --git a/resources/lang/es/shop/steps.php b/resources/lang/es/shop/steps.php index 248dd4b7..59332a87 100644 --- a/resources/lang/es/shop/steps.php +++ b/resources/lang/es/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'paso', - 'cart' => 'carrito de compras', - 'checkout' => 'La cuenta, por favor', + 'index' => 'paso', + 'cart' => 'carrito de compras', + 'checkout' => 'La cuenta, por favor', 'submitted_successfully' => 'Enviado satisfactoriamente', - 'payment' => 'Pago', + 'payment' => 'Pago', ]; diff --git a/resources/lang/es/shop/wishlist.php b/resources/lang/es/shop/wishlist.php index 8704aaf2..162ec37b 100644 --- a/resources/lang/es/shop/wishlist.php +++ b/resources/lang/es/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'Agregar a favoritos con éxito', + 'add_wishlist_success' => 'Agregar a favoritos con éxito', 'remove_wishlist_success' => 'Eliminar favorito con éxito', ]; diff --git a/resources/lang/fr/address.php b/resources/lang/fr/address.php index 31f83b0b..89a93537 100644 --- a/resources/lang/fr/address.php +++ b/resources/lang/fr/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Modifier l\'adresse', - 'name' => 'Nom', - 'phone' => 'numéro de téléphone', + 'index' => 'Modifier l\'adresse', + 'name' => 'Nom', + 'phone' => 'numéro de téléphone', 'country_id' => 'Identifiant du pays', - 'zone' => 'Province', - 'zone_id' => 'Identifiant provincial', - 'address_1' => 'Adresse 1', - 'address_2' => 'Adresse 2', - 'address' => 'adresse', + 'zone' => 'Province', + 'zone_id' => 'Identifiant provincial', + 'address_1' => 'Adresse 1', + 'address_2' => 'Adresse 2', + 'address' => 'adresse', 'enter_city' => 'entrer l\'adresse', - 'post_code' => 'code postal', - 'default' => 'Adresse par défaut', + 'post_code' => 'code postal', + 'default' => 'Adresse par défaut', ]; diff --git a/resources/lang/fr/admin/admin_roles.php b/resources/lang/fr/admin/admin_roles.php index c8ce7f2f..23366eeb 100644 --- a/resources/lang/fr/admin/admin_roles.php +++ b/resources/lang/fr/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => 'tout sélectionner', - 'unselect_all' => 'désélectionner', - 'role_name' => 'nom du rôle', - 'role_management' => 'gestion des rôles', - 'permission' => 'autorisation', - 'error_roles' => 'Veuillez sélectionner au moins un rôle', + 'select_all' => 'tout sélectionner', + 'unselect_all' => 'désélectionner', + 'role_name' => 'nom du rôle', + 'role_management' => 'gestion des rôles', + 'permission' => 'autorisation', + 'error_roles' => 'Veuillez sélectionner au moins un rôle', ]; diff --git a/resources/lang/fr/admin/attribute.php b/resources/lang/fr/admin/attribute.php index 1260aaae..9d5fcacb 100644 --- a/resources/lang/fr/admin/attribute.php +++ b/resources/lang/fr/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'attribut', - 'attribute_info' => 'informations d\'attribut', - 'create_at' => 'créer un attribut', - 'attribute_value' => 'valeur d\'attribut', - 'set_attribute' => 'attribut de configuration', - 'add_attribute' => 'ajouter une valeur d\'attribut', + 'index' => 'attribut', + 'attribute_info' => 'informations d\'attribut', + 'create_at' => 'créer un attribut', + 'attribute_value' => 'valeur d\'attribut', + 'set_attribute' => 'attribut de configuration', + 'add_attribute' => 'ajouter une valeur d\'attribut', 'before_attribute' => 'Veuillez d\'abord sélectionner l\'attribut de gauche', - 'btn_at' => 'Aller maintenant', - 'btn_later' => 'plus tard', - 'to_info_values' => 'Veuillez accéder à la page de détails pour modifier les valeurs des attributs', + 'btn_at' => 'Aller maintenant', + 'btn_later' => 'plus tard', + 'to_info_values' => 'Veuillez accéder à la page de détails pour modifier les valeurs des attributs', ]; diff --git a/resources/lang/fr/admin/attribute_groups.php b/resources/lang/fr/admin/attribute_groups.php index e33ffed7..9fbd8f20 100644 --- a/resources/lang/fr/admin/attribute_groups.php +++ b/resources/lang/fr/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => 'groupe d\'attributs', + 'index' => 'groupe d\'attributs', 'create_at_groups' => 'créer un groupe d\'attributs', ]; diff --git a/resources/lang/fr/admin/brand.php b/resources/lang/fr/admin/brand.php index 7e346c40..582b6f55 100644 --- a/resources/lang/fr/admin/brand.php +++ b/resources/lang/fr/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => 'marque', + 'index' => 'marque', - 'brands_index' => 'liste de marques', - 'brands_create' => 'Créer une marque', - 'brands_show' => 'détails de la marque', - 'brands_update' => 'mettre à jour la marque', - 'brands_delete' => 'supprimer la marque', - 'error_upload' => 'Veuillez télécharger l\'icône' + 'brands_index' => 'liste de marques', + 'brands_create' => 'Créer une marque', + 'brands_show' => 'détails de la marque', + 'brands_update' => 'mettre à jour la marque', + 'brands_delete' => 'supprimer la marque', + 'error_upload' => 'Veuillez télécharger l\'icône', ]; diff --git a/resources/lang/fr/admin/builder.php b/resources/lang/fr/admin/builder.php index 90b63846..43960c6e 100644 --- a/resources/lang/fr/admin/builder.php +++ b/resources/lang/fr/admin/builder.php @@ -11,243 +11,242 @@ */ return [ - 'heading_title' => 'édition de pages', - 'modules_instructions' => 'Modules disponibles, cliquez pour ajouter à la page', - 'text_floor_prompt' => 'Paramètres (la configuration de l\'étage doit être enregistrée et actualisée pour mettre à jour la page)', - 'text_new_page' => 'Ajouter une nouvelle page', - 'text_quit' => 'abandonner', - 'text_save' => 'enregistrer', - 'text_view_page' => 'Afficher la page', - 'text_module' => 'module', - 'text_module_title' => 'titre du module', - 'text_menu' => 'Navigation', - 'text_drag_sort' => 'Glisser le tri', - 'text_set_up' => 'configuration', - 'text_delete' => 'effacer', - 'text_floor' => 'sol', - 'text_add_module' => 'Ajouter un module', - 'text_to_menu' => 'Modifier le menu de navigation', - 'text_other' => 'autre', - 'text_preparing' => 'Préparation...', - 'text_floor_setting' => 'réglage du sol', - 'text_background_color' => 'couleur de fond', - 'text_sure' => 'OK', - 'text_page_name' => 'Veuillez entrer un nouveau nom de page', - 'text_is_save' => 'Veuillez vous assurer que les données de la page actuelle ont été enregistrées ! ', - 'text_pop_ads' => 'annonces pop-up', - 'text_style_setting' => 'paramètre de style', - 'text_is_save_data' => 'Avant de changer de page, assurez-vous que les données de la page actuelle ont été enregistrées ? ', - 'text_hint' => 'indice', - 'text_cancel' => 'Annuler', - 'text_created_success' => 'page créée avec succès', - 'text_html_none' => 'Erreur de chargement du module, les données HTML sont vides ! ', - 'text_is_delete' => 'OK pour supprimer', - 'text_enable' => 'activer', - 'text_set_title' => 'Titre de la configuration', - 'text_set_subtitle' => 'Configurer les sous-titres', - 'text_suggested_size' => 'Taille suggérée (largeur x hauteur) : ', - 'text_word' => 'texte', - 'text_add_pictures' => 'Ajouter des images', - 'text_refresh_cookie' => 'Actualiser les cookies', - 'text_popup_hint' => 'Remarque: les clics de l\'utilisateur pour fermer ne seront plus affichés tant que le navigateur ne sera pas fermé puis rouvert. Pour les tests locaux, vous pouvez cliquer sur "Actualiser le cookie", puis actualiser le navigateur et la fenêtre contextuelle peut être réactivée. ', - 'text_cookie_refresh_success' => 'Cookie actualisé avec succès, actualisez le navigateur pour voir le contenu de la fenêtre pop-up. ', - 'text_add_hot_links' => 'Ajouter des liens de recherche actifs', - 'text_add' => 'Ajouter à', - 'text_margin_top' => 'Remplissage du module - haut', - 'text_margin_bottom' => 'remplissage du module - bas', - 'text_file_manager' => 'gestionnaire de fichiers', - 'modules_link' => 'lien', - 'modules_choose_link' => 'Choisir le lien', - 'text_select_link' => 'Veuillez sélectionner la page de lien vers laquelle accéder', - 'text_no' => 'non', - 'text_search' => 'recherche', - 'text_is_newpage' => 'Si une nouvelle fenêtre est ouverte:', - 'text_manage' => 'Gestion', - 'text_title_cover' => 'Titre (couvre le nom du lien sélectionné ci-dessous)', - 'text_enter_link' => 'Veuillez entrer l\'adresse du lien', - 'text_states' => 'état', - 'text_disable' => 'désactivé', - 'text_no_data' => 'Les données n\'existent pas ou ont été supprimées', - 'text_to_add' => 'à ajouter', - 'text_category' => 'Classement', - 'text_information' => 'page d\'informations', - 'text_manufacturer' => 'marque', - 'text_static' => 'connexion fixe', - 'text_custom' => 'personnalisé', - 'text_top_text' => 'Texte supérieur', - 'text_edit_page_name' => 'modifier le nom de la page', - 'text_page_name_no' => 'Le nom ne peut pas être vide', - 'custom_name' => 'nom personnalisé', + 'heading_title' => 'édition de pages', + 'modules_instructions' => 'Modules disponibles, cliquez pour ajouter à la page', + 'text_floor_prompt' => 'Paramètres (la configuration de l\'étage doit être enregistrée et actualisée pour mettre à jour la page)', + 'text_new_page' => 'Ajouter une nouvelle page', + 'text_quit' => 'abandonner', + 'text_save' => 'enregistrer', + 'text_view_page' => 'Afficher la page', + 'text_module' => 'module', + 'text_module_title' => 'titre du module', + 'text_menu' => 'Navigation', + 'text_drag_sort' => 'Glisser le tri', + 'text_set_up' => 'configuration', + 'text_delete' => 'effacer', + 'text_floor' => 'sol', + 'text_add_module' => 'Ajouter un module', + 'text_to_menu' => 'Modifier le menu de navigation', + 'text_other' => 'autre', + 'text_preparing' => 'Préparation...', + 'text_floor_setting' => 'réglage du sol', + 'text_background_color' => 'couleur de fond', + 'text_sure' => 'OK', + 'text_page_name' => 'Veuillez entrer un nouveau nom de page', + 'text_is_save' => 'Veuillez vous assurer que les données de la page actuelle ont été enregistrées ! ', + 'text_pop_ads' => 'annonces pop-up', + 'text_style_setting' => 'paramètre de style', + 'text_is_save_data' => 'Avant de changer de page, assurez-vous que les données de la page actuelle ont été enregistrées ? ', + 'text_hint' => 'indice', + 'text_cancel' => 'Annuler', + 'text_created_success' => 'page créée avec succès', + 'text_html_none' => 'Erreur de chargement du module, les données HTML sont vides ! ', + 'text_is_delete' => 'OK pour supprimer', + 'text_enable' => 'activer', + 'text_set_title' => 'Titre de la configuration', + 'text_set_subtitle' => 'Configurer les sous-titres', + 'text_suggested_size' => 'Taille suggérée (largeur x hauteur) : ', + 'text_word' => 'texte', + 'text_add_pictures' => 'Ajouter des images', + 'text_refresh_cookie' => 'Actualiser les cookies', + 'text_popup_hint' => 'Remarque: les clics de l\'utilisateur pour fermer ne seront plus affichés tant que le navigateur ne sera pas fermé puis rouvert. Pour les tests locaux, vous pouvez cliquer sur "Actualiser le cookie", puis actualiser le navigateur et la fenêtre contextuelle peut être réactivée. ', + 'text_cookie_refresh_success' => 'Cookie actualisé avec succès, actualisez le navigateur pour voir le contenu de la fenêtre pop-up. ', + 'text_add_hot_links' => 'Ajouter des liens de recherche actifs', + 'text_add' => 'Ajouter à', + 'text_margin_top' => 'Remplissage du module - haut', + 'text_margin_bottom' => 'remplissage du module - bas', + 'text_file_manager' => 'gestionnaire de fichiers', + 'modules_link' => 'lien', + 'modules_choose_link' => 'Choisir le lien', + 'text_select_link' => 'Veuillez sélectionner la page de lien vers laquelle accéder', + 'text_no' => 'non', + 'text_search' => 'recherche', + 'text_is_newpage' => 'Si une nouvelle fenêtre est ouverte:', + 'text_manage' => 'Gestion', + 'text_title_cover' => 'Titre (couvre le nom du lien sélectionné ci-dessous)', + 'text_enter_link' => 'Veuillez entrer l\'adresse du lien', + 'text_states' => 'état', + 'text_disable' => 'désactivé', + 'text_no_data' => 'Les données n\'existent pas ou ont été supprimées', + 'text_to_add' => 'à ajouter', + 'text_category' => 'Classement', + 'text_information' => 'page d\'informations', + 'text_manufacturer' => 'marque', + 'text_static' => 'connexion fixe', + 'text_custom' => 'personnalisé', + 'text_top_text' => 'Texte supérieur', + 'text_edit_page_name' => 'modifier le nom de la page', + 'text_page_name_no' => 'Le nom ne peut pas être vide', + 'custom_name' => 'nom personnalisé', // Connexion fixe - 'text_static_product_latest' => 'Dernier produit', - 'text_static_product_special' => 'produit spécial', + 'text_static_product_latest' => 'Dernier produit', + 'text_static_product_special' => 'produit spécial', 'text_static_product_manufacturer' => 'zone de marque', - 'text_static_account_account' => 'Centre des membres', - 'text_static_account_order' => 'ordre historique', - 'text_static_account_wishlist' => 'Liste de favoris', - 'text_static_affiliate_login' => 'membre affilié', - 'text_static_account_newsletter' => 'S\'abonner à la consultation', - 'text_static_information_contact' => 'Nous contacter', - 'text_static_information_sitemap' => 'Plan du site', - 'text_static_information_faq' => 'Foire aux questions', - 'text_static_account_voucher' => 'bon cadeau', - 'text_static_account_login' => 'Connexion', - 'text_static_account_register' => 'S\'inscrire', - 'text_static_checkout_cart' => 'Panier', - 'text_static_blog_home' => 'blog', + 'text_static_account_account' => 'Centre des membres', + 'text_static_account_order' => 'ordre historique', + 'text_static_account_wishlist' => 'Liste de favoris', + 'text_static_affiliate_login' => 'membre affilié', + 'text_static_account_newsletter' => 'S\'abonner à la consultation', + 'text_static_information_contact' => 'Nous contacter', + 'text_static_information_sitemap' => 'Plan du site', + 'text_static_information_faq' => 'Foire aux questions', + 'text_static_account_voucher' => 'bon cadeau', + 'text_static_account_login' => 'Connexion', + 'text_static_account_register' => 'S\'inscrire', + 'text_static_checkout_cart' => 'Panier', + 'text_static_blog_home' => 'blog', - 'text_edit_product' => 'Modifier les détails du produit', - 'text_edit_home' => 'Modifier l\'accueil', - 'text_edit_mb_home' => 'Modifier la page d\'accueil mobile', - 'text_footer_edit' => 'Modifier le pied de page', - 'text_header_edit' => 'Modifier l\'en-tête', - 'text_save_refresh' => 'Enregistrer et actualiser', - 'text_save_refresh_header' => 'Enregistrer (actualiser l\'en-tête)', - 'text_service_icon' => 'icône de service', - 'text_describe' => 'description', - 'text_add_link' => 'Ajouter un lien', - 'text_is_btn' => 'afficher ou non le bouton', - 'text_phone' => 'Téléphone', - 'text_address' => 'adresse', - 'text_email' => 'Courrier', - 'text_copyright' => 'copyright/image', - 'text_yq_link' => 'Lien d\'amitié', - 'text_link_bar' => 'barre de liens', - 'text_introduce' => 'Présentation', - 'text_up_logo' => 'Télécharger le logo', - 'text_hot_keywords' => 'mots-clés de recherche populaires', - 'text_title' => 'Titre', - 'text_text_notific' => 'notification textuelle', - 'text_only_home' => 'S\'affiche uniquement sur la page d\'accueil', - 'text_background_color' => 'couleur de fond', - 'text_font_color' => 'couleur de la police', - 'text_image' => 'image', - 'text_show' => 'afficher', - 'text_is_phone' => 'Afficher le numéro de téléphone du contact', - 'text_half_angle' => 'Utilisez des virgules demi-chasse pour séparer', - 'text_prompt_words' => 'texte d\'invite', - 'text_search_bar' => 'barre de recherche', - 'text_btn_text' => 'texte du bouton', - 'text_banner_ad' => 'bannière publicitaire', - 'text_l_c' => 'colonne langue/devise', - 'text_top_color' => 'Couleur du haut', - 'text_title_color' => 'couleur du titre', - 'text_color' => 'couleur', - 'text_left_text' => 'texte gauche', - 'text_right_icon' => 'icône de paiement correct', - 'text_bgi' => 'image de fond', - 'text_btn' => 'bouton', + 'text_edit_product' => 'Modifier les détails du produit', + 'text_edit_home' => 'Modifier l\'accueil', + 'text_edit_mb_home' => 'Modifier la page d\'accueil mobile', + 'text_footer_edit' => 'Modifier le pied de page', + 'text_header_edit' => 'Modifier l\'en-tête', + 'text_save_refresh' => 'Enregistrer et actualiser', + 'text_save_refresh_header' => 'Enregistrer (actualiser l\'en-tête)', + 'text_service_icon' => 'icône de service', + 'text_describe' => 'description', + 'text_add_link' => 'Ajouter un lien', + 'text_is_btn' => 'afficher ou non le bouton', + 'text_phone' => 'Téléphone', + 'text_address' => 'adresse', + 'text_email' => 'Courrier', + 'text_copyright' => 'copyright/image', + 'text_yq_link' => 'Lien d\'amitié', + 'text_link_bar' => 'barre de liens', + 'text_introduce' => 'Présentation', + 'text_up_logo' => 'Télécharger le logo', + 'text_hot_keywords' => 'mots-clés de recherche populaires', + 'text_title' => 'Titre', + 'text_text_notific' => 'notification textuelle', + 'text_only_home' => 'S\'affiche uniquement sur la page d\'accueil', + 'text_background_color' => 'couleur de fond', + 'text_font_color' => 'couleur de la police', + 'text_image' => 'image', + 'text_show' => 'afficher', + 'text_is_phone' => 'Afficher le numéro de téléphone du contact', + 'text_half_angle' => 'Utilisez des virgules demi-chasse pour séparer', + 'text_prompt_words' => 'texte d\'invite', + 'text_search_bar' => 'barre de recherche', + 'text_btn_text' => 'texte du bouton', + 'text_banner_ad' => 'bannière publicitaire', + 'text_l_c' => 'colonne langue/devise', + 'text_top_color' => 'Couleur du haut', + 'text_title_color' => 'couleur du titre', + 'text_color' => 'couleur', + 'text_left_text' => 'texte gauche', + 'text_right_icon' => 'icône de paiement correct', + 'text_bgi' => 'image de fond', + 'text_btn' => 'bouton', // page - 'page_product_title_size' => 'Taille de la police du titre du produit', - 'page_product_title_color' => 'Couleur du titre du produit', - 'page_product_price_color' => 'Couleur du prix du produit', - 'page_product_thumb_position' => 'position de la vignette', - 'page_product_image' => 'image du produit', - 'page_product_bottom' => 'bas', - 'page_product_left' => 'côté gauche', - 'page_product_magnifying_style' => 'style loupe', - 'page_product_magnifying_window' => 'fenêtre externe', - 'page_product_magnifying_inner' => 'suspension interne', - 'page_product_magnifying_lens' => 'loupe interne', - 'page_product_share' => 'Partager', - 'page_product_share_code' => 'Partager le code', - 'page_product_general_settings' => 'Paramètres généraux', - 'page_product_font_size' => 'taille de la police', + 'page_product_title_size' => 'Taille de la police du titre du produit', + 'page_product_title_color' => 'Couleur du titre du produit', + 'page_product_price_color' => 'Couleur du prix du produit', + 'page_product_thumb_position' => 'position de la vignette', + 'page_product_image' => 'image du produit', + 'page_product_bottom' => 'bas', + 'page_product_left' => 'côté gauche', + 'page_product_magnifying_style' => 'style loupe', + 'page_product_magnifying_window' => 'fenêtre externe', + 'page_product_magnifying_inner' => 'suspension interne', + 'page_product_magnifying_lens' => 'loupe interne', + 'page_product_share' => 'Partager', + 'page_product_share_code' => 'Partager le code', + 'page_product_general_settings' => 'Paramètres généraux', + 'page_product_font_size' => 'taille de la police', // ModuleS List - 'modules_photo_text' => 'mélange image et texte', - 'modules_video_module' => 'module vidéo', - 'modules_customer_reviews' => 'avis clients', - 'modules_images_link' => 'lien multi-images', - 'modules_background_icon_text' => 'texte de l\'icône de fond', - 'modules_slideshow_category' => 'catégorie diaporama', - 'modules_bargain' => 'bonne affaire', - 'modules_bestseller' => 'Meilleur vendeur', - 'modules_blog' => 'blog', - 'modules_carousel' => 'Icône Swing Bo', - 'modules_category' => 'module de catégorie', - 'modules_coupon' => 'coupon', - 'modules_flash_sale' => 'Pic de marchandise', - 'modules_group_buying' => 'groupe d\'achat', - 'modules_html' => 'texte enrichi', - 'modules_icon_text' => 'texte de l\'icône', - 'modules_image_100' => 'Module image unique', - 'modules_image_200' => 'une ligne deux images', - 'modules_image_300' => 'une ligne trois images', - 'modules_image_301' => 'une ligne trois images-pro', - 'modules_image_400' => 'une ligne quatre images', - 'modules_image_401' => 'une ligne quatre images-pro', - 'modules_latest' => 'dernier produit', - 'modules_manufacturer' => 'liste des marques', - 'modules_product' => 'produit de base', - 'modules_product_tab' => 'onglet produits', - 'modules_slideshow' => 'diaporama', - 'modules_quantity' => 'Afficher la quantité limite', - 'modules_manage_bargain' => 'Gérer les produits de négociation', - 'modules_manage_blog' => 'Gestion du blog', - 'modules_no_blog' => 'Aucun article, veuillez aller dans [Gestion de contenu -> Gestion du blog] pour configurer les articles. ', - 'modules_slides_per_view' => 'Numéro d\'affichage sur un écran', - 'modules_enter_content' => 'Veuillez saisir le contenu', - 'modules_full_screen' => 'Si plein écran', - 'modules_content' => 'contenu', - 'modules_edit_content' => 'modifier le contenu', - 'modules_select_image' => 'sélectionner l\'image', - 'modules_quantity_line' => 'une ligne en montre plusieurs', - 'modules_please_choose' => 'Choisissez s\'il vous plaît', - 'modules_choose' => 'choisir', - 'modules_add_category' => 'Ajouter une catégorie', - 'modules_choose_category' => 'Choisir une catégorie', - 'modules_set_coupon' => 'Configuration des coupons', - 'modules_no_coupon' => 'Aucune donnée de coupon', - 'modules_manage_flash' => 'Gérer les produits spike', - 'modules_manage_group' => 'Gérer les produits du groupe', - 'modules_no_state' => 'Le module actuel n\'est pas activé ou configuré, veuillez passer en arrière-plan [gestion des modules] pour configurer ce module. ', - 'modules_grid_mode' => 'mode grille', - 'modules_more_link' => 'plus de liens', - 'modules_choose_brand' => 'Choisissez une marque', - 'modules_set_product' => 'Configurer les produits', - 'modules_keywords_search' => 'Veuillez saisir un mot clé de recherche', - 'modules_test_name' => 'nom du test', - 'modules_please_products' => 'veuillez ajouter des produits', - 'modules_image_size' => 'taille de l\'image', - 'modules_height' => 'haut', - 'modules_width' => 'largeur', - 'modules_category_style' => 'style d\'affichage des catégories', - 'modules_down' => 'ci-dessous', - 'modules_left' => 'gauche', - 'modules_category_no' => 'Ne pas catégoriser', - 'modules_review_name' => 'Nom', - 'modules_profession' => 'professionnel', - 'modules_video_cover' => 'couverture vidéo', - 'modules_video' => 'vidéo', - + 'modules_photo_text' => 'mélange image et texte', + 'modules_video_module' => 'module vidéo', + 'modules_customer_reviews' => 'avis clients', + 'modules_images_link' => 'lien multi-images', + 'modules_background_icon_text' => 'texte de l\'icône de fond', + 'modules_slideshow_category' => 'catégorie diaporama', + 'modules_bargain' => 'bonne affaire', + 'modules_bestseller' => 'Meilleur vendeur', + 'modules_blog' => 'blog', + 'modules_carousel' => 'Icône Swing Bo', + 'modules_category' => 'module de catégorie', + 'modules_coupon' => 'coupon', + 'modules_flash_sale' => 'Pic de marchandise', + 'modules_group_buying' => 'groupe d\'achat', + 'modules_html' => 'texte enrichi', + 'modules_icon_text' => 'texte de l\'icône', + 'modules_image_100' => 'Module image unique', + 'modules_image_200' => 'une ligne deux images', + 'modules_image_300' => 'une ligne trois images', + 'modules_image_301' => 'une ligne trois images-pro', + 'modules_image_400' => 'une ligne quatre images', + 'modules_image_401' => 'une ligne quatre images-pro', + 'modules_latest' => 'dernier produit', + 'modules_manufacturer' => 'liste des marques', + 'modules_product' => 'produit de base', + 'modules_product_tab' => 'onglet produits', + 'modules_slideshow' => 'diaporama', + 'modules_quantity' => 'Afficher la quantité limite', + 'modules_manage_bargain' => 'Gérer les produits de négociation', + 'modules_manage_blog' => 'Gestion du blog', + 'modules_no_blog' => 'Aucun article, veuillez aller dans [Gestion de contenu -> Gestion du blog] pour configurer les articles. ', + 'modules_slides_per_view' => 'Numéro d\'affichage sur un écran', + 'modules_enter_content' => 'Veuillez saisir le contenu', + 'modules_full_screen' => 'Si plein écran', + 'modules_content' => 'contenu', + 'modules_edit_content' => 'modifier le contenu', + 'modules_select_image' => 'sélectionner l\'image', + 'modules_quantity_line' => 'une ligne en montre plusieurs', + 'modules_please_choose' => 'Choisissez s\'il vous plaît', + 'modules_choose' => 'choisir', + 'modules_add_category' => 'Ajouter une catégorie', + 'modules_choose_category' => 'Choisir une catégorie', + 'modules_set_coupon' => 'Configuration des coupons', + 'modules_no_coupon' => 'Aucune donnée de coupon', + 'modules_manage_flash' => 'Gérer les produits spike', + 'modules_manage_group' => 'Gérer les produits du groupe', + 'modules_no_state' => 'Le module actuel n\'est pas activé ou configuré, veuillez passer en arrière-plan [gestion des modules] pour configurer ce module. ', + 'modules_grid_mode' => 'mode grille', + 'modules_more_link' => 'plus de liens', + 'modules_choose_brand' => 'Choisissez une marque', + 'modules_set_product' => 'Configurer les produits', + 'modules_keywords_search' => 'Veuillez saisir un mot clé de recherche', + 'modules_test_name' => 'nom du test', + 'modules_please_products' => 'veuillez ajouter des produits', + 'modules_image_size' => 'taille de l\'image', + 'modules_height' => 'haut', + 'modules_width' => 'largeur', + 'modules_category_style' => 'style d\'affichage des catégories', + 'modules_down' => 'ci-dessous', + 'modules_left' => 'gauche', + 'modules_category_no' => 'Ne pas catégoriser', + 'modules_review_name' => 'Nom', + 'modules_profession' => 'professionnel', + 'modules_video_cover' => 'couverture vidéo', + 'modules_video' => 'vidéo', // mobile - 'mobile_search' => 'barre de recherche', - 'mobile_search_normal' => 'Non fixé en haut de l\'écran', - 'mobile_search_hide' => 'Ne pas afficher la barre de recherche supérieure', - 'mobile_search_fixed' => 'fixé en haut de l\'écran (par défaut)', + 'mobile_search' => 'barre de recherche', + 'mobile_search_normal' => 'Non fixé en haut de l\'écran', + 'mobile_search_hide' => 'Ne pas afficher la barre de recherche supérieure', + 'mobile_search_fixed' => 'fixé en haut de l\'écran (par défaut)', // Menu - 'main_menu' => 'menu principal', - 'please_add_data' => 'veuillez ajouter des données', - 'add_main_menu' => 'Ajouter un menu principal', - 'main_menu_name_link' => 'nom/lien du menu principal', - 'main_menu_label' => 'Libellé du menu principal', - 'label_background_color' => 'couleur de fond de l\'étiquette', - 'label_text_color' => 'couleur du texte de l\'étiquette', - 'submenu_group' => 'sous-menu (groupe)', - 'add_menu_group' => 'Ajouter un groupe de menus', - 'full_screen' => 'Si plein écran', - 'menu' => 'menu', - 'add_submenu_link' => 'Ajouter un lien de sous-menu', - 'type' => 'type', + 'main_menu' => 'menu principal', + 'please_add_data' => 'veuillez ajouter des données', + 'add_main_menu' => 'Ajouter un menu principal', + 'main_menu_name_link' => 'nom/lien du menu principal', + 'main_menu_label' => 'Libellé du menu principal', + 'label_background_color' => 'couleur de fond de l\'étiquette', + 'label_text_color' => 'couleur du texte de l\'étiquette', + 'submenu_group' => 'sous-menu (groupe)', + 'add_menu_group' => 'Ajouter un groupe de menus', + 'full_screen' => 'Si plein écran', + 'menu' => 'menu', + 'add_submenu_link' => 'Ajouter un lien de sous-menu', + 'type' => 'type', // footer - 'footer_edit' => 'éditeur de pied de page', - 'sub_title' => 'sous-titre', - 'introduction' => 'Présentation', - 'copyright_settings' => 'paramètres de copyright', + 'footer_edit' => 'éditeur de pied de page', + 'sub_title' => 'sous-titre', + 'introduction' => 'Présentation', + 'copyright_settings' => 'paramètres de copyright', ]; diff --git a/resources/lang/fr/admin/category.php b/resources/lang/fr/admin/category.php index de7951ea..aa1b55fd 100644 --- a/resources/lang/fr/admin/category.php +++ b/resources/lang/fr/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Classification', - 'edit_category' => 'Modifier la catégorie', - 'upper_category' => 'catégorie supérieure', + 'index' => 'Classification', + 'edit_category' => 'Modifier la catégorie', + 'upper_category' => 'catégorie supérieure', - 'categories_index' => 'liste des catégories', - 'categories_create' => 'Créer des catégories', - 'categories_show' => 'détails de la catégorie', - 'categories_update' => 'Mettre à jour les catégories', - 'categories_delete' => 'Supprimer la catégorie', + 'categories_index' => 'liste des catégories', + 'categories_create' => 'Créer des catégories', + 'categories_show' => 'détails de la catégorie', + 'categories_update' => 'Mettre à jour les catégories', + 'categories_delete' => 'Supprimer la catégorie', ]; diff --git a/resources/lang/fr/admin/common.php b/resources/lang/fr/admin/common.php index 1b94d3ca..8e79eb8a 100644 --- a/resources/lang/fr/admin/common.php +++ b/resources/lang/fr/admin/common.php @@ -10,65 +10,65 @@ */ return [ - 'admin_panel' => 'Gestion des coulisses', - 'edit' => 'Éditer', - 'status' => 'Etat', - 'action' => 'fonctionner', - 'install' => 'Installer', - 'uninstall' => 'désinstaller', + 'admin_panel' => 'Gestion des coulisses', + 'edit' => 'Éditer', + 'status' => 'Etat', + 'action' => 'fonctionner', + 'install' => 'Installer', + 'uninstall' => 'désinstaller', // errors - 'forbidden' => 'Interdit', - 'has_no_permission' => 'Vous n\'êtes pas autorisé à accéder à cette page, veuillez contacter l\'administrateur système. ', + 'forbidden' => 'Interdit', + 'has_no_permission' => 'Vous n\'êtes pas autorisé à accéder à cette page, veuillez contacter l\'administrateur système. ', // header - 'home' => 'Gérer la page d\'accueil', - 'order' => 'gestion des commandes', - 'rma' => 'gestion du service après-vente', - 'rma_reason' => 'Gestion des motifs de retour', - 'product' => 'gestion des produits', - 'brand' => 'gestion de la marque', - 'category' => 'gestion des catégories', - 'customer_group' => 'gestion des groupes de clients', - 'customer' => 'gestion des clients', - 'content' => 'gestion de contenu', - 'setting' => 'paramètres système', - 'plugin' => 'gestion des plugins', - 'admin_user' => 'utilisateur principal', - 'admin_role' => 'rôle d\'utilisateur', - 'region' => 'groupement de régions', - 'tax_rate' => 'gestion des taux d\'imposition', - 'tax_class' => 'gestion des taxes', - 'currency' => 'gestion des devises', - 'language' => 'gestion des langues', - 'zone' => 'gestion de la province', - 'country' => 'gestion pays', - 'file_manager' => 'gestionnaire de fichiers', - 'access_frontend' => 'Accès frontal', + 'home' => 'Gérer la page d\'accueil', + 'order' => 'gestion des commandes', + 'rma' => 'gestion du service après-vente', + 'rma_reason' => 'Gestion des motifs de retour', + 'product' => 'gestion des produits', + 'brand' => 'gestion de la marque', + 'category' => 'gestion des catégories', + 'customer_group' => 'gestion des groupes de clients', + 'customer' => 'gestion des clients', + 'content' => 'gestion de contenu', + 'setting' => 'paramètres système', + 'plugin' => 'gestion des plugins', + 'admin_user' => 'utilisateur principal', + 'admin_role' => 'rôle d\'utilisateur', + 'region' => 'groupement de régions', + 'tax_rate' => 'gestion des taux d\'imposition', + 'tax_class' => 'gestion des taxes', + 'currency' => 'gestion des devises', + 'language' => 'gestion des langues', + 'zone' => 'gestion de la province', + 'country' => 'gestion pays', + 'file_manager' => 'gestionnaire de fichiers', + 'access_frontend' => 'Accès frontal', // sidebar - 'settings_index' => 'paramètres système', - 'admin_users_index' => 'utilisateurs principaux', - 'plugins_index' => 'liste des plugins', - 'regions_index' => 'groupement de régions', - 'tax_rates_index' => 'paramètres du taux d\'imposition', - 'tax_classes_index' => 'catégorie de taxe', - 'currencies_index' => 'gestion des devises', - 'languages_index' => 'gestion des langues', - 'design_index' => 'Décoration de la maison', - 'pages_index' => 'page d\'information', - 'design_footer_index' => 'décoration du pied de page', - 'design_menu_index' => 'Configuration navigation', - 'categories_index' => 'catégorie de produit', - 'products_index' => 'gestion des produits', - 'products_trashed' => 'corbeille', - 'customers_trashed' => 'corbeille', - 'brands_index' => 'marque du produit', - 'orders_index' => 'liste de commandes', - 'rmas_index' => 'gestion après-vente', - 'rma_reasons_index' => 'raison après-vente', - 'customers_index' => 'liste de clients', - 'customer_groups_index' => 'groupe de clients', - 'countries_index' => 'Gestion des pays', - 'zones_index' => 'gestion des provinces', + 'settings_index' => 'paramètres système', + 'admin_users_index' => 'utilisateurs principaux', + 'plugins_index' => 'liste des plugins', + 'regions_index' => 'groupement de régions', + 'tax_rates_index' => 'paramètres du taux d\'imposition', + 'tax_classes_index' => 'catégorie de taxe', + 'currencies_index' => 'gestion des devises', + 'languages_index' => 'gestion des langues', + 'design_index' => 'Décoration de la maison', + 'pages_index' => 'page d\'information', + 'design_footer_index' => 'décoration du pied de page', + 'design_menu_index' => 'Configuration navigation', + 'categories_index' => 'catégorie de produit', + 'products_index' => 'gestion des produits', + 'products_trashed' => 'corbeille', + 'customers_trashed' => 'corbeille', + 'brands_index' => 'marque du produit', + 'orders_index' => 'liste de commandes', + 'rmas_index' => 'gestion après-vente', + 'rma_reasons_index' => 'raison après-vente', + 'customers_index' => 'liste de clients', + 'customer_groups_index' => 'groupe de clients', + 'countries_index' => 'Gestion des pays', + 'zones_index' => 'gestion des provinces', ]; diff --git a/resources/lang/fr/admin/country.php b/resources/lang/fr/admin/country.php index 2e3d96b1..0c995278 100644 --- a/resources/lang/fr/admin/country.php +++ b/resources/lang/fr/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => 'nom du pays', + 'country_name' => 'nom du pays', - 'countries_index' => 'Liste des pays', - 'countries_create' => 'créer un pays', - 'countries_update' => 'mettre à jour le pays', + 'countries_index' => 'Liste des pays', + 'countries_create' => 'créer un pays', + 'countries_update' => 'mettre à jour le pays', ]; diff --git a/resources/lang/fr/admin/currency.php b/resources/lang/fr/admin/currency.php index f66d65a5..2f15a7c1 100644 --- a/resources/lang/fr/admin/currency.php +++ b/resources/lang/fr/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => 'liste des devises', - 'currencies_create' => 'Créer une devise', - 'currencies_show' => 'détails de la devise', - 'currencies_update' => 'mettre à jour la devise', - 'currencies_delete' => 'Supprimer la devise', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'liste des devises', + 'currencies_create' => 'Créer une devise', + 'currencies_show' => 'détails de la devise', + 'currencies_update' => 'mettre à jour la devise', + 'currencies_delete' => 'Supprimer la devise', ]; diff --git a/resources/lang/fr/admin/customer.php b/resources/lang/fr/admin/customer.php index 48a2f5a2..678b607c 100644 --- a/resources/lang/fr/admin/customer.php +++ b/resources/lang/fr/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => 'liste de clients', - 'customers_create' => 'créer des clients', - 'customers_show' => 'coordonnées client', - 'customers_update' => 'mettre à jour les clients', - 'customers_delete' => 'supprimer des clients', + 'customers_index' => 'liste de clients', + 'customers_create' => 'créer des clients', + 'customers_show' => 'coordonnées client', + 'customers_update' => 'mettre à jour les clients', + 'customers_delete' => 'supprimer des clients', - 'user_info' => 'informations utilisateur', - 'address_management' => 'gestion des adresses', - 'user_name' => 'nom_utilisateur', - 'password_info' => 'Laissez vide pour conserver le mot de passe d\'origine inchangé', - 'add_address' => 'Ajouter une adresse', - 'no_address' => 'Le compte actuel n\'a pas d\'adresse', - 'edit_address' => 'Modifier l\'adresse', - 'adresse' => 'adresse', - 'choose_country' => 'Choisir un pays', - 'zones' => 'Province', - 'choose_zones' => 'Choisir la province', - 'enter_city' => 'Entrez la ville', - 'city' => 'ville', - 'zipcode' => 'code postal', - 'address_1' => 'adresse détaillée 1', - 'address_2' => 'adresse détaillée 2', + 'user_info' => 'informations utilisateur', + 'address_management' => 'gestion des adresses', + 'user_name' => 'nom_utilisateur', + 'password_info' => 'Laissez vide pour conserver le mot de passe d\'origine inchangé', + 'add_address' => 'Ajouter une adresse', + 'no_address' => 'Le compte actuel n\'a pas d\'adresse', + 'edit_address' => 'Modifier l\'adresse', + 'adresse' => 'adresse', + 'choose_country' => 'Choisir un pays', + 'zones' => 'Province', + 'choose_zones' => 'Choisir la province', + 'enter_city' => 'Entrez la ville', + 'city' => 'ville', + 'zipcode' => 'code postal', + 'address_1' => 'adresse détaillée 1', + 'address_2' => 'adresse détaillée 2', - 'cannot_delete_root' => 'Impossible de supprimer le compte root', - 'error_email' => 'Veuillez saisir le format d\'e-mail correct', - 'confirm_delete_address' => 'Êtes-vous sûr de vouloir supprimer l\'adresse? ', + 'cannot_delete_root' => 'Impossible de supprimer le compte root', + 'error_email' => 'Veuillez saisir le format d\'e-mail correct', + 'confirm_delete_address' => 'Êtes-vous sûr de vouloir supprimer l\'adresse? ', ]; diff --git a/resources/lang/fr/admin/customer_group.php b/resources/lang/fr/admin/customer_group.php index 086daa51..db25a5fb 100644 --- a/resources/lang/fr/admin/customer_group.php +++ b/resources/lang/fr/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'groupe de clients', - 'consumption_limit' => 'limite de consommation', - 'discount_rate' => 'taux de remise', - 'reward_points_factor' => 'facteur de points de récompense', - 'integral_factor' => 'Utiliser le coefficient intégral', + 'index' => 'groupe de clients', + 'consumption_limit' => 'limite de consommation', + 'discount_rate' => 'taux de remise', + 'reward_points_factor' => 'facteur de points de récompense', + 'integral_factor' => 'Utiliser le coefficient intégral', - 'customer_groups_index' => 'liste des groupes de clients', - 'customer_groups_create' => 'créer des groupes de clients', - 'customer_groups_show' => 'détails du groupe de clients', - 'customer_groups_update' => 'mettre à jour les groupes de clients', - 'customer_groups_delete' => 'supprimer le groupe de clients', - 'default_cannot_delete' => 'Le groupe de clients par défaut ne peut pas être supprimé', + 'customer_groups_index' => 'liste des groupes de clients', + 'customer_groups_create' => 'créer des groupes de clients', + 'customer_groups_show' => 'détails du groupe de clients', + 'customer_groups_update' => 'mettre à jour les groupes de clients', + 'customer_groups_delete' => 'supprimer le groupe de clients', + 'default_cannot_delete' => 'Le groupe de clients par défaut ne peut pas être supprimé', ]; diff --git a/resources/lang/fr/admin/dashboard.php b/resources/lang/fr/admin/dashboard.php index 452f58b4..5a4c0e50 100644 --- a/resources/lang/fr/admin/dashboard.php +++ b/resources/lang/fr/admin/dashboard.php @@ -10,15 +10,15 @@ */ return [ - 'customer_view' => 'visites des utilisateurs', - 'order_total' => 'montant de la commande', - 'customer_new' => 'Ajouter un utilisateur', - 'order_amount' => 'Ventes', - 'yesterday' => 'hier', - 'day_before' => 'un jour avant', + 'customer_view' => 'visites des utilisateurs', + 'order_total' => 'montant de la commande', + 'customer_new' => 'Ajouter un utilisateur', + 'order_amount' => 'Ventes', + 'yesterday' => 'hier', + 'day_before' => 'un jour avant', - 'order_report' => 'statistiques de commande', - 'latest_month' => 'mois', - 'latest_week' => 'semaine', - 'latest_year' => 'un an', + 'order_report' => 'statistiques de commande', + 'latest_month' => 'mois', + 'latest_week' => 'semaine', + 'latest_year' => 'un an', ]; diff --git a/resources/lang/fr/admin/design_builder.php b/resources/lang/fr/admin/design_builder.php index 057ed9dd..a5ff3615 100644 --- a/resources/lang/fr/admin/design_builder.php +++ b/resources/lang/fr/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'module de marque', - 'module_banner' => 'module bannière', - 'module_four_image_pro' => 'une ligne quatre images PRO', - 'module_slideshow' => 'module diapositive', - 'module_tab_products' => 'onglet produits', + 'module_brand' => 'module de marque', + 'module_banner' => 'module bannière', + 'module_four_image_pro' => 'une ligne quatre images PRO', + 'module_slideshow' => 'module diapositive', + 'module_tab_products' => 'onglet produits', ]; diff --git a/resources/lang/fr/admin/file_manager.php b/resources/lang/fr/admin/file_manager.php index 1e70ef0d..b8a6ae27 100644 --- a/resources/lang/fr/admin/file_manager.php +++ b/resources/lang/fr/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'Créer répertoire/fichier', - 'file_manager_show' => 'Voir répertoire/fichier', - 'file_manager_update' => 'renommer', - 'file_manager_delete' => 'supprimer répertoire/fichier', + 'file_manager_create' => 'Créer répertoire/fichier', + 'file_manager_show' => 'Voir répertoire/fichier', + 'file_manager_update' => 'renommer', + 'file_manager_delete' => 'supprimer répertoire/fichier', 'directory_already_exist' => 'le répertoire existe déjà', - 'directory_not_empty' => 'Le répertoire n\'est pas vide', - 'target_not_exist' => 'le fichier ou le dossier d\'origine n\'existe pas', - 'create_folder' => 'Créer un dossier', - 'rename' => 'renommer', - 'download' => 'télécharger', - 'upload_files' => 'Télécharger des fichiers', - 'click_upload' => 'Cliquez pour télécharger ou faites glisser l\'image ici', - 'image_uploading' => 'téléchargement d\'images', - 'no_file' => 'pas de fichier', - 'picture_space' => 'espace image', - 'show_pc' => 'Veuillez passer du côté PC pour opérer', + 'directory_not_empty' => 'Le répertoire n\'est pas vide', + 'target_not_exist' => 'le fichier ou le dossier d\'origine n\'existe pas', + 'create_folder' => 'Créer un dossier', + 'rename' => 'renommer', + 'download' => 'télécharger', + 'upload_files' => 'Télécharger des fichiers', + 'click_upload' => 'Cliquez pour télécharger ou faites glisser l\'image ici', + 'image_uploading' => 'téléchargement d\'images', + 'no_file' => 'pas de fichier', + 'picture_space' => 'espace image', + 'show_pc' => 'Veuillez passer du côté PC pour opérer', - 'confirm_delete_file' => 'Voulez-vous supprimer le fichier sélectionné', - 'confirm_delete_folder' => 'L\'opération de suppression du dossier est en cours, tous les fichiers du dossier seront supprimés, voulez-vous confirmer ? ', - 'new_folder' => 'Nouveau dossier', - 'can_empty' => 'ne peut pas être vide', - 'finish' => 'finir', - 'uploading' => 'Téléchargement', - 'file_manager' => 'gestionnaire d\'images', + 'confirm_delete_file' => 'Voulez-vous supprimer le fichier sélectionné', + 'confirm_delete_folder' => 'L\'opération de suppression du dossier est en cours, tous les fichiers du dossier seront supprimés, voulez-vous confirmer ? ', + 'new_folder' => 'Nouveau dossier', + 'can_empty' => 'ne peut pas être vide', + 'finish' => 'finir', + 'uploading' => 'Téléchargement', + 'file_manager' => 'gestionnaire d\'images', ]; diff --git a/resources/lang/fr/admin/language.php b/resources/lang/fr/admin/language.php index e18029ea..68e4474a 100644 --- a/resources/lang/fr/admin/language.php +++ b/resources/lang/fr/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => 'liste des langues', - 'languages_create' => 'créer une langue', - 'languages_show' => 'détails de la langue', - 'languages_update' => 'mettre à jour la langue', - 'languages_delete' => 'supprimer la langue', - 'error_default_language_cannot_delete' => 'La langue par défaut ne peut pas être supprimée ! ', - 'help_install' => 'Remarque : Pour installer une nouvelle langue, vous devez configurer les produits, les catégories, la navigation, les modules de la page d\'accueil, les pieds de page, etc. de la langue correspondante, sinon il y aura un affichage anormal de la page', + 'languages_index' => 'liste des langues', + 'languages_create' => 'créer une langue', + 'languages_show' => 'détails de la langue', + 'languages_update' => 'mettre à jour la langue', + 'languages_delete' => 'supprimer la langue', + 'error_default_language_cannot_delete' => 'La langue par défaut ne peut pas être supprimée ! ', + 'help_install' => 'Remarque : Pour installer une nouvelle langue, vous devez configurer les produits, les catégories, la navigation, les modules de la page d\'accueil, les pieds de page, etc. de la langue correspondante, sinon il y aura un affichage anormal de la page', ]; diff --git a/resources/lang/fr/admin/login.php b/resources/lang/fr/admin/login.php index 619d9cc6..5b4cfa4b 100644 --- a/resources/lang/fr/admin/login.php +++ b/resources/lang/fr/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => 'Connectez-vous au backend de BeikeShop', - 'log_in' => 'Connexion', + 'log_in' => 'Connexion', ]; diff --git a/resources/lang/fr/admin/marketing.php b/resources/lang/fr/admin/marketing.php index d4b52202..119b94ea 100644 --- a/resources/lang/fr/admin/marketing.php +++ b/resources/lang/fr/admin/marketing.php @@ -10,16 +10,16 @@ */ return [ - 'marketing_list' => 'marché des plug-ins', - 'marketing_show' => 'détails du plug-in', - 'set_token' => 'Définir le jeton', - 'get_token' => 'Obtenir le jeton', - 'download_count' => 'nombre de téléchargements', - 'last_update' => 'dernière mise à jour', - 'text_version' => 'version', - 'text_compatibility' => 'compatibilité', - 'text_author' => 'auteur du plug-in', - 'download_plugin' => 'télécharger le plugin', - 'download_description' => 'Description de l\'extension', - 'text_free' => 'gratuit', + 'marketing_list' => 'marché des plug-ins', + 'marketing_show' => 'détails du plug-in', + 'set_token' => 'Définir le jeton', + 'get_token' => 'Obtenir le jeton', + 'download_count' => 'nombre de téléchargements', + 'last_update' => 'dernière mise à jour', + 'text_version' => 'version', + 'text_compatibility' => 'compatibilité', + 'text_author' => 'auteur du plug-in', + 'download_plugin' => 'télécharger le plugin', + 'download_description' => 'Description de l\'extension', + 'text_free' => 'gratuit', ]; diff --git a/resources/lang/fr/admin/order.php b/resources/lang/fr/admin/order.php index d84419fe..82f6db4b 100644 --- a/resources/lang/fr/admin/order.php +++ b/resources/lang/fr/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => 'Liste de commandes', + 'list' => 'Liste de commandes', - 'order_quantity' => 'quantité de commande', - 'order_amount' => 'montant de la commande', - 'orders_index' => 'Liste de commandes', - 'orders_create' => 'Créer une commande', - 'orders_show' => 'détails de la commande', - 'orders_export' => 'commande d\'exportation', - 'orders_update' => 'Mise à jour de la commande', - 'notify' => 'S\'il faut rappeler', - 'orders_delete' => 'supprimer la commande', + 'order_quantity' => 'quantité de commande', + 'order_amount' => 'montant de la commande', + 'orders_index' => 'Liste de commandes', + 'orders_create' => 'Créer une commande', + 'orders_show' => 'détails de la commande', + 'orders_export' => 'commande d\'exportation', + 'orders_update' => 'Mise à jour de la commande', + 'notify' => 'S\'il faut rappeler', + 'orders_delete' => 'supprimer la commande', 'orders_update_status' => 'état de mise à jour', - 'error_status' => 'Veuillez sélectionner un statut', + 'error_status' => 'Veuillez sélectionner un statut', ]; diff --git a/resources/lang/fr/admin/page.php b/resources/lang/fr/admin/page.php index 774bd27c..8b36b5af 100644 --- a/resources/lang/fr/admin/page.php +++ b/resources/lang/fr/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'page d\'information', - 'info_title' => 'titre des informations', - 'info_content' => 'contenu', + 'index' => 'page d\'information', + 'info_title' => 'titre des informations', + 'info_content' => 'contenu', - 'pages_index' => 'Liste de pages simples', - 'pages_create' => 'Créer une seule page', - 'pages_show' => 'Détails d\'une seule page', - 'pages_update' => 'Modification d\'une seule page', - 'pages_delete' => 'Supprimer une seule page' + 'pages_index' => 'Liste de pages simples', + 'pages_create' => 'Créer une seule page', + 'pages_show' => 'Détails d\'une seule page', + 'pages_update' => 'Modification d\'une seule page', + 'pages_delete' => 'Supprimer une seule page', ]; diff --git a/resources/lang/fr/admin/plugin.php b/resources/lang/fr/admin/plugin.php index 16fa9e4d..87d48774 100644 --- a/resources/lang/fr/admin/plugin.php +++ b/resources/lang/fr/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => 'liste des plugins', - 'plugins_import' => 'Télécharger le plugin', - 'plugins_show' => 'détails des plugins', - 'plugins_update' => 'mise à jour des plugins', - 'plugins_update_status' => 'état de mise à jour', - 'plugins_install' => 'installer', - 'plugins_uninstall' => 'désinstaller', + 'plugins_index' => 'liste des plugins', + 'plugins_import' => 'Télécharger le plugin', + 'plugins_show' => 'détails des plugins', + 'plugins_update' => 'mise à jour des plugins', + 'plugins_update_status' => 'état de mise à jour', + 'plugins_install' => 'installer', + 'plugins_uninstall' => 'désinstaller', - 'plugin_list' => 'liste des plugins', - 'plugin_code' => 'code du plugin', - 'plugin_type' => 'type de plugin', - 'plugin_description' => 'description du plugin', - 'plugin_upload' => 'Télécharger le plugin (supporte uniquement les fichiers zip)', + 'plugin_list' => 'liste des plugins', + 'plugin_code' => 'code du plugin', + 'plugin_type' => 'type de plugin', + 'plugin_description' => 'description du plugin', + 'plugin_upload' => 'Télécharger le plugin (supporte uniquement les fichiers zip)', - 'shipping' => 'méthode de livraison', - 'payment' => 'mode de paiement', - 'total' => 'Calcul de la commande', - 'view' => 'modification de pages', + 'shipping' => 'méthode de livraison', + 'payment' => 'mode de paiement', + 'total' => 'Calcul de la commande', + 'view' => 'modification de pages', ]; diff --git a/resources/lang/fr/admin/product.php b/resources/lang/fr/admin/product.php index d84b25e5..77fc934b 100644 --- a/resources/lang/fr/admin/product.php +++ b/resources/lang/fr/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => 'liste de produits', - 'products_create' => 'créer des produits', - 'products_show' => 'détails du produit', - 'products_update' => 'mettre à jour les produits', - 'products_delete' => 'supprimer le produit', - 'products_trashed' => 'corbeille', - 'products_restore' => 'Restaurer la corbeille', - 'clear_restore' => 'vider la corbeille', + 'products_index' => 'liste de produits', + 'products_create' => 'créer des produits', + 'products_show' => 'détails du produit', + 'products_update' => 'mettre à jour les produits', + 'products_delete' => 'supprimer le produit', + 'products_trashed' => 'corbeille', + 'products_restore' => 'Restaurer la corbeille', + 'clear_restore' => 'vider la corbeille', + 'batch_delete' => 'suppression par lots', + 'batch_active' => 'liste des lots', + 'batch_inactive' => 'Lot prêt à l\'emploi', - 'batch_delete' => 'suppression par lots', - 'batch_active' => 'liste des lots', - 'batch_inactive' => 'Lot prêt à l\'emploi', + 'basic_information' => 'informations de base', + 'product_details' => 'détails du produit', + 'product_relations' => 'biens liés', + 'stocks' => 'inventaire des marchandises', + 'model' => 'maquette', + 'price' => 'le prix', + 'origin_price' => 'prix d\'origine', + 'cost_price' => 'prix de revient', + 'quantity' => 'quantité', + 'enable_multi_spec' => 'Activer multi-spec', + 'image_help' => 'La première image sera utilisée comme image principale du produit, et plusieurs images peuvent être téléchargées en même temps, et la position de plusieurs images peut être ajustée à volonté', + 'add_variable' => 'Ajouter une spécification', + 'add_variable_value' => 'Ajouter une valeur de spécification', + 'add_variable_image' => 'Ajouter une image de spécification', + 'default_main_product' => 'produit principal par défaut', + 'modify_order' => 'Double-cliquez pour modifier, faites glisser pour ajuster la commande', - 'basic_information' => 'informations de base', - 'product_details' => 'détails du produit', - 'product_relations' => 'biens liés', - 'stocks' => 'inventaire des marchandises', - 'model' => 'maquette', - 'price' => 'le prix', - 'origin_price' => 'prix d\'origine', - 'cost_price' => 'prix de revient', - 'quantity' => 'quantité', - 'enable_multi_spec' => 'Activer multi-spec', - 'image_help' => 'La première image sera utilisée comme image principale du produit, et plusieurs images peuvent être téléchargées en même temps, et la position de plusieurs images peut être ajustée à volonté', - 'add_variable' => 'Ajouter une spécification', - 'add_variable_value' => 'Ajouter une valeur de spécification', - 'add_variable_image' => 'Ajouter une image de spécification', - 'default_main_product' => 'produit principal par défaut', - 'modify_order' => 'Double-cliquez pour modifier, faites glisser pour ajuster la commande', - - 'confirm_batch_product' => 'Êtes-vous sûr de vouloir supprimer les produits sélectionnés par lots? ', - 'confirm_batch_status' => 'Confirmer pour modifier le statut des produits sélectionnés par lots? ', - 'confirm_batch_restore' => 'Confirmer pour restaurer le produit sélectionné? ', - 'confirm_delete_restore' => 'Voulez-vous vraiment vider la corbeille? ', + 'confirm_batch_product' => 'Êtes-vous sûr de vouloir supprimer les produits sélectionnés par lots? ', + 'confirm_batch_status' => 'Confirmer pour modifier le statut des produits sélectionnés par lots? ', + 'confirm_batch_restore' => 'Confirmer pour restaurer le produit sélectionné? ', + 'confirm_delete_restore' => 'Voulez-vous vraiment vider la corbeille? ', ]; diff --git a/resources/lang/fr/admin/region.php b/resources/lang/fr/admin/region.php index f0775271..f8f90154 100644 --- a/resources/lang/fr/admin/region.php +++ b/resources/lang/fr/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'groupe de régions', - 'regions_index' => 'liste des groupes de régions', - 'regions_create' => 'Créer un groupe de régions', - 'regions_show' => 'détails du groupe de régions', - 'regions_update' => 'mettre à jour le groupe de régions', - 'regions_delete' => 'Supprimer le groupe de régions', - 'name' => 'nom', - 'describe' => 'describe', - 'country' => 'pays', - 'zone' => 'Province', + 'index' => 'groupe de régions', + 'regions_index' => 'liste des groupes de régions', + 'regions_create' => 'Créer un groupe de régions', + 'regions_show' => 'détails du groupe de régions', + 'regions_update' => 'mettre à jour le groupe de régions', + 'regions_delete' => 'Supprimer le groupe de régions', + 'name' => 'nom', + 'describe' => 'describe', + 'country' => 'pays', + 'zone' => 'Province', ]; diff --git a/resources/lang/fr/admin/rma.php b/resources/lang/fr/admin/rma.php index 084d471d..06357317 100644 --- a/resources/lang/fr/admin/rma.php +++ b/resources/lang/fr/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'Application SAV', + 'index' => 'Application SAV', - 'rmas_index' => 'Liste des services après-vente', - 'rmas_show' => 'Détails du service après-vente', - 'rmas_update' => 'Mettre à jour le SAV', - 'rmas_delete' => 'Supprimer le SAV', + 'rmas_index' => 'Liste des services après-vente', + 'rmas_show' => 'Détails du service après-vente', + 'rmas_update' => 'Mettre à jour le SAV', + 'rmas_delete' => 'Supprimer le SAV', - 'customers_name' => 'nom du client', - 'quantity' => 'quantité', - 'service_type' => 'type de service', - 'rma_details' => 'Détails de l\'application après-vente', - 'reasons_return' => 'Raison du retour', - 'current_state' => 'état actuel', - 'modify_status' => 'Modifier le statut', - 'remarks' => 'Remarques', - 'update_status' => 'état de mise à jour', - 'operation_history' => 'historique des opérations', + 'customers_name' => 'nom du client', + 'quantity' => 'quantité', + 'service_type' => 'type de service', + 'rma_details' => 'Détails de l\'application après-vente', + 'reasons_return' => 'Raison du retour', + 'current_state' => 'état actuel', + 'modify_status' => 'Modifier le statut', + 'remarks' => 'Remarques', + 'update_status' => 'état de mise à jour', + 'operation_history' => 'historique des opérations', ]; diff --git a/resources/lang/fr/admin/rma_reason.php b/resources/lang/fr/admin/rma_reason.php index e91c8c02..9b4e48c6 100644 --- a/resources/lang/fr/admin/rma_reason.php +++ b/resources/lang/fr/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => 'Liste des raisons', + 'rma_reasons_index' => 'Liste des raisons', 'rma_reasons_create' => 'Créer une raison', 'rma_reasons_update' => 'Créer une raison', - 'rma_reasons_delete' => 'Raison de la suppression' + 'rma_reasons_delete' => 'Raison de la suppression', ]; diff --git a/resources/lang/fr/admin/role.php b/resources/lang/fr/admin/role.php index fb6da826..5499a0a2 100644 --- a/resources/lang/fr/admin/role.php +++ b/resources/lang/fr/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => 'liste des rôles', - 'admin_roles_create' => 'Créer des rôles', - 'admin_roles_show' => 'détails des rôles', - 'admin_roles_update' => 'mettre à jour les rôles', - 'admin_roles_delete' => 'supprimer le rôle', - 'select_one_at_least' => 'Les permissions ne peuvent pas être vides, veuillez en sélectionner au moins une' + 'admin_roles_index' => 'liste des rôles', + 'admin_roles_create' => 'Créer des rôles', + 'admin_roles_show' => 'détails des rôles', + 'admin_roles_update' => 'mettre à jour les rôles', + 'admin_roles_delete' => 'supprimer le rôle', + 'select_one_at_least' => 'Les permissions ne peuvent pas être vides, veuillez en sélectionner au moins une', ]; diff --git a/resources/lang/fr/admin/setting.php b/resources/lang/fr/admin/setting.php index 1ebe02d3..67bd3999 100644 --- a/resources/lang/fr/admin/setting.php +++ b/resources/lang/fr/admin/setting.php @@ -10,61 +10,61 @@ */ return [ - 'index' => 'paramètres système', - 'settings_index' => 'Afficher les paramètres système', - 'settings_update' => 'Modifier les paramètres système', - 'design_index' => 'Éditeur d\'accueil', - 'design_footer_index' => 'éditeur de pied de page', - 'design_menu_index' => 'Éditeur de navigation', - 'product_per_page' => 'Le nombre de produits affichés sur chaque page', + 'index' => 'paramètres système', + 'settings_index' => 'Afficher les paramètres système', + 'settings_update' => 'Modifier les paramètres système', + 'design_index' => 'Éditeur d\'accueil', + 'design_footer_index' => 'éditeur de pied de page', + 'design_menu_index' => 'Éditeur de navigation', + 'product_per_page' => 'Le nombre de produits affichés sur chaque page', - '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', + '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', - 'payment_address' => 'Adresse de facturation', - 'meta_title' => 'Méta titre', - 'meta_description' => 'Méta description', - 'meta_keywords' => 'Méta-mot clé', - 'telephone' => 'numéro de contact', - 'email' => 'Courrier', - 'default_address' => 'Adresse par défaut', - 'default_country_set' => 'paramètre de pays par défaut', - 'default_zone_set' => 'paramètre de province par défaut', - 'default_language' => 'langue par défaut', - 'default_currency' => 'devise par défaut', + 'guest_checkout' => 'paiement des visiteurs', + 'theme_default' => 'thème par défaut', + 'theme_black' => 'thème noir', + 'shipping_address' => 'adresse de livraison', + 'payment_address' => 'Adresse de facturation', + 'meta_title' => 'Méta titre', + 'meta_description' => 'Méta description', + 'meta_keywords' => 'Méta-mot clé', + 'telephone' => 'numéro de contact', + 'email' => 'Courrier', + 'default_address' => 'Adresse par défaut', + 'default_country_set' => 'paramètre de pays par défaut', + 'default_zone_set' => 'paramètre de province par défaut', + 'default_language' => 'langue par défaut', + 'default_currency' => 'devise par défaut', 'default_customer_group' => 'groupe de clients par défaut', - 'admin_name' => 'répertoire d\'arrière-plan', - 'admin_name_info' => 'Répertoire d\'arrière-plan de gestion, la valeur par défaut est admin', - 'enable_tax' => 'Activer la taxe', - 'enable_tax_info' => 'activer ou non le calcul des taxes', - 'tax_address' => 'adresse fiscale', - 'tax_address_info' => 'Selon quelle adresse calculer la taxe', - 'logo' => 'Logo du site', - 'favicon' => 'favicon', - 'favicon_info' => 'La petite icône affichée sur l\'onglet du navigateur doit être au format PNG et la taille est : 32*32', - 'placeholder_image' => 'image d\'espace réservé', + 'admin_name' => 'répertoire d\'arrière-plan', + 'admin_name_info' => 'Répertoire d\'arrière-plan de gestion, la valeur par défaut est admin', + 'enable_tax' => 'Activer la taxe', + 'enable_tax_info' => 'activer ou non le calcul des taxes', + 'tax_address' => 'adresse fiscale', + 'tax_address_info' => 'Selon quelle adresse calculer la taxe', + 'logo' => 'Logo du site', + 'favicon' => 'favicon', + 'favicon_info' => 'La petite icône affichée sur l\'onglet du navigateur doit être au format PNG et la taille est : 32*32', + 'placeholder_image' => 'image d\'espace réservé', 'placeholder_image_info' => 'L\'image d\'espace réservé s\'affiche lorsqu\'il n\'y a pas d\'image ou si l\'image n\'est pas trouvée, taille recommandée: 500*500', - 'head_code' => 'insérer le code', - 'head_code_info' => 'Le code dans la zone de saisie sera inséré dans l\'en-tête de la page frontale, qui peut être utilisé pour compter le code ou ajouter des plug-ins spéciaux, etc', + 'head_code' => 'insérer le code', + 'head_code_info' => 'Le code dans la zone de saisie sera inséré dans l\'en-tête de la page frontale, qui peut être utilisé pour compter le code ou ajouter des plug-ins spéciaux, etc', ]; diff --git a/resources/lang/fr/admin/tax_class.php b/resources/lang/fr/admin/tax_class.php index a625dca9..d723d0d0 100644 --- a/resources/lang/fr/admin/tax_class.php +++ b/resources/lang/fr/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'catégorie de taxe', - 'rule' => 'règle', - 'based_on' => 'basé sur', - 'priority' => 'priorité', - 'tax_classes_index' => 'liste des classes de taxes', - 'tax_classes_create' => 'Créer des classes de taxes', - 'tax_classes_show' => 'détails de la classe de taxes', - 'tax_classes_update' => 'Mettre à jour les classes de taxes', - 'tax_classes_delete' => 'supprimer la classe de taxe', + 'index' => 'catégorie de taxe', + 'rule' => 'règle', + 'based_on' => 'basé sur', + 'priority' => 'priorité', + 'tax_classes_index' => 'liste des classes de taxes', + 'tax_classes_create' => 'Créer des classes de taxes', + 'tax_classes_show' => 'détails de la classe de taxes', + 'tax_classes_update' => 'Mettre à jour les classes de taxes', + 'tax_classes_delete' => 'supprimer la classe de taxe', ]; diff --git a/resources/lang/fr/admin/tax_rate.php b/resources/lang/fr/admin/tax_rate.php index 03d11701..c28943a9 100644 --- a/resources/lang/fr/admin/tax_rate.php +++ b/resources/lang/fr/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => 'paramètre fiscal', - 'tax_classes_index' => 'paramètres des classes de taxes', - 'tax' => 'type de taxe', - 'tax_rate' => 'taux d\'imposition', - 'type' => 'type', - 'area' => 'zone', - 'percentage' => 'pourcentage', - 'fixed_tax_rate' => 'taux d\'imposition fixe', - 'tax_rates_index' => 'liste des taux d\'imposition', - 'tax_rates_create' => 'Créer un taux de taxe', - 'tax_rates_show' => 'détails fiscaux', - 'tax_rates_update' => 'Mettre à jour le taux de taxe', - 'tax_rates_delete' => 'Supprimer le taux de taxe', + 'index' => 'paramètre fiscal', + 'tax_classes_index' => 'paramètres des classes de taxes', + 'tax' => 'type de taxe', + 'tax_rate' => 'taux d\'imposition', + 'type' => 'type', + 'area' => 'zone', + 'percentage' => 'pourcentage', + 'fixed_tax_rate' => 'taux d\'imposition fixe', + 'tax_rates_index' => 'liste des taux d\'imposition', + 'tax_rates_create' => 'Créer un taux de taxe', + 'tax_rates_show' => 'détails fiscaux', + 'tax_rates_update' => 'Mettre à jour le taux de taxe', + 'tax_rates_delete' => 'Supprimer le taux de taxe', ]; diff --git a/resources/lang/fr/admin/user.php b/resources/lang/fr/admin/user.php index d1feec69..83fcc737 100644 --- a/resources/lang/fr/admin/user.php +++ b/resources/lang/fr/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'liste d\'utilisateur', - 'admin_users_create' => 'Créer un utilisateur', - 'admin_users_show' => 'Détails de l\'utilisateur', - 'admin_users_update' => 'mettre à jour l\'utilisateur', - 'admin_users_delete' => 'supprimer des utilisateurs', + 'admin_users_index' => 'liste d\'utilisateur', + 'admin_users_create' => 'Créer un utilisateur', + 'admin_users_show' => 'Détails de l\'utilisateur', + 'admin_users_update' => 'mettre à jour l\'utilisateur', + 'admin_users_delete' => 'supprimer des utilisateurs', 'verify_code_expired' => 'Votre code de vérification a expiré (10minutes), veuillez le récupérer à nouveau', - 'verify_code_error' => 'Votre code de vérification est erroné', - 'account_not_exist' => 'Le compte n\'existe pas', + 'verify_code_error' => 'Votre code de vérification est erroné', + 'account_not_exist' => 'Le compte n\'existe pas', ]; diff --git a/resources/lang/fr/admin/zone.php b/resources/lang/fr/admin/zone.php index dc8723e8..da8d936a 100644 --- a/resources/lang/fr/admin/zone.php +++ b/resources/lang/fr/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => 'nom de la province', - 'country_of_origin' => 'pays d\'origine', + 'zone_name' => 'nom de la province', + 'country_of_origin' => 'pays d\'origine', - 'zones_index' => 'liste des provinces', - 'zones_create' => 'créer province', - 'zones_update' => 'mettre à jour la province', - 'zones_delete' => 'Supprimer la province', + 'zones_index' => 'liste des provinces', + 'zones_create' => 'créer province', + 'zones_update' => 'mettre à jour la province', + 'zones_delete' => 'Supprimer la province', - 'error_country' => 'Veuillez sélectionner un pays', + 'error_country' => 'Veuillez sélectionner un pays', ]; diff --git a/resources/lang/fr/brand.php b/resources/lang/fr/brand.php index 539ddc98..fc7fed94 100644 --- a/resources/lang/fr/brand.php +++ b/resources/lang/fr/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => 'marque', - 'icon' => 'icône', + 'name' => 'marque', + 'icon' => 'icône', 'first_letter' => 'Initiales', ]; diff --git a/resources/lang/fr/cart.php b/resources/lang/fr/cart.php index 58b70075..3667ee90 100644 --- a/resources/lang/fr/cart.php +++ b/resources/lang/fr/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => 'Quantité d\'achat', + 'sku_id' => 'SKU ID', + 'quantity' => 'Quantité d\'achat', 'stock_out' => 'Inventaire insuffisant', ]; diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php index afe1b915..f7c5adfa 100644 --- a/resources/lang/fr/common.php +++ b/resources/lang/fr/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => 'Merci de renseigner :nom', // 这个有用别删了，:name 是一个变量 + 'error_required' => 'Merci de renseigner :nom', // 这个有用别删了，:name 是一个变量 'error_input_required' => 'La zone de saisie ne peut pas être vide', - 'error_form' => 'Veuillez vérifier que le formulaire est correctement rempli', - 'email' => 'Courrier', - 'unauthenticated' => 's\'il vous plait Connectez-vous d\'abord', - 'success' => 'Succès', - 'no_data' => 'Pas encore de données~', - 'empty_items' => 'pas de données', - 'created_success' => 'Créé avec succès!', - 'deleted_success' => 'supprimé avec succès!', - 'restored_success' => 'récupération réussie!', - 'updated_success' => 'Mise à jour terminée!', - 'edit_success' => 'Modifié avec succès!', - 'get_success' => 'réussir!', - 'all' => 'tout', - 'status' => 'Etat', - 'enable' => 'activer', - 'disable' => 'désactivé', - 'enabled' => 'activer', - 'disabled' => 'désactivé', - 'home' => 'page de garde', - 'submit' => 'nous faire parvenir', - 'title' => 'Titre', - 'save' => 'enregistrer', - 'cancel' => 'Annuler', - 'confirm' => 'Bien sûr', - 'no' => 'non', - 'yes' => 'Oui', - 'delete' => 'effacer', - 'sign_out' => 'se déconnecter', - 'contact_us' => 'Nous contacter', - 'input' => 'entrez votre recherche ici', - 'filter' => 'filtre', - 'reset' => 'réinitialiser', - 'export' => 'exporter', - 'edit' => 'Éditer', - 'action' => 'fonctionner', - 'add' => 'Ajouter à', - 'please_choose' => 'Choisissez s\'il vous plaît', - 'recommend_size' => 'Taille recommandée', - 'pick_datetime' => 'période de sélection', - 'confirm_delete' => 'Vous êtes sûr de vouloir le supprimer?', - 'text_hint' => 'indice', - 'restore' => 'récupérer', - 'name' => 'Nom', - 'image' => 'image', - 'data' => 'Les données', - 'view' => 'Vérifier', - 'phone' => 'Téléphone', - 'exit' => 'quitter', - 'return' => 'revenir', - 'language' => 'Langue', - 'select_all' => 'tout sélectionner', - 'sign_out' => 'se déconnecter', - 'menu' => 'menu', - 'whether_open' => 'Que ce soit pour ouvrir', - 'to_setting' => 'pour configurer', + 'error_form' => 'Veuillez vérifier que le formulaire est correctement rempli', + 'email' => 'Courrier', + 'unauthenticated' => 's\'il vous plait Connectez-vous d\'abord', + 'success' => 'Succès', + 'no_data' => 'Pas encore de données~', + 'empty_items' => 'pas de données', + 'created_success' => 'Créé avec succès!', + 'deleted_success' => 'supprimé avec succès!', + 'restored_success' => 'récupération réussie!', + 'updated_success' => 'Mise à jour terminée!', + 'edit_success' => 'Modifié avec succès!', + 'get_success' => 'réussir!', + 'all' => 'tout', + 'status' => 'Etat', + 'enable' => 'activer', + 'disable' => 'désactivé', + 'enabled' => 'activer', + 'disabled' => 'désactivé', + 'home' => 'page de garde', + 'submit' => 'nous faire parvenir', + 'title' => 'Titre', + 'save' => 'enregistrer', + 'cancel' => 'Annuler', + 'confirm' => 'Bien sûr', + 'no' => 'non', + 'yes' => 'Oui', + 'delete' => 'effacer', + 'sign_out' => 'se déconnecter', + 'contact_us' => 'Nous contacter', + 'input' => 'entrez votre recherche ici', + 'filter' => 'filtre', + 'reset' => 'réinitialiser', + 'export' => 'exporter', + 'edit' => 'Éditer', + 'action' => 'fonctionner', + 'add' => 'Ajouter à', + 'please_choose' => 'Choisissez s\'il vous plaît', + 'recommend_size' => 'Taille recommandée', + 'pick_datetime' => 'période de sélection', + 'confirm_delete' => 'Vous êtes sûr de vouloir le supprimer?', + 'text_hint' => 'indice', + 'restore' => 'récupérer', + 'name' => 'Nom', + 'image' => 'image', + 'data' => 'Les données', + 'view' => 'Vérifier', + 'phone' => 'Téléphone', + 'exit' => 'quitter', + 'return' => 'revenir', + 'language' => 'Langue', + 'select_all' => 'tout sélectionner', + 'sign_out' => 'se déconnecter', + 'menu' => 'menu', + 'whether_open' => 'Que ce soit pour ouvrir', + 'to_setting' => 'pour configurer', - 'id' => 'ID', - 'created_at' => 'temps de creation', - 'updated_at' => 'Changer l\'heure', - 'sort_order' => 'trier', - 'error_page' => 'Les données auxquelles vous avez accédé n\'existent pas ou ont été supprimées~', - 'error_page_btn' => 'Retour à la page précédente', + 'id' => 'ID', + 'created_at' => 'temps de creation', + 'updated_at' => 'Changer l\'heure', + 'sort_order' => 'trier', + 'error_page' => 'Les données auxquelles vous avez accédé n\'existent pas ou ont été supprimées~', + 'error_page_btn' => 'Retour à la page précédente', - 'order' => [ - 'unpaid' => 'Être payé', - 'paid' => 'Payé', - 'shipped' => 'Expédié', + 'order' => [ + 'unpaid' => 'Être payé', + 'paid' => 'Payé', + 'shipped' => 'Expédié', 'completed' => 'complété', 'cancelled' => 'Annulé', - ] + ], ]; - - diff --git a/resources/lang/fr/currency.php b/resources/lang/fr/currency.php index 8d5ee864..e3beb6c2 100644 --- a/resources/lang/fr/currency.php +++ b/resources/lang/fr/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => 'Nom', - 'code' => 'codage', - 'icon' => 'icône', - 'symbol_left' => 'signe gauche', - 'symbol_right' => 'bon signe', - 'value' => 'valeur du taux de change', - 'decimal_place' => 'décimales', + 'name' => 'Nom', + 'code' => 'codage', + 'icon' => 'icône', + 'symbol_left' => 'signe gauche', + 'symbol_right' => 'bon signe', + 'value' => 'valeur du taux de change', + 'decimal_place' => 'décimales', ]; diff --git a/resources/lang/fr/customer.php b/resources/lang/fr/customer.php index eacd49d5..cb76c0c5 100644 --- a/resources/lang/fr/customer.php +++ b/resources/lang/fr/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => 'Nom', - 'email' => 'Email', - 'from' => 'source enregistrée', + 'name' => 'Nom', + 'email' => 'Email', + 'from' => 'source enregistrée', 'customer_group' => 'groupe d\'utilisateurs', ]; diff --git a/resources/lang/fr/customer_group.php b/resources/lang/fr/customer_group.php index 9115236c..c170f6f1 100644 --- a/resources/lang/fr/customer_group.php +++ b/resources/lang/fr/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => 'noter', - 'name' => 'nom du groupe de clients', + 'name' => 'nom du groupe de clients', ]; diff --git a/resources/lang/fr/mail.php b/resources/lang/fr/mail.php index db412aa1..9c34fcf1 100644 --- a/resources/lang/fr/mail.php +++ b/resources/lang/fr/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => 'commande envoyée avec succès', - 'order_update' => 'mise à jour de l\'état de la commande', - 'order_success_info' => 'Votre commande a été soumise avec succès, voici les détails de la commande', - 'not_oneself' => 'Les opérations non personnelles peuvent être ignorées. ', - 'customer_name' => 'Cher :name utilisateur, bonjour! ', - 'sincèrement' => 'Cordialement', - 'équipe' => 'équipe', - 'order_update_status' => 'Le statut de votre commande :number est mis à jour', - 'welcome_register' => 'bienvenue pour vous inscrire', - 'register_end' => 'Terminez l\'inscription, veuillez cliquer sur le bouton ci-dessous pour retourner au centre commercial. ', - 'btn_buy_now' => 'acheter maintenant', - 'retrieve_password_title' => 'récupérer le mot de passe', - 'retrieve_password_text' => 'Vous récupérez votre mot de passe, veuillez cliquer sur le bouton ci-dessous pour terminer l\'opération. ', - 'retrieve_password_btn' => 'Cliquez ici pour vérifier l\'e-mail', + 'order_success' => 'commande envoyée avec succès', + 'order_update' => 'mise à jour de l\'état de la commande', + 'order_success_info' => 'Votre commande a été soumise avec succès, voici les détails de la commande', + 'not_oneself' => 'Les opérations non personnelles peuvent être ignorées. ', + 'customer_name' => 'Cher :name utilisateur, bonjour! ', + 'sincèrement' => 'Cordialement', + 'équipe' => 'équipe', + 'order_update_status' => 'Le statut de votre commande :number est mis à jour', + 'welcome_register' => 'bienvenue pour vous inscrire', + 'register_end' => 'Terminez l\'inscription, veuillez cliquer sur le bouton ci-dessous pour retourner au centre commercial. ', + 'btn_buy_now' => 'acheter maintenant', + 'retrieve_password_title' => 'récupérer le mot de passe', + 'retrieve_password_text' => 'Vous récupérez votre mot de passe, veuillez cliquer sur le bouton ci-dessous pour terminer l\'opération. ', + 'retrieve_password_btn' => 'Cliquez ici pour vérifier l\'e-mail', ]; diff --git a/resources/lang/fr/order.php b/resources/lang/fr/order.php index b0a67a80..74a7dbe2 100644 --- a/resources/lang/fr/order.php +++ b/resources/lang/fr/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'number' => 'numéro de commande', - 'customer_name' => 'nom du client', - 'payment_method' => 'mode de paiement', - 'email' => 'Email', - 'telephone' => 'numéro de contact', - 'created_at' => 'temps de creation', - 'updated_at' => 'temps de mise à jour', - 'status' => 'Etat', - 'status_format' => 'Etat', - 'total' => 'commande totale', - 'express_number' => 'numéro de commande express', - 'express_company' => 'entreprise de messagerie', - 'order_shipments' => 'informations sur l\'expédition', + 'id' => 'ID', + 'number' => 'numéro de commande', + 'customer_name' => 'nom du client', + 'payment_method' => 'mode de paiement', + 'email' => 'Email', + 'telephone' => 'numéro de contact', + 'created_at' => 'temps de creation', + 'updated_at' => 'temps de mise à jour', + 'status' => 'Etat', + 'status_format' => 'Etat', + 'total' => 'commande totale', + 'express_number' => 'numéro de commande express', + 'express_company' => 'entreprise de messagerie', + 'order_shipments' => 'informations sur l\'expédition', - 'address_info' => 'Informations d\'adresse', - 'shipping_address' => 'adresse de livraison', - 'payment_address' => 'Adresse de facturation', - 'order_status' => 'Statut de la commande', - 'current_status' => 'état actuel', - 'change_to_status' => 'Modifier le statut', - 'comment' => 'Remarques', - 'submit_status' => 'état de mise à jour', + 'address_info' => 'Informations d\'adresse', + 'shipping_address' => 'adresse de livraison', + 'payment_address' => 'Adresse de facturation', + 'order_status' => 'Statut de la commande', + 'current_status' => 'état actuel', + 'change_to_status' => 'Modifier le statut', + 'comment' => 'Remarques', + 'submit_status' => 'état de mise à jour', - 'product_info' => 'Information produit', - 'product_name' => 'Nom', - 'product_price' => 'le prix', - 'product_sub_price' => 'Total', - 'product_quantity' => 'quantité', - 'product_sku' => 'SKU', + 'product_info' => 'Information produit', + 'product_name' => 'Nom', + 'product_price' => 'le prix', + 'product_sub_price' => 'Total', + 'product_quantity' => 'quantité', + 'product_sku' => 'SKU', - 'action_history' => 'Journal des opérations', - 'history_status' => 'Etat', - 'history_comment' => 'Remarque', + 'action_history' => 'Journal des opérations', + 'history_status' => 'Etat', + 'history_comment' => 'Remarque', 'history_created_at' => 'Actualisé', - 'unpaid' => 'Être payé', - 'paid' => 'Payé', - 'shipped' => 'Expédié', - 'completed' => 'complété', - 'cancelled' => 'Annulé', + 'unpaid' => 'Être payé', + 'paid' => 'Payé', + 'shipped' => 'Expédié', + 'completed' => 'complété', + 'cancelled' => 'Annulé', ]; diff --git a/resources/lang/fr/page.php b/resources/lang/fr/page.php index 74f7983a..b6128876 100644 --- a/resources/lang/fr/page.php +++ b/resources/lang/fr/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => 'Titre', + 'title' => 'Titre', 'content' => 'contenu', ]; diff --git a/resources/lang/fr/product.php b/resources/lang/fr/product.php index 1dc341fb..6dec9f5e 100644 --- a/resources/lang/fr/product.php +++ b/resources/lang/fr/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => 'nom', - 'sku' => 'UGS', - 'price' => 'le prix', - 'origin_price' => 'prix d\'origine', - 'cost_price' => 'prix de revient', - 'brand' => 'marque', - 'category' => 'Classification', - 'model' => 'maquette', - 'quantity' => 'en stock', - 'image' => 'image', + 'name' => 'nom', + 'sku' => 'UGS', + 'price' => 'le prix', + 'origin_price' => 'prix d\'origine', + 'cost_price' => 'prix de revient', + 'brand' => 'marque', + 'category' => 'Classification', + 'model' => 'maquette', + 'quantity' => 'en stock', + 'image' => 'image', - 'active' => 'sur l\'étagère', - 'inactive' => 'descendre', + 'active' => 'sur l\'étagère', + 'inactive' => 'descendre', 'has_been_inactive' => 'Cet article a été arrêté', ]; diff --git a/resources/lang/fr/rma.php b/resources/lang/fr/rma.php index ac8df849..ddee535c 100644 --- a/resources/lang/fr/rma.php +++ b/resources/lang/fr/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => 'commande', - 'order_product_id' => 'commander le produit', - 'customer_id' => 'client', - 'quantity' => 'quantité', - 'opened' => 'déballé', - 'rma_reason_id' => 'raison de retour', - 'type' => 'Type de service après-vente', + 'order_id' => 'commande', + 'order_product_id' => 'commander le produit', + 'customer_id' => 'client', + 'quantity' => 'quantité', + 'opened' => 'déballé', + 'rma_reason_id' => 'raison de retour', + 'type' => 'Type de service après-vente', - 'status_pending' => 'à traiter', - 'status_rejected' => 'rejeté', - 'status_approved' => 'Approuvé (à retourner par le client)', - 'status_shipped' => 'expédié (marchandises retournées)', - 'status_completed' => 'terminé', - 'type_return' => 'retour', - 'type_exchange' => 'Échange', - 'type_repair' => 'réparer', - 'type_reissue' => 'Réédition du produit', - 'type_refund' => 'Remboursement uniquement' + 'status_pending' => 'à traiter', + 'status_rejected' => 'rejeté', + 'status_approved' => 'Approuvé (à retourner par le client)', + 'status_shipped' => 'expédié (marchandises retournées)', + 'status_completed' => 'terminé', + 'type_return' => 'retour', + 'type_exchange' => 'Échange', + 'type_repair' => 'réparer', + 'type_reissue' => 'Réédition du produit', + 'type_refund' => 'Remboursement uniquement', ]; diff --git a/resources/lang/fr/shop/account.php b/resources/lang/fr/shop/account.php index 84e46bd2..78588154 100644 --- a/resources/lang/fr/shop/account.php +++ b/resources/lang/fr/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'centre personnel', - 'revise_info' => 'Modifier les informations', - 'collect' => 'recueillir', - 'coupon' => 'coupon', - 'my_order' => 'Ma commande', - 'orders' => 'Tous les ordres', - 'pending_payment' => 'En attente de paiement', - 'pending_send' => 'être délivré', - 'pending_receipt' => 'réception en attente', - 'after_sales' => 'Après vente', - 'no_order' => 'Vous n\'avez pas encore de commande!', - 'to_buy' => 'passer une commande', - 'order_number' => 'numéro de commande', - 'order_time' => 'temps de commande', - 'state' => 'Etat', - 'amount' => 'montant', - 'check_details' => 'vérifier les détails', - 'all' => 'commun', - 'items' => 'Articles', + 'index' => 'centre personnel', + 'revise_info' => 'Modifier les informations', + 'collect' => 'recueillir', + 'coupon' => 'coupon', + 'my_order' => 'Ma commande', + 'orders' => 'Tous les ordres', + 'pending_payment' => 'En attente de paiement', + 'pending_send' => 'être délivré', + 'pending_receipt' => 'réception en attente', + 'after_sales' => 'Après vente', + 'no_order' => 'Vous n\'avez pas encore de commande!', + 'to_buy' => 'passer une commande', + 'order_number' => 'numéro de commande', + 'order_time' => 'temps de commande', + 'state' => 'Etat', + 'amount' => 'montant', + 'check_details' => 'vérifier les détails', + 'all' => 'commun', + 'items' => 'Articles', 'verify_code_expired' => 'Votre code de vérification a expiré (10minutes), veuillez le récupérer à nouveau', - 'verify_code_error' => 'Votre code de vérification est erroné', - 'account_not_exist' => 'Le compte n\'existe pas', + 'verify_code_error' => 'Votre code de vérification est erroné', + 'account_not_exist' => 'Le compte n\'existe pas', - 'edit' => [ - 'index' => 'Modifier les informations personnelles', - 'modify_avatar' => 'Modifier l\'avatar', - 'suggest' => 'Téléchargez une image JPG ou PNG. 300 x 300 est recommandé.', - 'name' => 'Nom', - 'email' => 'Courrier', - 'crop' => 'recadrer', + 'edit' => [ + 'index' => 'Modifier les informations personnelles', + 'modify_avatar' => 'Modifier l\'avatar', + 'suggest' => 'Téléchargez une image JPG ou PNG. 300 x 300 est recommandé.', + 'name' => 'Nom', + 'email' => 'Courrier', + 'crop' => 'recadrer', 'password_edit_success' => 'Réinitialisation du mot de passe terminée', - 'origin_password_fail' => 'Le mot de passe d\'origine est erroné', + 'origin_password_fail' => 'Le mot de passe d\'origine est erroné', ], - 'wishlist' => [ - 'index' => 'ma collection', - 'product' => 'produit de base', - 'price' => 'le prix', + 'wishlist' => [ + 'index' => 'ma collection', + 'product' => 'produit de base', + 'price' => 'le prix', 'check_details' => 'vérifier les détails', ], - 'order' => [ - 'index' => 'Ma commande', - 'completed' => 'Réception confirmée', - 'cancelled' => 'commande annulée', + 'order' => [ + 'index' => 'Ma commande', + 'completed' => 'Réception confirmée', + 'cancelled' => 'commande annulée', 'order_details' => 'détails de la commande', - 'amount' => 'montant', - 'state' => 'Etat', - 'order_number' => 'numéro de commande', - 'check' => 'Vérifier', + 'amount' => 'montant', + 'state' => 'Etat', + 'order_number' => 'numéro de commande', + 'check' => 'Vérifier', - 'order_info' => [ - 'index' => 'détails de la commande', - 'order_details' => 'détails de la commande', - 'to_pay' => 'payer', - 'cancel' => 'annuler la commande', - 'confirm_receipt' => 'confirmer la réception des marchandises', - 'order_number' => 'numéro de commande', - 'order_date' => 'date de commande', - 'state' => 'Etat', - 'order_amount' => 'montant de la commande', - 'order_items' => 'Items commandés', + 'order_info' => [ + 'index' => 'détails de la commande', + 'order_details' => 'détails de la commande', + 'to_pay' => 'payer', + 'cancel' => 'annuler la commande', + 'confirm_receipt' => 'confirmer la réception des marchandises', + 'order_number' => 'numéro de commande', + 'order_date' => 'date de commande', + 'state' => 'Etat', + 'order_amount' => 'montant de la commande', + 'order_items' => 'Items commandés', 'apply_after_sales' => 'Faire une demande d\'après-vente', - 'order_total' => 'commande totale', - 'logistics_status' => 'Statut logistique', - 'order_status' => 'Statut de la commande', - 'remark' => 'Remarque', - 'update_time' => 'temps de mise à jour', + 'order_total' => 'commande totale', + 'logistics_status' => 'Statut logistique', + 'order_status' => 'Statut de la commande', + 'remark' => 'Remarque', + 'update_time' => 'temps de mise à jour', ], 'order_success' => [ - 'order_success' => 'Félicitations, la commande a été générée avec succès!', - 'order_number' => 'numéro de commande', - 'amounts_payable' => 'Montants à payer ', - 'payment_method' => 'mode de paiement ', - 'view_order' => 'Voir d\'autres détails ', - 'pay_now' => 'payer immédiatement ', - 'kind_tips' => 'Rappel: Votre commande a été générée avec succès, veuillez effectuer le paiement dès que possible~ ', - 'also' => 'Vous pouvez également', - 'continue_purchase' => 'continuer à acheter', + 'order_success' => 'Félicitations, la commande a été générée avec succès!', + 'order_number' => 'numéro de commande', + 'amounts_payable' => 'Montants à payer ', + 'payment_method' => 'mode de paiement ', + 'view_order' => 'Voir d\'autres détails ', + 'pay_now' => 'payer immédiatement ', + 'kind_tips' => 'Rappel: Votre commande a été générée avec succès, veuillez effectuer le paiement dès que possible~ ', + 'also' => 'Vous pouvez également', + 'continue_purchase' => 'continuer à acheter', 'contact_customer_service' => 'Si vous avez des questions pendant le processus de commande, vous pouvez contacter notre service clientèle à tout moment', - 'emaill' => 'Courrier', - 'service_hotline' => 'Service d\'assistance téléphonique', + 'emaill' => 'Courrier', + 'service_hotline' => 'Service d\'assistance téléphonique', ], ], - 'addresses' => [ - 'index' => 'mon adresse', - 'add_address' => 'Ajouter une nouvelle adresse', + 'addresses' => [ + 'index' => 'mon adresse', + 'add_address' => 'Ajouter une nouvelle adresse', 'default_address' => 'Adresse par défaut', - 'delete' => 'effacer', - 'edit' => 'Éditer', - 'enter_name' => 'Veuillez saisir votre nom', - 'enter_phone' => 'Veuillez saisir votre numéro de téléphone', - 'enter_address' => 'Veuillez entrer l\'adresse détaillée 1', + 'delete' => 'effacer', + 'edit' => 'Éditer', + 'enter_name' => 'Veuillez saisir votre nom', + 'enter_phone' => 'Veuillez saisir votre numéro de téléphone', + 'enter_address' => 'Veuillez entrer l\'adresse détaillée 1', 'select_province' => 'Veuillez sélectionner la province', - 'enter_city' => 'Merci de renseigner la ville', - 'confirm_delete' => 'Voulez-vous vraiment supprimer l\'adresse?', - 'hint' => 'indice', - 'check_form' => 'Veuillez vérifier que le formulaire est correctement rempli', + 'enter_city' => 'Merci de renseigner la ville', + 'confirm_delete' => 'Voulez-vous vraiment supprimer l\'adresse?', + 'hint' => 'indice', + 'check_form' => 'Veuillez vérifier que le formulaire est correctement rempli', ], - 'rma' => [ - 'index' => 'mon après vente', - 'commodity' => 'produit de base', - 'quantity' => 'quantité', - 'service_type' => 'Type de service', + 'rma' => [ + 'index' => 'mon après vente', + 'commodity' => 'produit de base', + 'quantity' => 'quantité', + 'service_type' => 'Type de service', 'return_reason' => 'Raison du retour', 'creation_time' => 'temps de creation', - 'check' => 'Vérifier', + 'check' => 'Vérifier', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'Détails après-vente', ], - 'rma_form' => [ - 'index' => 'Soumettre des informations après-vente', - 'service_type' => 'Type de service', + 'rma_form' => [ + 'index' => 'Soumettre des informations après-vente', + 'service_type' => 'Type de service', 'return_quantity' => 'Quantité retournée', - 'unpacked' => 'déballé', - 'return_reason' => 'Raison du retour', - 'remark' => 'Remarque', - ] - ] + 'unpacked' => 'déballé', + 'return_reason' => 'Raison du retour', + 'remark' => 'Remarque', + ], + ], ]; diff --git a/resources/lang/fr/shop/carts.php b/resources/lang/fr/shop/carts.php index f20cce0b..62e6e519 100644 --- a/resources/lang/fr/shop/carts.php +++ b/resources/lang/fr/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'Panier', - 'added_to_cart' => 'ajouté au panier', - 'select_all' => 'tout sélectionner', - 'commodity' => 'produit de base', - 'quantity' => 'quantité', - 'subtotal' => 'Total', - 'product_total' => 'Produit total', - 'order_total' => 'montant total a payer', - 'shipping_fee' => 'fret', - 'all' => 'tout', - 'selected' => 'choisi', - 'to_checkout' => 'aller à la caisse', - 'cart_empty' => 'Votre panier est vide', - 'go_buy' => 'Vous pouvez aller voir ce que vous voulez acheter', - 'go_shopping' => 'aller faire les courses', - 'must_select' => 'Veuillez sélectionner au moins un produit', - 'mini' => 'votre panier', - 'delete' => 'effacer', - 'check_cart' => 'vérifier le panier', + 'index' => 'Panier', + 'added_to_cart' => 'ajouté au panier', + 'select_all' => 'tout sélectionner', + 'commodity' => 'produit de base', + 'quantity' => 'quantité', + 'subtotal' => 'Total', + 'product_total' => 'Produit total', + 'order_total' => 'montant total a payer', + 'shipping_fee' => 'fret', + 'all' => 'tout', + 'selected' => 'choisi', + 'to_checkout' => 'aller à la caisse', + 'cart_empty' => 'Votre panier est vide', + 'go_buy' => 'Vous pouvez aller voir ce que vous voulez acheter', + 'go_shopping' => 'aller faire les courses', + 'must_select' => 'Veuillez sélectionner au moins un produit', + 'mini' => 'votre panier', + 'delete' => 'effacer', + 'check_cart' => 'vérifier le panier', - 'invalid_customer' => 'Client panier invalide', - 'empty_selected_products' => 'L\'article sélectionné dans le panier est vide', + 'invalid_customer' => 'Client panier invalide', + 'empty_selected_products' => 'L\'article sélectionné dans le panier est vide', 'invalid_shipping_address' => 'Adresse de livraison invalide', - 'invalid_payment_address' => 'Adresse de facturation invalide', - 'invalid_shipping_method' => 'Mode de livraison indisponible', - 'invalid_payment_method' => 'Mode de paiement non disponible', + 'invalid_payment_address' => 'Adresse de facturation invalide', + 'invalid_shipping_method' => 'Mode de livraison indisponible', + 'invalid_payment_method' => 'Mode de paiement non disponible', ]; diff --git a/resources/lang/fr/shop/checkout.php b/resources/lang/fr/shop/checkout.php index 6831175b..d152e0c7 100644 --- a/resources/lang/fr/shop/checkout.php +++ b/resources/lang/fr/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'L\'addition s\'il-vous-plaît', - 'address' => 'adresse de livraison', - 'payment_address' => 'Adresse de facturation', + 'index' => 'L\'addition s\'il-vous-plaît', + 'address' => 'adresse de livraison', + 'payment_address' => 'Adresse de facturation', 'same_as_shipping_address' => 'Adresse de facturation et adresse de livraison', - 'chosen' => 'choisi', - 'edit' => 'Éditer', - 'choose_another_address' => 'Choisissez une autre adresse', - 'add_new_address' => 'Ajouter une nouvelle adresse', - 'payment_method' => 'mode de paiement', - 'delivery_method' => 'méthode de livraison', - 'cart_totals' => 'Nombre total de chariots', - 'submit_order' => 'Soumettre la commande', - 'enter_name' => 'Veuillez saisir votre nom', - 'enter_phone' => 'Veuillez saisir votre numéro de téléphone', - 'enter_address' => 'Veuillez entrer l\'adresse détaillée 1', - 'select_province' => 'Veuillez sélectionner la province', - 'enter_city' => 'Merci de renseigner la ville', - 'check_form' => 'Veuillez vérifier que le formulaire est correctement rempli', - 'error_payment_address' => 'Veuillez sélectionner une adresse de facturation', + 'chosen' => 'choisi', + 'edit' => 'Éditer', + 'choose_another_address' => 'Choisissez une autre adresse', + 'add_new_address' => 'Ajouter une nouvelle adresse', + 'payment_method' => 'mode de paiement', + 'delivery_method' => 'méthode de livraison', + 'cart_totals' => 'Nombre total de chariots', + 'submit_order' => 'Soumettre la commande', + 'enter_name' => 'Veuillez saisir votre nom', + 'enter_phone' => 'Veuillez saisir votre numéro de téléphone', + 'enter_address' => 'Veuillez entrer l\'adresse détaillée 1', + 'select_province' => 'Veuillez sélectionner la province', + 'enter_city' => 'Merci de renseigner la ville', + 'check_form' => 'Veuillez vérifier que le formulaire est correctement rempli', + 'error_payment_address' => 'Veuillez sélectionner une adresse de facturation', - 'payment' => [ - 'index' => 'payez s\'il vous plait', - 'please_pay' => 'Commande soumise avec succès, veuillez payer', - 'order_number' => 'numéro de commande', + 'payment' => [ + 'index' => 'payez s\'il vous plait', + 'please_pay' => 'Commande soumise avec succès, veuillez payer', + 'order_number' => 'numéro de commande', 'amounts_payable' => 'Montants à payer', - 'payment_method' => 'mode de paiement', - ] + 'payment_method' => 'mode de paiement', + ], ]; diff --git a/resources/lang/fr/shop/common.php b/resources/lang/fr/shop/common.php index e0fde654..960c68a8 100644 --- a/resources/lang/fr/shop/common.php +++ b/resources/lang/fr/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => 'page de garde', - 'submit' => 'nous faire parvenir', - 'cancel' => 'Annuler', + 'home' => 'page de garde', + 'submit' => 'nous faire parvenir', + 'cancel' => 'Annuler', 'confirm' => 'Bien sûr', - 'no' => 'non', - 'yes' => 'Oui', + 'no' => 'non', + 'yes' => 'Oui', ]; diff --git a/resources/lang/fr/shop/currency.php b/resources/lang/fr/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/fr/shop/currency.php +++ b/resources/lang/fr/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/fr/shop/forgotten.php b/resources/lang/fr/shop/forgotten.php index dcd0e103..677af005 100644 --- a/resources/lang/fr/shop/forgotten.php +++ b/resources/lang/fr/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'Mot de passe oublié', - 'follow_prompt' => 'Veuillez suivre les instructions pour récupérer votre mot de passe', - 'email_forCode' => 'Veuillez entrer votre adresse e-mail pour obtenir le code de vérification', - 'enter_password' => 'Veuillez entrer un nouveau mot de passe', - 'email' => 'Courrier', - 'email_address' => 'adresse e-mail', - 'verification_code' => 'le code de vérification', - 'password' => 'le mot de passe', - 'confirm_password' => 'Confirmez le mot de passe', - 'send_code' => 'Envoyer le code de vérification', - 'to_back' => 'Retour à l\'étape précédente', - 'enter_password' => 'Veuillez entrer le mot de passe', - 'enter_email' => 'merci d\'entrer votre email', - 'please_confirm' => 'Veuillez confirmer votre mot de passe', - 'password_err' => 'Les mots de passe entrés deux fois ne correspondent pas!', - 'email_err' => 'S\'il vous plaît, mettez une adresse email valide!', - 'enter_code' => 'veuillez entrer le code de vérification', + 'index' => 'Mot de passe oublié', + 'follow_prompt' => 'Veuillez suivre les instructions pour récupérer votre mot de passe', + 'email_forCode' => 'Veuillez entrer votre adresse e-mail pour obtenir le code de vérification', + 'enter_password' => 'Veuillez entrer un nouveau mot de passe', + 'email' => 'Courrier', + 'email_address' => 'adresse e-mail', + 'verification_code' => 'le code de vérification', + 'password' => 'le mot de passe', + 'confirm_password' => 'Confirmez le mot de passe', + 'send_code' => 'Envoyer le code de vérification', + 'to_back' => 'Retour à l\'étape précédente', + 'enter_password' => 'Veuillez entrer le mot de passe', + 'enter_email' => 'merci d\'entrer votre email', + 'please_confirm' => 'Veuillez confirmer votre mot de passe', + 'password_err' => 'Les mots de passe entrés deux fois ne correspondent pas!', + 'email_err' => 'S\'il vous plaît, mettez une adresse email valide!', + 'enter_code' => 'veuillez entrer le code de vérification', 'verification_code_sent' => 'Le code de vérification a été envoyé, veuillez vérifier et saisir le code de vérification', - 'password_updated' => 'Le mot de passe a été changé', + 'password_updated' => 'Le mot de passe a été changé', ]; diff --git a/resources/lang/fr/shop/login.php b/resources/lang/fr/shop/login.php index 36a7685a..bc8ce913 100644 --- a/resources/lang/fr/shop/login.php +++ b/resources/lang/fr/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'Connexion et enregistrement de l\'utilisateur', - 'login_and_sign' => 'S\'identifier S\'enregistrer', - 'home' => 'page de garde', - 'library' => 'centre personnel', - 'login' => 'Connexion', - 'already' => 'Déjà notre client ?', - 'description' => 'Déjà notre client ?', - 'email' => 'courrier', - 'email_address' => 'adresse e-mail', - 'password' => 'le mot de passe', - 'forget_password' => 'Mot de passe oublié', - 'new' => 'nouveau compte', - 'not_already' => 'Pas encore notre client enregistré?', - 'confirm_password' => 'Confirmez le mot de passe', - 'register' => 'S\'inscrire', - 'enter_password' => 'Veuillez entrer le mot de passe', - 'enter_email' => 'merci d\'entrer votre email', - 'please_confirm' => 'Veuillez confirmer votre mot de passe', - 'password_err' => 'Les mots de passe entrés deux fois ne correspondent pas!', - 'email_err' => 'S\il vous plaît, mettez une adresse email valide!', - 'check_form' => 'Veuillez vérifier que le formulaire est correctement rempli', + 'index' => 'Connexion et enregistrement de l\'utilisateur', + 'login_and_sign' => 'S\'identifier S\'enregistrer', + 'home' => 'page de garde', + 'library' => 'centre personnel', + 'login' => 'Connexion', + 'already' => 'Déjà notre client ?', + 'description' => 'Déjà notre client ?', + 'email' => 'courrier', + 'email_address' => 'adresse e-mail', + 'password' => 'le mot de passe', + 'forget_password' => 'Mot de passe oublié', + 'new' => 'nouveau compte', + 'not_already' => 'Pas encore notre client enregistré?', + 'confirm_password' => 'Confirmez le mot de passe', + 'register' => 'S\'inscrire', + 'enter_password' => 'Veuillez entrer le mot de passe', + 'enter_email' => 'merci d\'entrer votre email', + 'please_confirm' => 'Veuillez confirmer votre mot de passe', + 'password_err' => 'Les mots de passe entrés deux fois ne correspondent pas!', + 'email_err' => 'S\il vous plaît, mettez une adresse email valide!', + 'check_form' => 'Veuillez vérifier que le formulaire est correctement rempli', 'email_or_password_error' => 'Erreur de courriel ou de mot de passe!', - 'customer_inactive' => 'L\'utilisateur est désactivé', - 'login_successfully' => 'connexion réussie', - 'register_success' => 'succès de l\'inscription', - 'third_party_logins' => 'à noter', + 'customer_inactive' => 'L\'utilisateur est désactivé', + 'login_successfully' => 'connexion réussie', + 'register_success' => 'succès de l\'inscription', + 'third_party_logins' => 'à noter', ]; diff --git a/resources/lang/fr/shop/order.php b/resources/lang/fr/shop/order.php index 22e94044..5ee483da 100644 --- a/resources/lang/fr/shop/order.php +++ b/resources/lang/fr/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => 'commande invalide', - 'confirm_order' => 'L\'utilisateur confirme la réception', - 'cancel_order' => 'L\'utilisateur annule la commande', + 'invalid_order' => 'commande invalide', + 'confirm_order' => 'L\'utilisateur confirme la réception', + 'cancel_order' => 'L\'utilisateur annule la commande', 'order_already_paid' => 'commande payée', ]; diff --git a/resources/lang/fr/shop/products.php b/resources/lang/fr/shop/products.php index 0620affc..9fbeeab4 100644 --- a/resources/lang/fr/shop/products.php +++ b/resources/lang/fr/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => 'chercher', + 'search' => 'chercher', 'add_to_favorites' => 'ajouter aux Favoris', - 'add_to_cart' => 'ajouter au panier', - 'buy_now' => 'Acheter maintenant', - 'product_details' => 'détails du produit', - 'in_stock' => 'En stock', - 'out_stock' => 'En rupture de stock', - 'model' => 'maquette', + 'add_to_cart' => 'ajouter au panier', + 'buy_now' => 'Acheter maintenant', + 'product_details' => 'détails du produit', + 'in_stock' => 'En stock', + 'out_stock' => 'En rupture de stock', + 'model' => 'maquette', ]; diff --git a/resources/lang/fr/shop/steps.php b/resources/lang/fr/shop/steps.php index 3b62374c..1e0f44a8 100644 --- a/resources/lang/fr/shop/steps.php +++ b/resources/lang/fr/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'marcher', - 'cart' => 'Panier', - 'checkout' => 'L\'addition s\'il-vous-plaît', + 'index' => 'marcher', + 'cart' => 'Panier', + 'checkout' => 'L\'addition s\'il-vous-plaît', 'submitted_successfully' => 'Soumis avec succès', - 'payment' => 'Paiement', + 'payment' => 'Paiement', ]; diff --git a/resources/lang/fr/shop/wishlist.php b/resources/lang/fr/shop/wishlist.php index 923f76df..1bc0be41 100644 --- a/resources/lang/fr/shop/wishlist.php +++ b/resources/lang/fr/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'Ajouter aux favoris avec succès', + 'add_wishlist_success' => 'Ajouter aux favoris avec succès', 'remove_wishlist_success' => 'Supprimer le favori avec succès', ]; diff --git a/resources/lang/it/address.php b/resources/lang/it/address.php index 487f8e94..037f68d4 100644 --- a/resources/lang/it/address.php +++ b/resources/lang/it/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Modifica indirizzo', - 'name' => 'Nome', - 'phone' => 'Numero di telefono', + 'index' => 'Modifica indirizzo', + 'name' => 'Nome', + 'phone' => 'Numero di telefono', 'country_id' => 'ID Paese', - 'zone' => 'Provincia', - 'zone_id' => 'ID provincia', - 'address_1' => 'Indirizzo 1', - 'address_2' => 'Indirizzo 2', - 'address' => 'Indirizzo', + 'zone' => 'Provincia', + 'zone_id' => 'ID provincia', + 'address_1' => 'Indirizzo 1', + 'address_2' => 'Indirizzo 2', + 'address' => 'Indirizzo', 'enter_city' => 'Cnserire indirizzo', - 'post_code' => 'Codice postale', - 'default' => 'Indirizzo predefinito', + 'post_code' => 'Codice postale', + 'default' => 'Indirizzo predefinito', ]; diff --git a/resources/lang/it/admin/admin_roles.php b/resources/lang/it/admin/admin_roles.php index c465f2bb..7c409c3f 100644 --- a/resources/lang/it/admin/admin_roles.php +++ b/resources/lang/it/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => 'seleziona tutto', - 'unselect_all' => 'deseleziona', - 'role_name' => 'Nome ruolo', + 'select_all' => 'seleziona tutto', + 'unselect_all' => 'deseleziona', + 'role_name' => 'Nome ruolo', 'role_management' => 'gestione dei ruoli', - 'permission' => 'autorizzazione', - 'error_roles' => 'Seleziona almeno un ruolo', + 'permission' => 'autorizzazione', + 'error_roles' => 'Seleziona almeno un ruolo', ]; diff --git a/resources/lang/it/admin/attribute.php b/resources/lang/it/admin/attribute.php index 229977f6..336b2e3a 100644 --- a/resources/lang/it/admin/attribute.php +++ b/resources/lang/it/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'attributo', - 'attribute_info' => 'informazioni sugli attributi', - 'create_at' => 'crea attributo', - 'attribute_value' => 'valore attributo', - 'set_attribute' => 'attributo di configurazione', - 'add_attribute' => 'aggiungi valore attributo', + 'index' => 'attributo', + 'attribute_info' => 'informazioni sugli attributi', + 'create_at' => 'crea attributo', + 'attribute_value' => 'valore attributo', + 'set_attribute' => 'attributo di configurazione', + 'add_attribute' => 'aggiungi valore attributo', 'before_attribute' => 'Si prega di selezionare prima l\'attributo di sinistra', - 'btn_at' => 'Vai ora', - 'btn_later' => 'più tardi', - 'to_info_values' => 'Vai alla pagina dei dettagli per modificare i valori degli attributi', + 'btn_at' => 'Vai ora', + 'btn_later' => 'più tardi', + 'to_info_values' => 'Vai alla pagina dei dettagli per modificare i valori degli attributi', ]; diff --git a/resources/lang/it/admin/attribute_groups.php b/resources/lang/it/admin/attribute_groups.php index d5d7b07a..12381441 100644 --- a/resources/lang/it/admin/attribute_groups.php +++ b/resources/lang/it/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => 'gruppo di attributi', + 'index' => 'gruppo di attributi', 'create_at_groups' => 'crea gruppo di attributi', ]; diff --git a/resources/lang/it/admin/brand.php b/resources/lang/it/admin/brand.php index d258f541..68bb0371 100644 --- a/resources/lang/it/admin/brand.php +++ b/resources/lang/it/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => 'marca', + 'index' => 'marca', - 'brands_index' => 'Elenco marche', + 'brands_index' => 'Elenco marche', 'brands_create' => 'Crea un marchio', - 'brands_show' => 'Dettagli del marchio', + 'brands_show' => 'Dettagli del marchio', 'brands_update' => 'Aggiorna il marchio', 'brands_delete' => 'rimuovere il marchio', - 'error_upload' => "si prega di caricare l'icona" + 'error_upload' => "si prega di caricare l'icona", ]; diff --git a/resources/lang/it/admin/builder.php b/resources/lang/it/admin/builder.php index c9ff87c6..2dc421d8 100644 --- a/resources/lang/it/admin/builder.php +++ b/resources/lang/it/admin/builder.php @@ -11,243 +11,242 @@ */ return [ - 'heading_title' => 'modifica della pagina', - 'modules_instructions' => 'Moduli disponibili, fare clic su Aggiungi alla pagina', - 'text_floor_prompt' => 'Impostazioni (la configurazione del piano deve essere salvata e aggiornata per aggiornare la pagina)', - 'text_new_page' => 'Aggiungi nuova pagina', - 'text_quit' => 'uscire', - 'text_save' => 'Salva', - 'text_view_page' => 'Visualizza pagina', - 'text_module' => 'modulo', - 'text_module_title' => 'titolo del modulo', - 'text_menu' => 'navigazione', - 'text_drag_sort' => 'trascina per ordinare', - 'text_set_up' => 'impostare', - 'text_delete' => 'Elimina', - 'text_floor' => 'pavimento', - 'text_add_module' => 'aggiungi modulo', - 'text_to_menu' => 'Modifica menu di navigazione', - 'text_other' => 'Altro', - 'text_preparing' => 'preparazione...', - 'text_floor_setting' => 'Impostazioni del pavimento', - 'text_background_color' => 'colore di sfondo', - 'text_sure' => 'Sicuro', - 'text_page_name' => 'Inserisci un nuovo nome di pagina', - 'text_is_save' => 'Assicurati che i dati della pagina corrente siano salvati!', - 'text_pop_ads' => 'annunci pop-up', - 'text_style_setting' => 'impostazioni di stile', - 'text_is_save_data' => 'Prima di cambiare pagina, assicurati che i dati della pagina corrente siano stati salvati?', - 'text_hint' => 'suggerimento', - 'text_cancel' => 'Annulla', - 'text_created_success' => 'Pagina creata con successo', - 'text_html_none' => 'Errore di caricamento del modulo, i dati HTML sono vuoti!', - 'text_is_delete' => 'certo che vuoi eliminare', - 'text_enable' => 'abilitare', - 'text_set_title' => 'intestazione di configurazione', - 'text_set_subtitle' => 'Configura sottotitoli', - 'text_suggested_size' => 'Dimensioni consigliate (LxA):', - 'text_word' => 'Parola', - 'text_add_pictures' => 'aggiungi immagini', - 'text_refresh_cookie' => 'Aggiorna i cookie', - 'text_popup_hint' => 'NOTA: l\' utente fa clic su Chiudi e non verrà più visualizzato fino alla chiusura e alla riapertura del browser. Per i test locali, puoi fare clic su "Aggiorna cookie", quindi aggiornare il browser e la finestra pop-up può essere nuovamente attivata. ', - 'text_cookie_refresh_success' => 'Il cookie è stato aggiornato correttamente, aggiorna il browser per vedere il contenuto della finestra pop-up.', - 'text_add_hot_links' => 'Aggiungi collegamento di ricerca a caldo', - 'text_add' => 'Aggiungere a', - 'text_margin_top' => 'Imbottitura del modulo - Parte superiore', - 'text_margin_bottom' => 'Imbottitura del modulo - Inferiore', - 'text_file_manager' => 'gestore di file', - 'modules_link' => 'Collegamento', - 'modules_choose_link' => 'seleziona collegamento', - 'text_select_link' => 'Seleziona la pagina del collegamento a cui passare', - 'text_no' => 'nessuno', - 'text_search' => 'ricerca', - 'text_is_newpage' => 'Se aprire una nuova finestra::', - 'text_manage' => 'gestire', - 'text_title_cover' => 'Titolo (sostituisce il nome del collegamento selezionato di seguito)', - 'text_enter_link' => 'Titolo (sostituisce il nome del collegamento selezionato di seguito)', - 'text_states' => 'stato', - 'text_disable' => 'Disabilitato', - 'text_no_data' => 'I dati non esistono o sono stati cancellati', - 'text_to_add' => 'aggiungere', - 'text_category' => 'Classificazione', - 'text_information' => 'Pagina informativa', - 'text_manufacturer' => 'marca', - 'text_static' => 'Collegamento fisso', - 'text_custom' => 'personalizzare', - 'text_top_text' => 'testo in alto', - 'text_edit_page_name' => 'Modifica il nome della pagina', - 'text_page_name_no' => 'Il nome è obbligatorio', - 'custom_name' => 'nome personalizzato', + 'heading_title' => 'modifica della pagina', + 'modules_instructions' => 'Moduli disponibili, fare clic su Aggiungi alla pagina', + 'text_floor_prompt' => 'Impostazioni (la configurazione del piano deve essere salvata e aggiornata per aggiornare la pagina)', + 'text_new_page' => 'Aggiungi nuova pagina', + 'text_quit' => 'uscire', + 'text_save' => 'Salva', + 'text_view_page' => 'Visualizza pagina', + 'text_module' => 'modulo', + 'text_module_title' => 'titolo del modulo', + 'text_menu' => 'navigazione', + 'text_drag_sort' => 'trascina per ordinare', + 'text_set_up' => 'impostare', + 'text_delete' => 'Elimina', + 'text_floor' => 'pavimento', + 'text_add_module' => 'aggiungi modulo', + 'text_to_menu' => 'Modifica menu di navigazione', + 'text_other' => 'Altro', + 'text_preparing' => 'preparazione...', + 'text_floor_setting' => 'Impostazioni del pavimento', + 'text_background_color' => 'colore di sfondo', + 'text_sure' => 'Sicuro', + 'text_page_name' => 'Inserisci un nuovo nome di pagina', + 'text_is_save' => 'Assicurati che i dati della pagina corrente siano salvati!', + 'text_pop_ads' => 'annunci pop-up', + 'text_style_setting' => 'impostazioni di stile', + 'text_is_save_data' => 'Prima di cambiare pagina, assicurati che i dati della pagina corrente siano stati salvati?', + 'text_hint' => 'suggerimento', + 'text_cancel' => 'Annulla', + 'text_created_success' => 'Pagina creata con successo', + 'text_html_none' => 'Errore di caricamento del modulo, i dati HTML sono vuoti!', + 'text_is_delete' => 'certo che vuoi eliminare', + 'text_enable' => 'abilitare', + 'text_set_title' => 'intestazione di configurazione', + 'text_set_subtitle' => 'Configura sottotitoli', + 'text_suggested_size' => 'Dimensioni consigliate (LxA):', + 'text_word' => 'Parola', + 'text_add_pictures' => 'aggiungi immagini', + 'text_refresh_cookie' => 'Aggiorna i cookie', + 'text_popup_hint' => 'NOTA: l\' utente fa clic su Chiudi e non verrà più visualizzato fino alla chiusura e alla riapertura del browser. Per i test locali, puoi fare clic su "Aggiorna cookie", quindi aggiornare il browser e la finestra pop-up può essere nuovamente attivata. ', + 'text_cookie_refresh_success' => 'Il cookie è stato aggiornato correttamente, aggiorna il browser per vedere il contenuto della finestra pop-up.', + 'text_add_hot_links' => 'Aggiungi collegamento di ricerca a caldo', + 'text_add' => 'Aggiungere a', + 'text_margin_top' => 'Imbottitura del modulo - Parte superiore', + 'text_margin_bottom' => 'Imbottitura del modulo - Inferiore', + 'text_file_manager' => 'gestore di file', + 'modules_link' => 'Collegamento', + 'modules_choose_link' => 'seleziona collegamento', + 'text_select_link' => 'Seleziona la pagina del collegamento a cui passare', + 'text_no' => 'nessuno', + 'text_search' => 'ricerca', + 'text_is_newpage' => 'Se aprire una nuova finestra::', + 'text_manage' => 'gestire', + 'text_title_cover' => 'Titolo (sostituisce il nome del collegamento selezionato di seguito)', + 'text_enter_link' => 'Titolo (sostituisce il nome del collegamento selezionato di seguito)', + 'text_states' => 'stato', + 'text_disable' => 'Disabilitato', + 'text_no_data' => 'I dati non esistono o sono stati cancellati', + 'text_to_add' => 'aggiungere', + 'text_category' => 'Classificazione', + 'text_information' => 'Pagina informativa', + 'text_manufacturer' => 'marca', + 'text_static' => 'Collegamento fisso', + 'text_custom' => 'personalizzare', + 'text_top_text' => 'testo in alto', + 'text_edit_page_name' => 'Modifica il nome della pagina', + 'text_page_name_no' => 'Il nome è obbligatorio', + 'custom_name' => 'nome personalizzato', // 固定连接 - 'text_static_product_latest' => 'Nuovi Prodotti', - 'text_static_product_special' => 'speciali', + 'text_static_product_latest' => 'Nuovi Prodotti', + 'text_static_product_special' => 'speciali', 'text_static_product_manufacturer' => 'Zona del marchio', - 'text_static_account_account' => 'Centro membri', - 'text_static_account_order' => 'Cronologia ordini', - 'text_static_account_wishlist' => 'Elenco dei preferiti', - 'text_static_affiliate_login' => 'Affiliato', - 'text_static_account_newsletter' => 'Iscriviti a una consulenza', - 'text_static_information_contact' => 'Contattaci', - 'text_static_information_sitemap' => 'Mappa del sito', - 'text_static_information_faq' => 'problema comune', - 'text_static_account_voucher' => 'voucher; tagliando', - 'text_static_account_login' => 'Accesso', - 'text_static_account_register' => 'Registrati', - 'text_static_checkout_cart' => 'carrello della spesa', - 'text_static_blog_home' => 'blog', + 'text_static_account_account' => 'Centro membri', + 'text_static_account_order' => 'Cronologia ordini', + 'text_static_account_wishlist' => 'Elenco dei preferiti', + 'text_static_affiliate_login' => 'Affiliato', + 'text_static_account_newsletter' => 'Iscriviti a una consulenza', + 'text_static_information_contact' => 'Contattaci', + 'text_static_information_sitemap' => 'Mappa del sito', + 'text_static_information_faq' => 'problema comune', + 'text_static_account_voucher' => 'voucher; tagliando', + 'text_static_account_login' => 'Accesso', + 'text_static_account_register' => 'Registrati', + 'text_static_checkout_cart' => 'carrello della spesa', + 'text_static_blog_home' => 'blog', - 'text_edit_product' => 'Modifica i dettagli del prodotto', - 'text_edit_home' => 'Modifica casa', - 'text_edit_mb_home' => 'Modifica la home page mobile', - 'text_footer_edit' => 'Modifica piè di pagina', - 'text_header_edit' => 'modifica intestazione', - 'text_save_refresh' => 'salva e aggiorna', - 'text_save_refresh_header' => 'salva (aggiorna intestazione)', - 'text_service_icon' => 'icona del servizio', - 'text_describe' => 'descrivere', - 'text_add_link' => 'Aggiungi un collegamento', - 'text_is_btn' => 'se mostrare il pulsante', - 'text_phone' => 'Telefono', - 'text_address' => 'indirizzo', - 'text_email' => 'Posta', - 'text_copyright' => 'Copyright/immagine', - 'text_yq_link' => 'Collegamenti', - 'text_link_bar' => 'barra di collegamento', - 'text_introduce' => 'introdurre', - 'text_up_logo' => 'carica il logo', - 'text_hot_keywords' => 'Parole chiave di ricerca calde', - 'text_title' => 'titolo', - 'text_text_notific' => 'notifica di testo', - 'text_only_home' => 'Mostra solo sulla home page', - 'text_background_color' => 'colore di sfondo', - 'text_font_color' => 'colore del carattere', - 'text_image' => 'immagine', - 'text_show' => 'mostrare', - 'text_is_phone' => 'Mostra il numero di contatto', - 'text_half_angle' => 'Separare con le virgole', - 'text_prompt_words' => 'testo di richiesta', - 'text_search_bar' => 'barra di ricerca', - 'text_btn_text' => 'testo del pulsante', - 'text_banner_ad' => 'banner pubblicitario', - 'text_l_c' => 'Colonna Lingua/Valuta', - 'text_top_color' => 'colore della parte superiore', - 'text_title_color' => 'colore del titolo', - 'text_color' => 'colore', - 'text_left_text' => 'testo a sinistra', - 'text_right_icon' => 'icona di pagamento a destra', - 'text_bgi' => 'immagine di sfondo', - 'text_btn' => 'pulsante', + 'text_edit_product' => 'Modifica i dettagli del prodotto', + 'text_edit_home' => 'Modifica casa', + 'text_edit_mb_home' => 'Modifica la home page mobile', + 'text_footer_edit' => 'Modifica piè di pagina', + 'text_header_edit' => 'modifica intestazione', + 'text_save_refresh' => 'salva e aggiorna', + 'text_save_refresh_header' => 'salva (aggiorna intestazione)', + 'text_service_icon' => 'icona del servizio', + 'text_describe' => 'descrivere', + 'text_add_link' => 'Aggiungi un collegamento', + 'text_is_btn' => 'se mostrare il pulsante', + 'text_phone' => 'Telefono', + 'text_address' => 'indirizzo', + 'text_email' => 'Posta', + 'text_copyright' => 'Copyright/immagine', + 'text_yq_link' => 'Collegamenti', + 'text_link_bar' => 'barra di collegamento', + 'text_introduce' => 'introdurre', + 'text_up_logo' => 'carica il logo', + 'text_hot_keywords' => 'Parole chiave di ricerca calde', + 'text_title' => 'titolo', + 'text_text_notific' => 'notifica di testo', + 'text_only_home' => 'Mostra solo sulla home page', + 'text_background_color' => 'colore di sfondo', + 'text_font_color' => 'colore del carattere', + 'text_image' => 'immagine', + 'text_show' => 'mostrare', + 'text_is_phone' => 'Mostra il numero di contatto', + 'text_half_angle' => 'Separare con le virgole', + 'text_prompt_words' => 'testo di richiesta', + 'text_search_bar' => 'barra di ricerca', + 'text_btn_text' => 'testo del pulsante', + 'text_banner_ad' => 'banner pubblicitario', + 'text_l_c' => 'Colonna Lingua/Valuta', + 'text_top_color' => 'colore della parte superiore', + 'text_title_color' => 'colore del titolo', + 'text_color' => 'colore', + 'text_left_text' => 'testo a sinistra', + 'text_right_icon' => 'icona di pagamento a destra', + 'text_bgi' => 'immagine di sfondo', + 'text_btn' => 'pulsante', // page - 'page_product_title_size' => 'Dimensione del carattere del titolo del prodotto', - 'page_product_title_color' => 'colore del titolo del prodotto', - 'page_product_price_color' => 'colore prezzo prodotto', - 'page_product_thumb_position' => 'Posizione della miniatura', - 'page_product_image' => 'immagine del prodotto', - 'page_product_bottom' => 'parte inferiore', - 'page_product_left' => 'sinistra', - 'page_product_magnifying_style' => 'stile lente d\'ingrandimento', - 'page_product_magnifying_window' => 'finestra esterna', - 'page_product_magnifying_inner' => 'Sospensione interna', - 'page_product_magnifying_lens' => 'Lente d\'ingrandimento interna', - 'page_product_share' => 'Condividere', - 'page_product_share_code' => 'codice di condivisione', - 'page_product_general_settings' => 'Impostazioni generali', - 'page_product_font_size' => 'dimensione del font', + 'page_product_title_size' => 'Dimensione del carattere del titolo del prodotto', + 'page_product_title_color' => 'colore del titolo del prodotto', + 'page_product_price_color' => 'colore prezzo prodotto', + 'page_product_thumb_position' => 'Posizione della miniatura', + 'page_product_image' => 'immagine del prodotto', + 'page_product_bottom' => 'parte inferiore', + 'page_product_left' => 'sinistra', + 'page_product_magnifying_style' => 'stile lente d\'ingrandimento', + 'page_product_magnifying_window' => 'finestra esterna', + 'page_product_magnifying_inner' => 'Sospensione interna', + 'page_product_magnifying_lens' => 'Lente d\'ingrandimento interna', + 'page_product_share' => 'Condividere', + 'page_product_share_code' => 'codice di condivisione', + 'page_product_general_settings' => 'Impostazioni generali', + 'page_product_font_size' => 'dimensione del font', // ModuleS List - 'modules_photo_text' => 'Foto-testo', - 'modules_video_module' => 'modulo video', - 'modules_customer_reviews' => 'recensioni dei clienti', - 'modules_images_link' => 'Collegamento multi-immagine', - 'modules_background_icon_text' => 'testo dell\'icona di sfondo', - 'modules_slideshow_category' => 'Categoria diapositiva', - 'modules_bargain' => 'contrattare', - 'modules_bestseller' => 'oggetto di vendita caldo', - 'modules_blog' => 'blog', - 'modules_carousel' => 'Icona di scorrimento', - 'modules_category' => 'Modulo di classificazione', - 'modules_coupon' => 'buono', - 'modules_flash_sale' => 'Picco di merci', - 'modules_group_buying' => 'gruppo', - 'modules_html' => 'testo ricco', - 'modules_icon_text' => 'Testo icona', - 'modules_image_100' => 'Modulo immagine singola', - 'modules_image_200' => 'Due immagini in una riga', - 'modules_image_300' => 'Tre immagini in una riga', - 'modules_image_301' => 'Tre immagini in una linea-pro', - 'modules_image_400' => 'Quattro immagini in una riga', - 'modules_image_401' => 'Quattro immagini in una linea-pro', - 'modules_latest' => 'Nuovi Prodotti', - 'modules_manufacturer' => 'Elenco marche', - 'modules_product' => 'merce', - 'modules_product_tab' => 'elemento della scheda', - 'modules_slideshow' => 'Presentazione', - 'modules_quantity' => 'Visualizza limite di quantità', - 'modules_manage_bargain' => 'Gestisci gli affari', - 'modules_manage_blog' => 'Gestisci blog', - 'modules_no_blog' => 'Se non ci sono articoli, vai su [Gestione contenuti -> Gestione blog] per configurare l\'articolo.', - 'modules_slides_per_view' => 'Visualizza la quantità su uno schermo', - 'modules_enter_content' => 'Si prega di inserire il contenuto', - 'modules_full_screen' => 'a schermo intero', - 'modules_content' => 'contenuto', - 'modules_edit_content' => 'Modifica contenuto', - 'modules_select_image' => 'Seleziona Immagine', - 'modules_quantity_line' => 'Visualizza diversi su una riga', - 'modules_please_choose' => 'si prega di scegliere', - 'modules_choose' => 'scegliere', - 'modules_add_category' => 'Aggiungi categoria', - 'modules_choose_category' => 'Scegli la categoria', - 'modules_set_coupon' => 'Configurazione coupon', - 'modules_no_coupon' => 'Nessun dato relativo al coupon', - 'modules_manage_flash' => 'Gestisci offerte lampo', - 'modules_manage_group' => 'Gestisci prodotti raggruppati', - 'modules_no_state' => 'Il modulo corrente non è abilitato o configurato, vai in background [Gestione modulo] per configurare questo modulo.', - 'modules_grid_mode' => 'motivo a griglia', - 'modules_more_link' => 'più collegamenti', - 'modules_choose_brand' => 'Scegli un marchio', - 'modules_set_product' => 'Configura il prodotto', - 'modules_keywords_search' => 'Inserisci una parola chiave per la ricerca', - 'modules_test_name' => 'nome del test', - 'modules_please_products' => 'Si prega di aggiungere il prodotto', - 'modules_image_size' => 'dimensione dell\'immagine', - 'modules_height' => 'alto', - 'modules_width' => 'larghezza', - 'modules_category_style' => 'Stile di visualizzazione della categoria', - 'modules_down' => 'sotto', - 'modules_left' => 'sinistra', - 'modules_category_no' => 'non categorizzare', - 'modules_review_name' => 'nome', - 'modules_profession' => 'Professione', - 'modules_video_cover' => 'copertina del video', - 'modules_video' => 'video', - + 'modules_photo_text' => 'Foto-testo', + 'modules_video_module' => 'modulo video', + 'modules_customer_reviews' => 'recensioni dei clienti', + 'modules_images_link' => 'Collegamento multi-immagine', + 'modules_background_icon_text' => 'testo dell\'icona di sfondo', + 'modules_slideshow_category' => 'Categoria diapositiva', + 'modules_bargain' => 'contrattare', + 'modules_bestseller' => 'oggetto di vendita caldo', + 'modules_blog' => 'blog', + 'modules_carousel' => 'Icona di scorrimento', + 'modules_category' => 'Modulo di classificazione', + 'modules_coupon' => 'buono', + 'modules_flash_sale' => 'Picco di merci', + 'modules_group_buying' => 'gruppo', + 'modules_html' => 'testo ricco', + 'modules_icon_text' => 'Testo icona', + 'modules_image_100' => 'Modulo immagine singola', + 'modules_image_200' => 'Due immagini in una riga', + 'modules_image_300' => 'Tre immagini in una riga', + 'modules_image_301' => 'Tre immagini in una linea-pro', + 'modules_image_400' => 'Quattro immagini in una riga', + 'modules_image_401' => 'Quattro immagini in una linea-pro', + 'modules_latest' => 'Nuovi Prodotti', + 'modules_manufacturer' => 'Elenco marche', + 'modules_product' => 'merce', + 'modules_product_tab' => 'elemento della scheda', + 'modules_slideshow' => 'Presentazione', + 'modules_quantity' => 'Visualizza limite di quantità', + 'modules_manage_bargain' => 'Gestisci gli affari', + 'modules_manage_blog' => 'Gestisci blog', + 'modules_no_blog' => 'Se non ci sono articoli, vai su [Gestione contenuti -> Gestione blog] per configurare l\'articolo.', + 'modules_slides_per_view' => 'Visualizza la quantità su uno schermo', + 'modules_enter_content' => 'Si prega di inserire il contenuto', + 'modules_full_screen' => 'a schermo intero', + 'modules_content' => 'contenuto', + 'modules_edit_content' => 'Modifica contenuto', + 'modules_select_image' => 'Seleziona Immagine', + 'modules_quantity_line' => 'Visualizza diversi su una riga', + 'modules_please_choose' => 'si prega di scegliere', + 'modules_choose' => 'scegliere', + 'modules_add_category' => 'Aggiungi categoria', + 'modules_choose_category' => 'Scegli la categoria', + 'modules_set_coupon' => 'Configurazione coupon', + 'modules_no_coupon' => 'Nessun dato relativo al coupon', + 'modules_manage_flash' => 'Gestisci offerte lampo', + 'modules_manage_group' => 'Gestisci prodotti raggruppati', + 'modules_no_state' => 'Il modulo corrente non è abilitato o configurato, vai in background [Gestione modulo] per configurare questo modulo.', + 'modules_grid_mode' => 'motivo a griglia', + 'modules_more_link' => 'più collegamenti', + 'modules_choose_brand' => 'Scegli un marchio', + 'modules_set_product' => 'Configura il prodotto', + 'modules_keywords_search' => 'Inserisci una parola chiave per la ricerca', + 'modules_test_name' => 'nome del test', + 'modules_please_products' => 'Si prega di aggiungere il prodotto', + 'modules_image_size' => 'dimensione dell\'immagine', + 'modules_height' => 'alto', + 'modules_width' => 'larghezza', + 'modules_category_style' => 'Stile di visualizzazione della categoria', + 'modules_down' => 'sotto', + 'modules_left' => 'sinistra', + 'modules_category_no' => 'non categorizzare', + 'modules_review_name' => 'nome', + 'modules_profession' => 'Professione', + 'modules_video_cover' => 'copertina del video', + 'modules_video' => 'video', // mobile - 'mobile_search' => 'barra di ricerca', - 'mobile_search_normal' => 'Non corretto nella parte superiore dello schermo', - 'mobile_search_hide' => 'Non visualizzare la barra di ricerca in alto', - 'mobile_search_fixed' => 'fisso nella parte superiore dello schermo (predefinito)', + 'mobile_search' => 'barra di ricerca', + 'mobile_search_normal' => 'Non corretto nella parte superiore dello schermo', + 'mobile_search_hide' => 'Non visualizzare la barra di ricerca in alto', + 'mobile_search_fixed' => 'fisso nella parte superiore dello schermo (predefinito)', // Menu - 'main_menu' => 'menu principale', - 'please_add_data' => 'aggiungi dati per favore', - 'add_main_menu' => 'Aggiungi menu principale', - 'main_menu_name_link' => 'nome/link del menu principale', - 'main_menu_label' => 'Etichetta menu principale', - 'label_background_color' => 'colore di sfondo etichetta', - 'label_text_color' => 'colore del testo etichetta', - 'submenu_group' => 'sottomenu (gruppo)', - 'add_menu_group' => 'Aggiungi gruppo di menu', - 'full_screen' => 'Se schermo intero', - 'menu' => 'menu', - 'add_submenu_link' => 'Aggiungi link al sottomenu', - 'type' => 'tipo', + 'main_menu' => 'menu principale', + 'please_add_data' => 'aggiungi dati per favore', + 'add_main_menu' => 'Aggiungi menu principale', + 'main_menu_name_link' => 'nome/link del menu principale', + 'main_menu_label' => 'Etichetta menu principale', + 'label_background_color' => 'colore di sfondo etichetta', + 'label_text_color' => 'colore del testo etichetta', + 'submenu_group' => 'sottomenu (gruppo)', + 'add_menu_group' => 'Aggiungi gruppo di menu', + 'full_screen' => 'Se schermo intero', + 'menu' => 'menu', + 'add_submenu_link' => 'Aggiungi link al sottomenu', + 'type' => 'tipo', // footer - 'footer_edit' => 'editor del footer', - 'sub_title' => 'sottotitolo', - 'introduction' => 'Introduzione', - 'copyright_settings' => 'Impostazioni del copyright', + 'footer_edit' => 'editor del footer', + 'sub_title' => 'sottotitolo', + 'introduction' => 'Introduzione', + 'copyright_settings' => 'Impostazioni del copyright', ]; diff --git a/resources/lang/it/admin/category.php b/resources/lang/it/admin/category.php index 9040d05f..d5b6b7a5 100644 --- a/resources/lang/it/admin/category.php +++ b/resources/lang/it/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'Classificazione', - 'edit_category' => 'Modifica categoria', - 'upper_category' => 'Sottotitoli', + 'index' => 'Classificazione', + 'edit_category' => 'Modifica categoria', + 'upper_category' => 'Sottotitoli', - 'categories_index' => 'Elenco delle categorie', + 'categories_index' => 'Elenco delle categorie', 'categories_create' => 'Crea una tassonomia', - 'categories_show' => 'Dettagli della categoria', + 'categories_show' => 'Dettagli della categoria', 'categories_update' => 'Aggiorna la classificazione', 'categories_delete' => 'elimina categoria', ]; diff --git a/resources/lang/it/admin/common.php b/resources/lang/it/admin/common.php index 86523298..5dde36f1 100644 --- a/resources/lang/it/admin/common.php +++ b/resources/lang/it/admin/common.php @@ -10,65 +10,65 @@ */ return [ - 'admin_panel' => 'Gestione dietro le quinte', - 'edit' => 'stato', - 'status' => 'azione', - 'action' => 'installa', - 'install' => 'installa', - 'uninstall' => 'disinstalla', + 'admin_panel' => 'Gestione dietro le quinte', + 'edit' => 'stato', + 'status' => 'azione', + 'action' => 'installa', + 'install' => 'installa', + 'uninstall' => 'disinstalla', // errors - 'forbidden' => 'Nessun accesso', - 'has_no_permission' => 'Non sei autorizzato ad accedere a questa pagina, contatta il tuo amministratore di sistema.', + 'forbidden' => 'Nessun accesso', + 'has_no_permission' => 'Non sei autorizzato ad accedere a questa pagina, contatta il tuo amministratore di sistema.', // header - 'home' => 'Gestisci casa', - 'order' => 'Gestione degli ordini', - 'rma' => 'Gestione del servizio post vendita', - 'rma_reason' => 'Gestione del motivo di reso', - 'product' => 'gestione delle merci', - 'brand' => 'gestione del marchio', - 'category' => 'Gestione della classificazione', - 'customer_group' => 'Gestione del gruppo di clienti', - 'customer' => 'gestione dei clienti', - 'content' => 'Gestione dei contenuti', - 'setting' => 'Impostazioni di sistema', - 'plugin' => 'Gestione dei plugin', - 'admin_user' => 'utente in background', - 'admin_role' => 'ruolo utente', - 'region' => 'Raggruppamento regionale', - 'tax_rate' => 'gestione delle aliquote fiscali', - 'tax_class' => 'gestione fiscale', - 'currency' => 'gestione del denaro', - 'language' => 'gestione della lingua', - 'zone' => 'Gestione provinciale', - 'country' => 'Gestione statale', - 'file_manager' => 'gestore di file', - 'access_frontend' => 'Visita la reception', + 'home' => 'Gestisci casa', + 'order' => 'Gestione degli ordini', + 'rma' => 'Gestione del servizio post vendita', + 'rma_reason' => 'Gestione del motivo di reso', + 'product' => 'gestione delle merci', + 'brand' => 'gestione del marchio', + 'category' => 'Gestione della classificazione', + 'customer_group' => 'Gestione del gruppo di clienti', + 'customer' => 'gestione dei clienti', + 'content' => 'Gestione dei contenuti', + 'setting' => 'Impostazioni di sistema', + 'plugin' => 'Gestione dei plugin', + 'admin_user' => 'utente in background', + 'admin_role' => 'ruolo utente', + 'region' => 'Raggruppamento regionale', + 'tax_rate' => 'gestione delle aliquote fiscali', + 'tax_class' => 'gestione fiscale', + 'currency' => 'gestione del denaro', + 'language' => 'gestione della lingua', + 'zone' => 'Gestione provinciale', + 'country' => 'Gestione statale', + 'file_manager' => 'gestore di file', + 'access_frontend' => 'Visita la reception', // sidebar - 'settings_index' => 'Impostazioni di sistema', - 'admin_users_index' => 'utente in background', - 'plugins_index' => 'Elenco dei plugin', - 'regions_index' => 'Raggruppamento regionale', - 'tax_rates_index' => 'impostazioni dell\'aliquota fiscale', - 'tax_classes_index' => 'categoria fiscale', - 'currencies_index' => 'gestione del denaro', - 'languages_index' => 'gestione della lingua', - 'design_index' => 'Decorazioni per la casa', - 'pages_index' => 'Pagina informativa', - 'design_footer_index' => 'Decorazione del piè di pagina', - 'design_menu_index' => 'Configurazione della navigazione', - 'categories_index' => 'Categorie', - 'products_index' => 'gestione delle merci', - 'products_trashed' => 'cestino', - 'customers_trashed' => 'cestino', - 'brands_index' => 'marchio del prodotto', - 'orders_index' => 'Lista degli ordini', - 'rmas_index' => 'Gestione post vendita', - 'rma_reasons_index' => 'Motivo post vendita', - 'customers_index' => 'Elenco clienti', + 'settings_index' => 'Impostazioni di sistema', + 'admin_users_index' => 'utente in background', + 'plugins_index' => 'Elenco dei plugin', + 'regions_index' => 'Raggruppamento regionale', + 'tax_rates_index' => 'impostazioni dell\'aliquota fiscale', + 'tax_classes_index' => 'categoria fiscale', + 'currencies_index' => 'gestione del denaro', + 'languages_index' => 'gestione della lingua', + 'design_index' => 'Decorazioni per la casa', + 'pages_index' => 'Pagina informativa', + 'design_footer_index' => 'Decorazione del piè di pagina', + 'design_menu_index' => 'Configurazione della navigazione', + 'categories_index' => 'Categorie', + 'products_index' => 'gestione delle merci', + 'products_trashed' => 'cestino', + 'customers_trashed' => 'cestino', + 'brands_index' => 'marchio del prodotto', + 'orders_index' => 'Lista degli ordini', + 'rmas_index' => 'Gestione post vendita', + 'rma_reasons_index' => 'Motivo post vendita', + 'customers_index' => 'Elenco clienti', 'customer_groups_index' => 'Gruppo di clienti', - 'countries_index' => 'Gestione statale', - 'zones_index' => 'Gestione provinciale', + 'countries_index' => 'Gestione statale', + 'zones_index' => 'Gestione provinciale', ]; diff --git a/resources/lang/it/admin/country.php b/resources/lang/it/admin/country.php index e96d5891..c7b33a91 100644 --- a/resources/lang/it/admin/country.php +++ b/resources/lang/it/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => 'nome paese', + 'country_name' => 'nome paese', - 'countries_index' => 'Elenco paesi', + 'countries_index' => 'Elenco paesi', 'countries_create' => 'crea paese', 'countries_update' => 'aggiorna paese', ]; diff --git a/resources/lang/it/admin/currency.php b/resources/lang/it/admin/currency.php index 010e25c0..f721b407 100644 --- a/resources/lang/it/admin/currency.php +++ b/resources/lang/it/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => 'lista di valute', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'lista di valute', 'currencies_create' => 'Crea valuta', - 'currencies_show' => 'dettagli valuta', + 'currencies_show' => 'dettagli valuta', 'currencies_update' => 'aggiorna valuta', 'currencies_delete' => 'Elimina valuta', ]; diff --git a/resources/lang/it/admin/customer.php b/resources/lang/it/admin/customer.php index 43f76137..d89b632f 100644 --- a/resources/lang/it/admin/customer.php +++ b/resources/lang/it/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => 'lista clienti', - 'customers_create' => 'crea clienti', - 'customers_show' => 'dettagli cliente', - 'customers_update' => 'aggiorna clienti', - 'customers_delete' => 'elimina clienti', + 'customers_index' => 'lista clienti', + 'customers_create' => 'crea clienti', + 'customers_show' => 'dettagli cliente', + 'customers_update' => 'aggiorna clienti', + 'customers_delete' => 'elimina clienti', - 'user_info' => 'informazioni utente', - 'address_management' => 'gestione degli indirizzi', - 'user_name' => 'nome utente', - 'password_info' => 'Lascia vuoto per mantenere invariata la password originale', - 'add_address' => 'Aggiungi indirizzo', - 'no_address' => 'Il conto corrente non ha indirizzo', - 'edit_address' => 'Modifica indirizzo', - 'address' => 'Seleziona paese', - 'choose_country' => 'provincia', - 'zones' => 'Scegli provincia', - 'choose_zones' => 'seleziona provincia', - 'enter_city' => 'entra in città', - 'city' => 'Città', - 'zipcode' => 'codice postale', - 'address_1' => 'Indirizzo dettagliato 1', - 'address_2' => 'Indirizzo dettagliato 2', + 'user_info' => 'informazioni utente', + 'address_management' => 'gestione degli indirizzi', + 'user_name' => 'nome utente', + 'password_info' => 'Lascia vuoto per mantenere invariata la password originale', + 'add_address' => 'Aggiungi indirizzo', + 'no_address' => 'Il conto corrente non ha indirizzo', + 'edit_address' => 'Modifica indirizzo', + 'address' => 'Seleziona paese', + 'choose_country' => 'provincia', + 'zones' => 'Scegli provincia', + 'choose_zones' => 'seleziona provincia', + 'enter_city' => 'entra in città', + 'city' => 'Città', + 'zipcode' => 'codice postale', + 'address_1' => 'Indirizzo dettagliato 1', + 'address_2' => 'Indirizzo dettagliato 2', - 'cannot_delete_root' => 'Impossibile eliminare l\'account di root', - 'error_email' => 'Si prega di inserire il formato email corretto', + 'cannot_delete_root' => 'Impossibile eliminare l\'account di root', + 'error_email' => 'Si prega di inserire il formato email corretto', 'confirm_delete_address' => 'Sei sicuro di voler eliminare l\'indirizzo?', ]; diff --git a/resources/lang/it/admin/customer_group.php b/resources/lang/it/admin/customer_group.php index 9a0cda9d..90c34da2 100644 --- a/resources/lang/it/admin/customer_group.php +++ b/resources/lang/it/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'gruppo di clienti', - 'consumption_limit' => 'limite di consumo', - 'discount_rate' => 'tasso di sconto', - 'reward_points_factor' => 'fattore punti premio', - 'integral_factor' => 'Usa coefficiente integrale', + 'index' => 'gruppo di clienti', + 'consumption_limit' => 'limite di consumo', + 'discount_rate' => 'tasso di sconto', + 'reward_points_factor' => 'fattore punti premio', + 'integral_factor' => 'Usa coefficiente integrale', - 'customer_groups_index' => 'elenco dei gruppi di clienti', + 'customer_groups_index' => 'elenco dei gruppi di clienti', 'customer_groups_create' => 'crea gruppi di clienti', - 'customer_groups_show' => 'dettagli del gruppo di clienti', + 'customer_groups_show' => 'dettagli del gruppo di clienti', 'customer_groups_update' => 'aggiorna gruppi di clienti', 'customer_groups_delete' => 'elimina gruppo clienti', - 'default_cannot_delete' => 'Il gruppo di clienti predefinito non può essere eliminato', + 'default_cannot_delete' => 'Il gruppo di clienti predefinito non può essere eliminato', ]; diff --git a/resources/lang/it/admin/dashboard.php b/resources/lang/it/admin/dashboard.php index e1342629..b7ce06de 100644 --- a/resources/lang/it/admin/dashboard.php +++ b/resources/lang/it/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => 'visite degli utenti', - 'order_total' => 'importo dell\'ordine', - 'customer_new' => 'Aggiungi utente', - 'order_amount' => 'Vendite', - 'yesterday' => 'ieri', - 'day_before' => 'un giorno prima', + 'order_total' => 'importo dell\'ordine', + 'customer_new' => 'Aggiungi utente', + 'order_amount' => 'Vendite', + 'yesterday' => 'ieri', + 'day_before' => 'un giorno prima', - 'order_report' => 'statistiche degli ordini', - 'latest_month' => 'mese', - 'latest_week' => 'settimana', - 'latest_year' => 'un anno', + 'order_report' => 'statistiche degli ordini', + 'latest_month' => 'mese', + 'latest_week' => 'settimana', + 'latest_year' => 'un anno', ]; diff --git a/resources/lang/it/admin/design_builder.php b/resources/lang/it/admin/design_builder.php index 3673bbdf..40dfd465 100644 --- a/resources/lang/it/admin/design_builder.php +++ b/resources/lang/it/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'modulo brand', - 'module_banner' => 'modulo banner', + 'module_brand' => 'modulo brand', + 'module_banner' => 'modulo banner', 'module_four_image_pro' => 'una riga quattro immagini PRO', - 'module_slideshow' => 'modulo diapositiva', - 'module_tab_products' => 'scheda prodotti', + 'module_slideshow' => 'modulo diapositiva', + 'module_tab_products' => 'scheda prodotti', ]; diff --git a/resources/lang/it/admin/file_manager.php b/resources/lang/it/admin/file_manager.php index ca461839..cba2379f 100644 --- a/resources/lang/it/admin/file_manager.php +++ b/resources/lang/it/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'Crea directory/file', - 'file_manager_show' => 'Visualizza directory/file', - 'file_manager_update' => 'rinomina', - 'file_manager_delete' => 'cancella directory/file', + 'file_manager_create' => 'Crea directory/file', + 'file_manager_show' => 'Visualizza directory/file', + 'file_manager_update' => 'rinomina', + 'file_manager_delete' => 'cancella directory/file', 'directory_already_exist' => 'directory esiste già', - 'directory_not_empty' => 'La directory non è vuota', - 'target_not_exist' => 'Il file o la cartella originale non esiste', - 'create_folder' => 'Creare una cartella', - 'rename' => 'Rinominare', - 'download' => 'Scarica', - 'upload_files' => 'caricare files', - 'click_upload' => 'Fare clic su Carica o trascinare l\'immagine qui', - 'image_uploading' => 'caricamento delle immagini', - 'no_file' => 'nessun file', - 'picture_space' => 'spazio dell\'immagine', - 'show_pc' => 'Si prega di andare sul lato PC per operare', + 'directory_not_empty' => 'La directory non è vuota', + 'target_not_exist' => 'Il file o la cartella originale non esiste', + 'create_folder' => 'Creare una cartella', + 'rename' => 'Rinominare', + 'download' => 'Scarica', + 'upload_files' => 'caricare files', + 'click_upload' => 'Fare clic su Carica o trascinare l\'immagine qui', + 'image_uploading' => 'caricamento delle immagini', + 'no_file' => 'nessun file', + 'picture_space' => 'spazio dell\'immagine', + 'show_pc' => 'Si prega di andare sul lato PC per operare', - 'confirm_delete_file' => 'Vuoi eliminare il file selezionato', - 'confirm_delete_folder' => 'L\'operazione di cancellazione della cartella è in corso, tutti i file nella cartella verranno eliminati, vuoi confermare?', - 'new_folder' => 'nuova cartella', - 'can_empty' => 'Non può essere vuoto', - 'finish' => 'Fine', - 'uploading' => 'caricamento', - 'file_manager' => 'Gestore delle immagini', + 'confirm_delete_file' => 'Vuoi eliminare il file selezionato', + 'confirm_delete_folder' => 'L\'operazione di cancellazione della cartella è in corso, tutti i file nella cartella verranno eliminati, vuoi confermare?', + 'new_folder' => 'nuova cartella', + 'can_empty' => 'Non può essere vuoto', + 'finish' => 'Fine', + 'uploading' => 'caricamento', + 'file_manager' => 'Gestore delle immagini', ]; diff --git a/resources/lang/it/admin/language.php b/resources/lang/it/admin/language.php index a2973dfa..27ace5ec 100644 --- a/resources/lang/it/admin/language.php +++ b/resources/lang/it/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => 'lista delle lingue', - 'languages_create' => 'crea lingua', - 'languages_show' => 'dettagli della lingua', - 'languages_update' => 'aggiorna lingua', - 'languages_delete' => 'cancella lingua', + 'languages_index' => 'lista delle lingue', + 'languages_create' => 'crea lingua', + 'languages_show' => 'dettagli della lingua', + 'languages_update' => 'aggiorna lingua', + 'languages_delete' => 'cancella lingua', 'error_default_language_cannot_delete' => 'La lingua predefinita non può essere cancellata! ', - 'help_install' => 'Nota: per installare una nuova lingua, è necessario configurare i prodotti, le categorie, la navigazione, i moduli della home page, i piè di pagina, ecc. della lingua corrispondente, altrimenti si verificherà una visualizzazione anomala della pagina', + 'help_install' => 'Nota: per installare una nuova lingua, è necessario configurare i prodotti, le categorie, la navigazione, i moduli della home page, i piè di pagina, ecc. della lingua corrispondente, altrimenti si verificherà una visualizzazione anomala della pagina', ]; diff --git a/resources/lang/it/admin/login.php b/resources/lang/it/admin/login.php index 8805b3df..dab915e6 100644 --- a/resources/lang/it/admin/login.php +++ b/resources/lang/it/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => '登录到 BeikeShop 后台', - 'log_in' => '登录', + 'log_in' => '登录', ]; diff --git a/resources/lang/it/admin/marketing.php b/resources/lang/it/admin/marketing.php index 083b0c4a..82012d0a 100644 --- a/resources/lang/it/admin/marketing.php +++ b/resources/lang/it/admin/marketing.php @@ -10,16 +10,16 @@ */ return [ - 'marketing_list' => 'mercato dei plug-in', - 'marketing_show' => 'dettagli plug-in', - 'set_token' => 'Imposta token', - 'get_token' => 'Ottieni token', - 'download_count' => 'conteggio download', - 'last_update' => 'ultimo aggiornamento', - 'text_version' => 'versione', - 'text_compatibility' => 'compatibilità', - 'text_author' => 'autore plug-in', - 'download_plugin' => 'scarica plugin', + 'marketing_list' => 'mercato dei plug-in', + 'marketing_show' => 'dettagli plug-in', + 'set_token' => 'Imposta token', + 'get_token' => 'Ottieni token', + 'download_count' => 'conteggio download', + 'last_update' => 'ultimo aggiornamento', + 'text_version' => 'versione', + 'text_compatibility' => 'compatibilità', + 'text_author' => 'autore plug-in', + 'download_plugin' => 'scarica plugin', 'download_description' => 'Descrizione plug-in', - 'text_free' => 'gratuito', + 'text_free' => 'gratuito', ]; diff --git a/resources/lang/it/admin/order.php b/resources/lang/it/admin/order.php index 5304b877..4ff476ee 100644 --- a/resources/lang/it/admin/order.php +++ b/resources/lang/it/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => 'Lista degli ordini', + 'list' => 'Lista degli ordini', - 'order_quantity' => 'quantità dell\'ordine', - 'order_amount' => 'importo dell\'ordine', - 'orders_index' => 'lista degli ordini', - 'orders_create' => 'crea ordine', - 'orders_show' => 'dettagli dell\'ordine', - 'orders_export' => 'esporta ordini', - 'orders_update' => 'aggiorna ordine', - 'orders_delete' => 'cancella ordine', - 'notify' => 'Se ricordare', + 'order_quantity' => 'quantità dell\'ordine', + 'order_amount' => 'importo dell\'ordine', + 'orders_index' => 'lista degli ordini', + 'orders_create' => 'crea ordine', + 'orders_show' => 'dettagli dell\'ordine', + 'orders_export' => 'esporta ordini', + 'orders_update' => 'aggiorna ordine', + 'orders_delete' => 'cancella ordine', + 'notify' => 'Se ricordare', 'orders_update_status' => 'stato di aggiornamento', - 'error_status' => 'Seleziona lo stato', + 'error_status' => 'Seleziona lo stato', ]; diff --git a/resources/lang/it/admin/page.php b/resources/lang/it/admin/page.php index 9ed20cee..df7981bf 100644 --- a/resources/lang/it/admin/page.php +++ b/resources/lang/it/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'pagina informativa', - 'info_title' => 'titolo delle informazioni', + 'index' => 'pagina informativa', + 'info_title' => 'titolo delle informazioni', 'info_content' => 'contenuto', - 'pages_index' => 'Elenco di pagine singole', + 'pages_index' => 'Elenco di pagine singole', 'pages_create' => 'Crea una singola pagina', - 'pages_show' => 'Dettagli pagina singola', + 'pages_show' => 'Dettagli pagina singola', 'pages_update' => 'Modifica pagina singola', - 'pages_delete' => 'Elimina una singola pagina' + 'pages_delete' => 'Elimina una singola pagina', ]; diff --git a/resources/lang/it/admin/plugin.php b/resources/lang/it/admin/plugin.php index 09df5d86..e82b86ad 100644 --- a/resources/lang/it/admin/plugin.php +++ b/resources/lang/it/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => 'elenco dei plugin', - 'plugins_import' => 'Carica plugin', - 'plugins_show' => 'dettagli plugin', - 'plugins_update' => 'aggiornamento plugin', + 'plugins_index' => 'elenco dei plugin', + 'plugins_import' => 'Carica plugin', + 'plugins_show' => 'dettagli plugin', + 'plugins_update' => 'aggiornamento plugin', 'plugins_update_status' => 'stato di aggiornamento', - 'plugins_install' => 'installa', - 'plugins_uninstall' => 'disinstalla', + 'plugins_install' => 'installa', + 'plugins_uninstall' => 'disinstalla', - 'plugin_list' => 'elenco dei plugin', - 'plugin_code' => 'codice plugin', - 'plugin_type' => 'tipo di plugin', - 'plugin_description' => 'descrizione plugin', - 'plugin_upload' => 'Carica plugin (supporta solo file zip)', + 'plugin_list' => 'elenco dei plugin', + 'plugin_code' => 'codice plugin', + 'plugin_type' => 'tipo di plugin', + 'plugin_description' => 'descrizione plugin', + 'plugin_upload' => 'Carica plugin (supporta solo file zip)', - 'shipping' => 'metodo di spedizione', - 'payment' => 'metodo di pagamento', - 'total' => 'Calcolo dell\'ordine', - 'view' => 'modifica pagina', + 'shipping' => 'metodo di spedizione', + 'payment' => 'metodo di pagamento', + 'total' => 'Calcolo dell\'ordine', + 'view' => 'modifica pagina', ]; diff --git a/resources/lang/it/admin/product.php b/resources/lang/it/admin/product.php index 0f936205..97e8e01d 100644 --- a/resources/lang/it/admin/product.php +++ b/resources/lang/it/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => 'lista dei prodotti', - 'products_create' => 'crea prodotti', - 'products_show' => 'Dettagli prodotto', - 'products_update' => 'aggiorna prodotti', - 'products_delete' => 'elimina prodotto', - 'products_trashed' => 'cestino', - 'products_restore' => 'Ripristina Cestino', - 'clear_restore' => 'svuota cestino', + 'products_index' => 'lista dei prodotti', + 'products_create' => 'crea prodotti', + 'products_show' => 'Dettagli prodotto', + 'products_update' => 'aggiorna prodotti', + 'products_delete' => 'elimina prodotto', + 'products_trashed' => 'cestino', + 'products_restore' => 'Ripristina Cestino', + 'clear_restore' => 'svuota cestino', + 'batch_delete' => 'cancellazione batch', + 'batch_active' => 'elenco dei lotti', + 'batch_inactive' => 'Batch fuori dallo scaffale', - 'batch_delete' => 'cancellazione batch', - 'batch_active' => 'elenco dei lotti', - 'batch_inactive' => 'Batch fuori dallo scaffale', + 'basic_information' => 'informazioni di base', + 'product_details' => 'Dettagli prodotto', + 'product_relations' => 'beni correlati', + 'stocks' => 'inventario merci', + 'model' => 'modello', + 'price' => 'prezzo', + 'origin_price' => 'prezzo originale', + 'cost_price' => 'prezzo di costo', + 'quantity' => 'quantità', + 'enable_multi_spec' => 'Abilita multi-spec', + 'image_help' => 'La prima immagine verrà utilizzata come immagine principale del prodotto e possono essere caricate più immagini contemporaneamente e la posizione di più immagini può essere regolata a piacimento', + 'add_variable' => 'Aggiungi specifica', + 'add_variable_value' => 'Aggiungi valore di specifica', + 'add_variable_image' => 'Aggiungi immagine specifica', + 'default_main_product' => 'prodotto principale predefinito', + 'modify_order' => 'Fai doppio clic per modificare, trascina per regolare l\'ordine', - 'basic_information' => 'informazioni di base', - 'product_details' => 'Dettagli prodotto', - 'product_relations' => 'beni correlati', - 'stocks' => 'inventario merci', - 'model' => 'modello', - 'price' => 'prezzo', - 'origin_price' => 'prezzo originale', - 'cost_price' => 'prezzo di costo', - 'quantity' => 'quantità', - 'enable_multi_spec' => 'Abilita multi-spec', - 'image_help' => 'La prima immagine verrà utilizzata come immagine principale del prodotto e possono essere caricate più immagini contemporaneamente e la posizione di più immagini può essere regolata a piacimento', - 'add_variable' => 'Aggiungi specifica', - 'add_variable_value' => 'Aggiungi valore di specifica', - 'add_variable_image' => 'Aggiungi immagine specifica', - 'default_main_product' => 'prodotto principale predefinito', - 'modify_order' => 'Fai doppio clic per modificare, trascina per regolare l\'ordine', - - 'confirm_batch_product' => 'Sei sicuro di voler eliminare i prodotti selezionati in batch?', - 'confirm_batch_status' => 'Conferma per modificare lo stato dei prodotti selezionati in batch?', - 'confirm_batch_restore' => 'Conferma per ripristinare il prodotto selezionato?', + 'confirm_batch_product' => 'Sei sicuro di voler eliminare i prodotti selezionati in batch?', + 'confirm_batch_status' => 'Conferma per modificare lo stato dei prodotti selezionati in batch?', + 'confirm_batch_restore' => 'Conferma per ripristinare il prodotto selezionato?', 'confirm_delete_restore' => 'Sei sicuro di voler svuotare il cestino?', ]; diff --git a/resources/lang/it/admin/region.php b/resources/lang/it/admin/region.php index 2dce10ee..8e061d76 100644 --- a/resources/lang/it/admin/region.php +++ b/resources/lang/it/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'gruppo regionale', - 'regions_index' => 'elenco dei gruppi di regioni', + 'index' => 'gruppo regionale', + 'regions_index' => 'elenco dei gruppi di regioni', 'regions_create' => 'Crea un gruppo di regioni', - 'regions_show' => 'dettagli del gruppo di regioni', + 'regions_show' => 'dettagli del gruppo di regioni', 'regions_update' => 'aggiorna gruppo regione', 'regions_delete' => 'Elimina gruppo di regioni', - 'name' => 'nome', - 'describe' => 'descrivi', - 'country' => 'paese', - 'zone' => 'provincia', + 'name' => 'nome', + 'describe' => 'descrivi', + 'country' => 'paese', + 'zone' => 'provincia', ]; diff --git a/resources/lang/it/admin/rma.php b/resources/lang/it/admin/rma.php index 9aa77b21..b8de69d9 100644 --- a/resources/lang/it/admin/rma.php +++ b/resources/lang/it/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'Applicazione post-vendita', + 'index' => 'Applicazione post-vendita', - 'rmas_index' => 'Elenco servizi post-vendita', - 'rmas_show' => 'Dettagli servizio post-vendita', - 'rmas_update' => 'Aggiorna servizio post-vendita', - 'rmas_delete' => 'Elimina servizio post-vendita', + 'rmas_index' => 'Elenco servizi post-vendita', + 'rmas_show' => 'Dettagli servizio post-vendita', + 'rmas_update' => 'Aggiorna servizio post-vendita', + 'rmas_delete' => 'Elimina servizio post-vendita', - 'customers_name' => 'nome cliente', - 'quantity' => 'quantità', - 'service_type' => 'tipo di servizio', - 'rma_details' => 'Dettagli dell\'applicazione post-vendita', - 'reasons_return' => 'Motivo del reso', - 'current_state' => 'stato corrente', - 'modify_status' => 'modifica stato', - 'remarks' => 'osservazioni', - 'update_status' => 'stato di aggiornamento', + 'customers_name' => 'nome cliente', + 'quantity' => 'quantità', + 'service_type' => 'tipo di servizio', + 'rma_details' => 'Dettagli dell\'applicazione post-vendita', + 'reasons_return' => 'Motivo del reso', + 'current_state' => 'stato corrente', + 'modify_status' => 'modifica stato', + 'remarks' => 'osservazioni', + 'update_status' => 'stato di aggiornamento', 'operation_history' => 'storia_operazione', ]; diff --git a/resources/lang/it/admin/rma_reason.php b/resources/lang/it/admin/rma_reason.php index 0d10fb6d..0cf00068 100644 --- a/resources/lang/it/admin/rma_reason.php +++ b/resources/lang/it/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => 'lista dei motivi', + 'rma_reasons_index' => 'lista dei motivi', 'rma_reasons_create' => 'motivo della creazione', 'rma_reasons_update' => 'motivo dell\'aggiornamento', - 'rma_reasons_delete' => 'elimina motivo' + 'rma_reasons_delete' => 'elimina motivo', ]; diff --git a/resources/lang/it/admin/role.php b/resources/lang/it/admin/role.php index 4b11db48..1128bdd5 100644 --- a/resources/lang/it/admin/role.php +++ b/resources/lang/it/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => 'lista ruoli', - 'admin_roles_create' => 'Crea ruoli', - 'admin_roles_show' => 'dettagli ruoli', - 'admin_roles_update' => 'aggiorna ruoli', - 'admin_roles_delete' => 'cancella ruolo', - 'select_one_at_least' => 'Le autorizzazioni non possono essere vuote, selezionane almeno una' + 'admin_roles_index' => 'lista ruoli', + 'admin_roles_create' => 'Crea ruoli', + 'admin_roles_show' => 'dettagli ruoli', + 'admin_roles_update' => 'aggiorna ruoli', + 'admin_roles_delete' => 'cancella ruolo', + 'select_one_at_least' => 'Le autorizzazioni non possono essere vuote, selezionane almeno una', ]; diff --git a/resources/lang/it/admin/setting.php b/resources/lang/it/admin/setting.php index ea43d27f..9d181105 100644 --- a/resources/lang/it/admin/setting.php +++ b/resources/lang/it/admin/setting.php @@ -10,61 +10,61 @@ */ return [ - 'index' => 'impostazioni di sistema', - 'settings_index' => 'Visualizza impostazioni di sistema', - 'settings_update' => 'Modifica impostazioni di sistema', - 'design_index' => 'Casa Editore', - 'design_footer_index' => 'editor footer', - 'design_menu_index' => 'Editor di navigazione', - 'product_per_page' => 'Il numero di prodotti visualizzati su ogni pagina', + 'index' => 'impostazioni di sistema', + 'settings_index' => 'Visualizza impostazioni di sistema', + 'settings_update' => 'Modifica impostazioni di sistema', + 'design_index' => 'Casa Editore', + 'design_footer_index' => 'editor footer', + 'design_menu_index' => 'Editor di navigazione', + 'product_per_page' => 'Il numero di prodotti visualizzati su ogni pagina', - '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', + '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', - 'payment_address' => 'indirizzo di fatturazione', - 'meta_title' => 'Meta titolo', - 'meta_description' => 'Meta descrizione', - 'meta_keywords' => 'Meta parola chiave', - 'telephone' => 'Contatta telefono', - 'email' => 'cassetta postale', - 'default_address' => 'indirizzo predefinito', - 'default_country_set' => 'impostazione paese predefinita', - 'default_zone_set' => 'impostazione provincia predefinita', - 'default_language' => 'lingua predefinita', - 'default_currency' => 'valuta predefinita', + 'guest_checkout' => 'checkout visitatore', + 'theme_default' => 'tema predefinito', + 'theme_black' => 'tema nero', + 'shipping_address' => 'indirizzo di spedizione', + 'payment_address' => 'indirizzo di fatturazione', + 'meta_title' => 'Meta titolo', + 'meta_description' => 'Meta descrizione', + 'meta_keywords' => 'Meta parola chiave', + 'telephone' => 'Contatta telefono', + 'email' => 'cassetta postale', + 'default_address' => 'indirizzo predefinito', + 'default_country_set' => 'impostazione paese predefinita', + 'default_zone_set' => 'impostazione provincia predefinita', + 'default_language' => 'lingua predefinita', + 'default_currency' => 'valuta predefinita', 'default_customer_group' => 'gruppo di clienti predefinito', - 'admin_name' => 'directory in background', - 'admin_name_info' => 'Directory in background di gestione, l\'impostazione predefinita è admin', - 'enable_tax' => 'Abilita le tasse', - 'enable_tax_info' => 'Se abilitare il calcolo delle tasse', - 'tax_address' => 'indirizzo fiscale', - 'tax_address_info' => 'A quale indirizzo vengono calcolate le tasse?', - 'logo' => 'Logo del sito web', - 'favicon' => 'favicon', - 'favicon_info' => 'La piccola icona visualizzata sulle schede del browser, deve essere in formato PNG dimensione: 32*32', - 'placeholder_image' => 'mappa segnaposto', + 'admin_name' => 'directory in background', + 'admin_name_info' => 'Directory in background di gestione, l\'impostazione predefinita è admin', + 'enable_tax' => 'Abilita le tasse', + 'enable_tax_info' => 'Se abilitare il calcolo delle tasse', + 'tax_address' => 'indirizzo fiscale', + 'tax_address_info' => 'A quale indirizzo vengono calcolate le tasse?', + 'logo' => 'Logo del sito web', + 'favicon' => 'favicon', + 'favicon_info' => 'La piccola icona visualizzata sulle schede del browser, deve essere in formato PNG dimensione: 32*32', + 'placeholder_image' => 'mappa segnaposto', 'placeholder_image_info' => 'Immagine segnaposto visualizzata quando non viene trovata alcuna immagine o immagine, dimensione consigliata: 500*500', - 'head_code' => 'inserisci codice', - 'head_code_info' => 'Il codice nella casella di input verrà inserito nell\'intestazione della pagina front-end, che può essere utilizzata per contare il codice o aggiungere plug-in speciali, ecc.', + 'head_code' => 'inserisci codice', + 'head_code_info' => 'Il codice nella casella di input verrà inserito nell\'intestazione della pagina front-end, che può essere utilizzata per contare il codice o aggiungere plug-in speciali, ecc.', ]; diff --git a/resources/lang/it/admin/tax_class.php b/resources/lang/it/admin/tax_class.php index a6c0863e..a0c3d4a2 100644 --- a/resources/lang/it/admin/tax_class.php +++ b/resources/lang/it/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'categoria fiscale', - 'rule' => 'regola', - 'based_on' => 'basato su', - 'priority' => 'priorita', - 'tax_classes_index' => 'lista delle classi fiscali', + 'index' => 'categoria fiscale', + 'rule' => 'regola', + 'based_on' => 'basato su', + 'priority' => 'priorita', + 'tax_classes_index' => 'lista delle classi fiscali', 'tax_classes_create' => 'Crea classi fiscali', - 'tax_classes_show' => 'dettagli classe fiscale', + 'tax_classes_show' => 'dettagli classe fiscale', 'tax_classes_update' => 'Aggiorna classi fiscali', 'tax_classes_delete' => 'elimina classe fiscale', ]; diff --git a/resources/lang/it/admin/tax_rate.php b/resources/lang/it/admin/tax_rate.php index ea7c12e2..2e84bbb3 100644 --- a/resources/lang/it/admin/tax_rate.php +++ b/resources/lang/it/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => 'impostazioni', + 'index' => 'impostazioni', 'tax_classes_index' => 'impostazioni della classe fiscale', - 'tax' => 'tipo di tassa', - 'tax_rate' => 'tax_rate', - 'type' => 'tipo', - 'area' => 'area', - 'percentage' => 'percentuale', - 'fixed_tax_rate' => 'aliquota fiscale fissa', - 'tax_rates_index' => 'lista delle aliquote fiscali', - 'tax_rates_create' => 'Crea aliquota fiscale', - 'tax_rates_show' => 'dati fiscali', - 'tax_rates_update' => 'Aggiorna aliquota fiscale', - 'tax_rates_delete' => 'Elimina aliquota fiscale', + 'tax' => 'tipo di tassa', + 'tax_rate' => 'tax_rate', + 'type' => 'tipo', + 'area' => 'area', + 'percentage' => 'percentuale', + 'fixed_tax_rate' => 'aliquota fiscale fissa', + 'tax_rates_index' => 'lista delle aliquote fiscali', + 'tax_rates_create' => 'Crea aliquota fiscale', + 'tax_rates_show' => 'dati fiscali', + 'tax_rates_update' => 'Aggiorna aliquota fiscale', + 'tax_rates_delete' => 'Elimina aliquota fiscale', ]; diff --git a/resources/lang/it/admin/user.php b/resources/lang/it/admin/user.php index ad549b64..4424b41d 100644 --- a/resources/lang/it/admin/user.php +++ b/resources/lang/it/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'lista utenti', - 'admin_users_create' => 'Crea utente', - 'admin_users_show' => 'Dettagli utente', - 'admin_users_update' => 'aggiorna utenti', - 'admin_users_delete' => 'elimina utente', + 'admin_users_index' => 'lista utenti', + 'admin_users_create' => 'Crea utente', + 'admin_users_show' => 'Dettagli utente', + 'admin_users_update' => 'aggiorna utenti', + 'admin_users_delete' => 'elimina utente', 'verify_code_expired' => 'Il tuo codice di verifica è scaduto (10 minuti), per favore recuperalo', - 'verify_code_error' => 'Il tuo codice di verifica è sbagliato', - 'account_not_exist' => 'l\'account non esiste', + 'verify_code_error' => 'Il tuo codice di verifica è sbagliato', + 'account_not_exist' => 'l\'account non esiste', ]; diff --git a/resources/lang/it/admin/zone.php b/resources/lang/it/admin/zone.php index df289511..29542216 100644 --- a/resources/lang/it/admin/zone.php +++ b/resources/lang/it/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => 'nome provincia', + 'zone_name' => 'nome provincia', 'country_of_origin' => 'paese di origine', - 'zones_index' => 'lista provincia', - 'zones_create' => 'crea provincia', - 'zones_update' => 'aggiorna provincia', - 'zones_delete' => 'Elimina provincia', + 'zones_index' => 'lista provincia', + 'zones_create' => 'crea provincia', + 'zones_update' => 'aggiorna provincia', + 'zones_delete' => 'Elimina provincia', - 'error_country' => 'Seleziona un paese', + 'error_country' => 'Seleziona un paese', ]; diff --git a/resources/lang/it/brand.php b/resources/lang/it/brand.php index eb4ee55f..c8eba5bf 100644 --- a/resources/lang/it/brand.php +++ b/resources/lang/it/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => 'Marchio', - 'icon' => 'Icona', + 'name' => 'Marchio', + 'icon' => 'Icona', 'first_letter' => 'Iniziali', ]; diff --git a/resources/lang/it/cart.php b/resources/lang/it/cart.php index d896c659..d0abf531 100644 --- a/resources/lang/it/cart.php +++ b/resources/lang/it/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => 'Quantità d\'acquisto', + 'sku_id' => 'SKU ID', + 'quantity' => 'Quantità d\'acquisto', 'stock_out' => 'Carenza di inventario', ]; diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php index 746bd3d3..0a3d8eb7 100644 --- a/resources/lang/it/common.php +++ b/resources/lang/it/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => 'Si prega di compilare :nome', // 这个有用别删了，:name 是一个变量 + 'error_required' => 'Si prega di compilare :nome', // 这个有用别删了，:name 是一个变量 'error_input_required' => 'La casella di immissione non può essere vuota', - 'error_form' => 'Si prega di verificare che il modulo sia compilato correttamente', - 'email' => 'Posta', - 'unauthenticated' => 'Per favore fai prima il log in', - 'success' => 'successo', - 'no_data' => 'Nessun dato ancora~', - 'empty_items' => 'nessun dato', - 'created_success' => 'Creato con successo!', - 'deleted_success' => 'cancellato con successo!', - 'restored_success' => 'recupero riuscito!', - 'updated_success' => 'aggiornamento completato!', - 'edit_success' => 'Modificato con successo!', - 'get_success' => 'ottenere successo!', - 'all' => 'tutto', - 'status' => 'stato', - 'enable' => 'abilitare', - 'disable' => 'Disabilitato', - 'enabled' => 'abilitare', - 'disabled' => 'Disabilitato', - 'home' => 'prima pagina', - 'submit' => 'Sottoscrivi', - 'title' => 'titolo', - 'save' => 'Salva', - 'cancel' => 'Annulla', - 'confirm' => 'Sicuro', - 'no' => 'No', - 'yes' => 'Yes', - 'delete' => 'Elimina', - 'sign_out' => 'disconnessione', - 'contact_us' => 'Contattaci', - 'input' => 'inserisci qui la tua ricerca', - 'filter' => 'filtro', - 'reset' => 'Ripristina', - 'export' => 'esportare', - 'edit' => 'modificare', - 'action' => 'operare', - 'add' => 'Aggiungere a', - 'please_choose' => 'si prega di scegliere', - 'recommend_size' => 'Dimensione consigliata', - 'pick_datetime' => 'periodo di selezione', - 'confirm_delete' => 'Sei sicuro di volerlo eliminare?', - 'text_hint' => 'suggerimento', - 'restore' => 'recuperare', - 'name' => 'nome', - 'image' => 'immagine', - 'data' => 'dati', - 'view' => 'Dai un\'occhiata', - 'phone' => 'Telefono', - 'exit' => 'uscire', - 'return' => 'Restituzione', - 'language' => 'linguaggio', - 'select_all' => 'seleziona tutto', - 'sign_out' => 'disconnessione', - 'menu' => 'menù', - 'whether_open' => 'Se aprire', - 'to_setting' => 'configurare', + 'error_form' => 'Si prega di verificare che il modulo sia compilato correttamente', + 'email' => 'Posta', + 'unauthenticated' => 'Per favore fai prima il log in', + 'success' => 'successo', + 'no_data' => 'Nessun dato ancora~', + 'empty_items' => 'nessun dato', + 'created_success' => 'Creato con successo!', + 'deleted_success' => 'cancellato con successo!', + 'restored_success' => 'recupero riuscito!', + 'updated_success' => 'aggiornamento completato!', + 'edit_success' => 'Modificato con successo!', + 'get_success' => 'ottenere successo!', + 'all' => 'tutto', + 'status' => 'stato', + 'enable' => 'abilitare', + 'disable' => 'Disabilitato', + 'enabled' => 'abilitare', + 'disabled' => 'Disabilitato', + 'home' => 'prima pagina', + 'submit' => 'Sottoscrivi', + 'title' => 'titolo', + 'save' => 'Salva', + 'cancel' => 'Annulla', + 'confirm' => 'Sicuro', + 'no' => 'No', + 'yes' => 'Yes', + 'delete' => 'Elimina', + 'sign_out' => 'disconnessione', + 'contact_us' => 'Contattaci', + 'input' => 'inserisci qui la tua ricerca', + 'filter' => 'filtro', + 'reset' => 'Ripristina', + 'export' => 'esportare', + 'edit' => 'modificare', + 'action' => 'operare', + 'add' => 'Aggiungere a', + 'please_choose' => 'si prega di scegliere', + 'recommend_size' => 'Dimensione consigliata', + 'pick_datetime' => 'periodo di selezione', + 'confirm_delete' => 'Sei sicuro di volerlo eliminare?', + 'text_hint' => 'suggerimento', + 'restore' => 'recuperare', + 'name' => 'nome', + 'image' => 'immagine', + 'data' => 'dati', + 'view' => 'Dai un\'occhiata', + 'phone' => 'Telefono', + 'exit' => 'uscire', + 'return' => 'Restituzione', + 'language' => 'linguaggio', + 'select_all' => 'seleziona tutto', + 'sign_out' => 'disconnessione', + 'menu' => 'menù', + 'whether_open' => 'Se aprire', + 'to_setting' => 'configurare', - 'id' => 'ID', - 'created_at' => 'tempo di creazione', - 'updated_at' => 'Cambia l\'ora', - 'sort_order' => 'ordinare', - 'error_page' => 'I dati a cui hai effettuato l\'accesso non esistono o sono stati eliminati~', - 'error_page_btn' => 'Torna alla pagina precedente', + 'id' => 'ID', + 'created_at' => 'tempo di creazione', + 'updated_at' => 'Cambia l\'ora', + 'sort_order' => 'ordinare', + 'error_page' => 'I dati a cui hai effettuato l\'accesso non esistono o sono stati eliminati~', + 'error_page_btn' => 'Torna alla pagina precedente', - 'order' => [ - 'unpaid' => 'Essere pagato', - 'paid' => 'Pagato', - 'shipped' => 'Spedito', + 'order' => [ + 'unpaid' => 'Essere pagato', + 'paid' => 'Pagato', + 'shipped' => 'Spedito', 'completed' => 'completato', 'cancelled' => 'Annullato', - ] + ], ]; - - diff --git a/resources/lang/it/currency.php b/resources/lang/it/currency.php index 8b3084bd..8031befa 100644 --- a/resources/lang/it/currency.php +++ b/resources/lang/it/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => 'nome', - 'code' => 'codifica', - 'icon' => 'icona', - 'symbol_left' => 'segno sinistro', - 'symbol_right' => 'segno giusto', - 'value' => 'valore del tasso di cambio', - 'decimal_place' => 'decimali', + 'name' => 'nome', + 'code' => 'codifica', + 'icon' => 'icona', + 'symbol_left' => 'segno sinistro', + 'symbol_right' => 'segno giusto', + 'value' => 'valore del tasso di cambio', + 'decimal_place' => 'decimali', ]; diff --git a/resources/lang/it/customer.php b/resources/lang/it/customer.php index b7ecd1ba..ba14fe08 100644 --- a/resources/lang/it/customer.php +++ b/resources/lang/it/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => 'Nome', - 'email' => 'Email', - 'from' => 'fonte registrata', + 'name' => 'Nome', + 'email' => 'Email', + 'from' => 'fonte registrata', 'customer_group' => 'gruppo di utenti', ]; diff --git a/resources/lang/it/customer_group.php b/resources/lang/it/customer_group.php index 1c3f2d5a..7432220f 100644 --- a/resources/lang/it/customer_group.php +++ b/resources/lang/it/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => 'grado', - 'name' => 'nome del gruppo di clienti', + 'name' => 'nome del gruppo di clienti', ]; diff --git a/resources/lang/it/mail.php b/resources/lang/it/mail.php index a36ca419..99ef76eb 100644 --- a/resources/lang/it/mail.php +++ b/resources/lang/it/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => 'ordine inviato con successo', - 'order_update' => 'aggiornamento dello stato dell\'ordine', - 'order_success_info' => 'Il tuo ordine è stato inviato con successo, quanto segue è il dettaglio dell\'ordine', - 'not_oneself' => 'le operazioni non personali possono essere ignorate. ', - 'customer_name' => 'Gentile utente :name, ciao! ', - 'sinceramente' => 'sinceramente', - 'squadra' => 'squadra', - 'order_update_status' => 'Lo stato del tuo ordine :number è aggiornato', - 'welcome_register' => 'benvenuto alla registrazione', - 'register_end' => 'Completa la registrazione, fai clic sul pulsante in basso per tornare al centro commerciale. ', - 'btn_buy_now' => 'acquista ora', - 'retrieve_password_title' => 'recupera password', - 'retrieve_password_text' => 'Stai recuperando la tua password, fai clic sul pulsante in basso per completare l\'operazione. ', - 'retrieve_password_btn' => 'Fai clic qui per verificare l\'email', + 'order_success' => 'ordine inviato con successo', + 'order_update' => 'aggiornamento dello stato dell\'ordine', + 'order_success_info' => 'Il tuo ordine è stato inviato con successo, quanto segue è il dettaglio dell\'ordine', + 'not_oneself' => 'le operazioni non personali possono essere ignorate. ', + 'customer_name' => 'Gentile utente :name, ciao! ', + 'sinceramente' => 'sinceramente', + 'squadra' => 'squadra', + 'order_update_status' => 'Lo stato del tuo ordine :number è aggiornato', + 'welcome_register' => 'benvenuto alla registrazione', + 'register_end' => 'Completa la registrazione, fai clic sul pulsante in basso per tornare al centro commerciale. ', + 'btn_buy_now' => 'acquista ora', + 'retrieve_password_title' => 'recupera password', + 'retrieve_password_text' => 'Stai recuperando la tua password, fai clic sul pulsante in basso per completare l\'operazione. ', + 'retrieve_password_btn' => 'Fai clic qui per verificare l\'email', ]; diff --git a/resources/lang/it/order.php b/resources/lang/it/order.php index fd22b0ec..5200d1c5 100644 --- a/resources/lang/it/order.php +++ b/resources/lang/it/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'number' => 'numero d\'ordine', - 'customer_name' => 'Nome del cliente', - 'payment_method' => 'metodo di pagamento', - 'email' => 'Email', - 'telephone' => 'numero di contatto', - 'created_at' => 'tempo di creazione', - 'updated_at' => 'tempo di aggiornamento', - 'status' => 'stato', - 'status_format' => 'stato', - 'total' => 'ordine totale', - 'express_number' => 'numero ordine espresso', - 'express_company' => 'azienda espressa', - 'order_shipments' => 'informazioni sulla spedizione', + 'id' => 'ID', + 'number' => 'numero d\'ordine', + 'customer_name' => 'Nome del cliente', + 'payment_method' => 'metodo di pagamento', + 'email' => 'Email', + 'telephone' => 'numero di contatto', + 'created_at' => 'tempo di creazione', + 'updated_at' => 'tempo di aggiornamento', + 'status' => 'stato', + 'status_format' => 'stato', + 'total' => 'ordine totale', + 'express_number' => 'numero ordine espresso', + 'express_company' => 'azienda espressa', + 'order_shipments' => 'informazioni sulla spedizione', - 'address_info' => 'Informazioni sull\'indirizzo', - 'shipping_address' => 'indirizzo di consegna', - 'payment_address' => 'Indirizzo Di Fatturazione', - 'order_status' => 'Lo stato dell\'ordine', - 'current_status' => 'stato Osservazioni', - 'change_to_status' => 'Modifica stato', - 'comment' => 'Osservazioni', - 'submit_status' => 'aggiorna stato', + 'address_info' => 'Informazioni sull\'indirizzo', + 'shipping_address' => 'indirizzo di consegna', + 'payment_address' => 'Indirizzo Di Fatturazione', + 'order_status' => 'Lo stato dell\'ordine', + 'current_status' => 'stato Osservazioni', + 'change_to_status' => 'Modifica stato', + 'comment' => 'Osservazioni', + 'submit_status' => 'aggiorna stato', - 'product_info' => 'Informazioni sul prodotto', - 'product_name' => 'nome', - 'product_price' => 'prezzo', - 'product_sub_price' => 'totale parziale', - 'product_quantity' => 'quantità', - 'product_sku' => 'SKU', + 'product_info' => 'Informazioni sul prodotto', + 'product_name' => 'nome', + 'product_price' => 'prezzo', + 'product_sub_price' => 'totale parziale', + 'product_quantity' => 'quantità', + 'product_sku' => 'SKU', - 'action_history' => 'Registro delle operazioni', - 'history_status' => 'stato', - 'history_comment' => 'Nota', + 'action_history' => 'Registro delle operazioni', + 'history_status' => 'stato', + 'history_comment' => 'Nota', 'history_created_at' => 'Aggiornato', - 'unpaid' => 'Essere pagato', - 'paid' => 'Pagato', - 'shipped' => 'Spedito', - 'completed' => 'completato', - 'cancelled' => 'Annullato', + 'unpaid' => 'Essere pagato', + 'paid' => 'Pagato', + 'shipped' => 'Spedito', + 'completed' => 'completato', + 'cancelled' => 'Annullato', ]; diff --git a/resources/lang/it/page.php b/resources/lang/it/page.php index 49051aa6..9d74dd7e 100644 --- a/resources/lang/it/page.php +++ b/resources/lang/it/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => 'titolo', + 'title' => 'titolo', 'content' => 'contenuto', ]; diff --git a/resources/lang/it/product.php b/resources/lang/it/product.php index 94dd77bc..7ba789c3 100644 --- a/resources/lang/it/product.php +++ b/resources/lang/it/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => 'nome', - 'sku' => 'SKU', - 'price' => 'prezzo', - 'origin_price' => 'prezzo originale', - 'cost_price' => 'prezzo di costo', - 'brand' => 'marca', - 'category' => 'Classificazione', - 'model' => 'modello', - 'quantity' => 'disponibile', - 'image' => 'immagine', + 'name' => 'nome', + 'sku' => 'SKU', + 'price' => 'prezzo', + 'origin_price' => 'prezzo originale', + 'cost_price' => 'prezzo di costo', + 'brand' => 'marca', + 'category' => 'Classificazione', + 'model' => 'modello', + 'quantity' => 'disponibile', + 'image' => 'immagine', - 'active' => 'sul ripiano', - 'inactive' => 'prendere nota', + 'active' => 'sul ripiano', + 'inactive' => 'prendere nota', 'has_been_inactive' => 'Questo articolo è stato interrotto', ]; diff --git a/resources/lang/it/rma.php b/resources/lang/it/rma.php index 39289beb..348920ff 100644 --- a/resources/lang/it/rma.php +++ b/resources/lang/it/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => 'Ordine', + 'order_id' => 'Ordine', 'order_product_id' => 'articolo dell\'ordine', - 'customer_id' => 'cliente', - 'quantity' => 'quantità', - 'opened' => 'disimballato', - 'rma_reason_id' => 'un motivo per ritornare', - 'type' => 'Tipologia di servizio post vendita', + 'customer_id' => 'cliente', + 'quantity' => 'quantità', + 'opened' => 'disimballato', + 'rma_reason_id' => 'un motivo per ritornare', + 'type' => 'Tipologia di servizio post vendita', - 'status_pending' => 'Essere processato', - 'status_rejected' => 'respinto', - 'status_approved' => 'Approvato (da restituire a cura del cliente)', - 'status_shipped' => 'Spedito (articolo di ritorno)', + 'status_pending' => 'Essere processato', + 'status_rejected' => 'respinto', + 'status_approved' => 'Approvato (da restituire a cura del cliente)', + 'status_shipped' => 'Spedito (articolo di ritorno)', 'status_completed' => 'completato', - 'type_return' => 'restituire la merce', - 'type_exchange' => 'scambio', - 'type_repair' => 'riparazione', - 'type_reissue' => 'prodotto di ristampa', - 'type_refund' => 'Solo rimborso' + 'type_return' => 'restituire la merce', + 'type_exchange' => 'scambio', + 'type_repair' => 'riparazione', + 'type_reissue' => 'prodotto di ristampa', + 'type_refund' => 'Solo rimborso', ]; diff --git a/resources/lang/it/shop/account.php b/resources/lang/it/shop/account.php index deeff504..d73381d2 100644 --- a/resources/lang/it/shop/account.php +++ b/resources/lang/it/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'centro personale', - 'revise_info' => 'Modifica informazioni', - 'collect' => 'raccogliere', - 'coupon' => 'buono', - 'my_order' => '我Il mio ordine的订单', - 'orders' => 'tutti gli ordini', - 'pending_payment' => 'In attesa di Pagamento', - 'pending_send' => 'da consegnare', - 'pending_receipt' => 'in attesa di ricezione', - 'after_sales' => 'Dopo le vendite', - 'no_order' => 'Non hai ancora un ordine!', - 'to_buy' => 'Vai per effettuare un ordine', - 'order_number' => 'numero d\'ordine', - 'order_time' => 'tempo dell\'ordine', - 'state' => 'stato', - 'amount' => 'importo', - 'check_details' => 'controlla i dettagli', - 'all' => 'Totale', - 'items' => 'articoli', + 'index' => 'centro personale', + 'revise_info' => 'Modifica informazioni', + 'collect' => 'raccogliere', + 'coupon' => 'buono', + 'my_order' => '我Il mio ordine的订单', + 'orders' => 'tutti gli ordini', + 'pending_payment' => 'In attesa di Pagamento', + 'pending_send' => 'da consegnare', + 'pending_receipt' => 'in attesa di ricezione', + 'after_sales' => 'Dopo le vendite', + 'no_order' => 'Non hai ancora un ordine!', + 'to_buy' => 'Vai per effettuare un ordine', + 'order_number' => 'numero d\'ordine', + 'order_time' => 'tempo dell\'ordine', + 'state' => 'stato', + 'amount' => 'importo', + 'check_details' => 'controlla i dettagli', + 'all' => 'Totale', + 'items' => 'articoli', 'verify_code_expired' => 'Il tuo codice di verifica è scaduto (10 minuti), per favore recuperalo', - 'verify_code_error' => 'Il tuo codice di verifica è sbagliato', - 'account_not_exist' => 'l\'account non esiste', + 'verify_code_error' => 'Il tuo codice di verifica è sbagliato', + 'account_not_exist' => 'l\'account non esiste', - 'edit' => [ - 'index' => 'modifica informazioni personali', - 'modify_avatar' => 'modifica avatar', - 'suggest' => 'Carica immagine JPG o PNG. Si consiglia 300 x 300. x 300。', - 'name' => 'nome', - 'email' => 'cassetta postale', - 'crop' => 'ritaglia', + 'edit' => [ + 'index' => 'modifica informazioni personali', + 'modify_avatar' => 'modifica avatar', + 'suggest' => 'Carica immagine JPG o PNG. Si consiglia 300 x 300. x 300。', + 'name' => 'nome', + 'email' => 'cassetta postale', + 'crop' => 'ritaglia', 'password_edit_success' => 'Password modificata con successo', - 'origin_password_fail' => 'errore password originale', + 'origin_password_fail' => 'errore password originale', ], - 'wishlist' => [ - 'index' => 'I miei preferiti', - 'product' => 'prodotto', - 'price' => 'prezzo', + 'wishlist' => [ + 'index' => 'I miei preferiti', + 'product' => 'prodotto', + 'price' => 'prezzo', 'check_details' => 'controlla i dettagli', ], - 'order' => [ - 'index' => 'Il mio ordine', - 'completed' => 'ricevuta confermata', - 'cancelled' => 'Ordine annullato', + 'order' => [ + 'index' => 'Il mio ordine', + 'completed' => 'ricevuta confermata', + 'cancelled' => 'Ordine annullato', 'order_details' => 'dettagli dell\'ordine', - 'amount' => 'importo', - 'state' => 'stato', - 'order_number' => 'numero d\'ordine', - 'check' => 'verifica', + 'amount' => 'importo', + 'state' => 'stato', + 'order_number' => 'numero d\'ordine', + 'check' => 'verifica', - 'order_info' => [ - 'index' => 'dettagli dell\'ordine', - 'order_details' => 'dettagli dell\'ordine', - 'to_pay' => 'to_pay', - 'cancel' => 'Annulla ordine', - 'confirm_receipt' => 'conferma ricevuta', - 'order_number' => 'numero d\'ordine', - 'order_date' => 'data dell\'ordine', - 'state' => 'stato', - 'order_amount' => 'Ammontare dell\'ordine', - 'order_items' => 'ordinare gli articoli', + 'order_info' => [ + 'index' => 'dettagli dell\'ordine', + 'order_details' => 'dettagli dell\'ordine', + 'to_pay' => 'to_pay', + 'cancel' => 'Annulla ordine', + 'confirm_receipt' => 'conferma ricevuta', + 'order_number' => 'numero d\'ordine', + 'order_date' => 'data dell\'ordine', + 'state' => 'stato', + 'order_amount' => 'Ammontare dell\'ordine', + 'order_items' => 'ordinare gli articoli', 'apply_after_sales' => 'Richiedi il post-vendita', - 'order_total' => 'ordine totale', - 'logistics_status' => 'Stato logistico', - 'order_status' => 'Lo stato dell\'ordine', - 'remark' => 'Nota', - 'update_time' => 'tempo di aggiornamento', + 'order_total' => 'ordine totale', + 'logistics_status' => 'Stato logistico', + 'order_status' => 'Lo stato dell\'ordine', + 'remark' => 'Nota', + 'update_time' => 'tempo di aggiornamento', ], 'order_success' => [ - 'order_success' => 'Congratulazioni, l\'ordine è stato generato correttamente!', - 'order_number' => 'numero d\'ordine', - 'amounts_payable' => 'Importi da pagare ', - 'payment_method' => 'metodo di pagamento ', - 'view_order' => 'Visualizza i dettagli dell\'ordine ', - 'pay_now' => 'paga subito ', - 'kind_tips' => 'Promemoria: il tuo ordine è stato generato correttamente, completa il pagamento il prima possibile~ ', - 'also' => 'Puoi anche', - 'continue_purchase' => 'continuare ad acquistare', + 'order_success' => 'Congratulazioni, l\'ordine è stato generato correttamente!', + 'order_number' => 'numero d\'ordine', + 'amounts_payable' => 'Importi da pagare ', + 'payment_method' => 'metodo di pagamento ', + 'view_order' => 'Visualizza i dettagli dell\'ordine ', + 'pay_now' => 'paga subito ', + 'kind_tips' => 'Promemoria: il tuo ordine è stato generato correttamente, completa il pagamento il prima possibile~ ', + 'also' => 'Puoi anche', + 'continue_purchase' => 'continuare ad acquistare', 'contact_customer_service' => 'In caso di domande durante il processo di ordinazione, puoi contattare il nostro servizio clienti in qualsiasi momento', - 'emaill' => 'Posta', - 'service_hotline' => 'Linea diretta di servizio', + 'emaill' => 'Posta', + 'service_hotline' => 'Linea diretta di servizio', ], ], - 'addresses' => [ - 'index' => 'il mio indirizzo', - 'add_address' => 'Aggiungi un nuovo indirizzo', + 'addresses' => [ + 'index' => 'il mio indirizzo', + 'add_address' => 'Aggiungi un nuovo indirizzo', 'default_address' => 'Indirizzo predefinito', - 'delete' => 'Elimina', - 'edit' => 'modificare', - 'enter_name' => 'Per favore digita il tuo nome', - 'enter_phone' => 'Per favore digita il tuo numero di telefono', - 'enter_address' => 'Si prega di inserire l\'indirizzo dettagliato 1', + 'delete' => 'Elimina', + 'edit' => 'modificare', + 'enter_name' => 'Per favore digita il tuo nome', + 'enter_phone' => 'Per favore digita il tuo numero di telefono', + 'enter_address' => 'Si prega di inserire l\'indirizzo dettagliato 1', 'select_province' => 'Si prega di selezionare la provincia', - 'enter_city' => 'Si prega di compilare la città', - 'confirm_delete' => 'Sei sicuro di voler eliminare l\'indirizzo?', - 'hint' => 'suggerimento', - 'check_form' => 'Si prega di verificare che il modulo sia compilato correttamente', + 'enter_city' => 'Si prega di compilare la città', + 'confirm_delete' => 'Sei sicuro di voler eliminare l\'indirizzo?', + 'hint' => 'suggerimento', + 'check_form' => 'Si prega di verificare che il modulo sia compilato correttamente', ], - 'rma' => [ - 'index' => 'il mio post vendita', - 'commodity' => 'merce', - 'quantity' => 'quantità', - 'service_type' => 'Tipo di servizio', + 'rma' => [ + 'index' => 'il mio post vendita', + 'commodity' => 'merce', + 'quantity' => 'quantità', + 'service_type' => 'Tipo di servizio', 'return_reason' => 'un motivo per ritornare', 'creation_time' => 'tempo di creazione', - 'check' => 'Dai un\'occhiata', + 'check' => 'Dai un\'occhiata', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'Dettagli post vendita', ], - 'rma_form' => [ - 'index' => 'Invia informazioni post-vendita', - 'service_type' => 'Tipo di servizio', + 'rma_form' => [ + 'index' => 'Invia informazioni post-vendita', + 'service_type' => 'Tipo di servizio', 'return_quantity' => 'Quantità di reso', - 'unpacked' => 'disimballato', - 'return_reason' => 'un motivo per ritornare', - 'remark' => 'Nota', - ] - ] + 'unpacked' => 'disimballato', + 'return_reason' => 'un motivo per ritornare', + 'remark' => 'Nota', + ], + ], ]; diff --git a/resources/lang/it/shop/carts.php b/resources/lang/it/shop/carts.php index 62b42431..08a2c450 100644 --- a/resources/lang/it/shop/carts.php +++ b/resources/lang/it/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'carrello della spesa', - 'added_to_cart' => 'aggiunto al carrello', - 'select_all' => 'seleziona tutto', - 'commodity' => 'merce', - 'quantity' => 'quantità', - 'subtotal' => 'totale parziale', - 'product_total' => 'Totale del prodotto', - 'order_total' => 'importo totale da pagare', - 'shipping_fee' => 'trasporto', - 'all' => 'tutto', - 'selected' => 'selezionato', - 'to_checkout' => 'vai alla cassa', - 'cart_empty' => 'Il tuo carrello è vuoto', - 'go_buy' => 'Puoi andare a vedere cosa vuoi comprare', - 'go_shopping' => 'Andare a fare shopping', - 'must_select' => 'Si prega di selezionare almeno un prodotto', - 'mini' => 'Il tuo carrello', - 'delete' => 'Elimina', - 'check_cart' => 'controlla il carrello', + 'index' => 'carrello della spesa', + 'added_to_cart' => 'aggiunto al carrello', + 'select_all' => 'seleziona tutto', + 'commodity' => 'merce', + 'quantity' => 'quantità', + 'subtotal' => 'totale parziale', + 'product_total' => 'Totale del prodotto', + 'order_total' => 'importo totale da pagare', + 'shipping_fee' => 'trasporto', + 'all' => 'tutto', + 'selected' => 'selezionato', + 'to_checkout' => 'vai alla cassa', + 'cart_empty' => 'Il tuo carrello è vuoto', + 'go_buy' => 'Puoi andare a vedere cosa vuoi comprare', + 'go_shopping' => 'Andare a fare shopping', + 'must_select' => 'Si prega di selezionare almeno un prodotto', + 'mini' => 'Il tuo carrello', + 'delete' => 'Elimina', + 'check_cart' => 'controlla il carrello', - 'invalid_customer' => 'Cliente carrello non valido', - 'empty_selected_products' => 'L\'articolo selezionato nel carrello è vuoto', + 'invalid_customer' => 'Cliente carrello non valido', + 'empty_selected_products' => 'L\'articolo selezionato nel carrello è vuoto', 'invalid_shipping_address' => 'Indirizzo di spedizione non valido', - 'invalid_payment_address' => 'Indirizzo di fatturazione non valido', - 'invalid_shipping_method' => 'Metodo di spedizione non disponibile', - 'invalid_payment_method' => 'Metodo di pagamento non disponibile', + 'invalid_payment_address' => 'Indirizzo di fatturazione non valido', + 'invalid_shipping_method' => 'Metodo di spedizione non disponibile', + 'invalid_payment_method' => 'Metodo di pagamento non disponibile', ]; diff --git a/resources/lang/it/shop/checkout.php b/resources/lang/it/shop/checkout.php index f676f683..28621dd4 100644 --- a/resources/lang/it/shop/checkout.php +++ b/resources/lang/it/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'checkout', - 'address' => 'indirizzo di consegna', - 'payment_address' => 'indirizzo di fatturazione', + 'index' => 'checkout', + 'address' => 'indirizzo di consegna', + 'payment_address' => 'indirizzo di fatturazione', 'same_as_shipping_address' => 'L\'indirizzo di fatturazione è lo stesso dell\'indirizzo di spedizione', - 'chosen' => 'selezionato', - 'edit' => 'modifica', - 'choose_another_address' => 'Scegli un altro indirizzo', - 'add_new_address' => 'Aggiungi un nuovo indirizzo', - 'payment_method' => 'metodo di pagamento', - 'delivery_method' => 'metodo di consegna', - 'cart_totals' => 'numero totale di carrelli della spesa', - 'submit_order' => 'Invia ordine', - 'enter_name' => 'Inserisci il tuo nome', - 'enter_phone' => 'Inserisci il numero di telefono', - 'enter_address' => 'Inserisci l\'indirizzo dettagliato 1', - 'select_province' => 'Seleziona una provincia', - 'enter_city' => 'Compila la città', - 'check_form' => 'Verifica se il modulo è compilato correttamente', - 'error_payment_address' => 'Seleziona l\'indirizzo di fatturazione', + 'chosen' => 'selezionato', + 'edit' => 'modifica', + 'choose_another_address' => 'Scegli un altro indirizzo', + 'add_new_address' => 'Aggiungi un nuovo indirizzo', + 'payment_method' => 'metodo di pagamento', + 'delivery_method' => 'metodo di consegna', + 'cart_totals' => 'numero totale di carrelli della spesa', + 'submit_order' => 'Invia ordine', + 'enter_name' => 'Inserisci il tuo nome', + 'enter_phone' => 'Inserisci il numero di telefono', + 'enter_address' => 'Inserisci l\'indirizzo dettagliato 1', + 'select_province' => 'Seleziona una provincia', + 'enter_city' => 'Compila la città', + 'check_form' => 'Verifica se il modulo è compilato correttamente', + 'error_payment_address' => 'Seleziona l\'indirizzo di fatturazione', - 'payment' => [ - 'index' => 'per favore paga', - 'please_pay' => 'Ordine inviato con successo, si prega di pagare', - 'order_number' => 'numero d\'ordine', + 'payment' => [ + 'index' => 'per favore paga', + 'please_pay' => 'Ordine inviato con successo, si prega di pagare', + 'order_number' => 'numero d\'ordine', 'amounts_payable' => 'Importi da pagare', - 'payment_method' => 'metodo di pagamento', - ] + 'payment_method' => 'metodo di pagamento', + ], ]; diff --git a/resources/lang/it/shop/common.php b/resources/lang/it/shop/common.php index 2b8f2e53..fff239a8 100644 --- a/resources/lang/it/shop/common.php +++ b/resources/lang/it/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => 'casa', - 'submit' => 'Invia', - 'cancel' => 'Annulla', + 'home' => 'casa', + 'submit' => 'Invia', + 'cancel' => 'Annulla', 'confirm' => 'conferma', - 'no' => 'No', - 'yes' => 'Yes', + 'no' => 'No', + 'yes' => 'Yes', ]; diff --git a/resources/lang/it/shop/currency.php b/resources/lang/it/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/it/shop/currency.php +++ b/resources/lang/it/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/it/shop/forgotten.php b/resources/lang/it/shop/forgotten.php index a641218f..7fd65c2f 100644 --- a/resources/lang/it/shop/forgotten.php +++ b/resources/lang/it/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'password dimenticata', - 'follow_prompt' => 'Segui le istruzioni per recuperare la tua password', - 'email_forCode' => 'Inserisci il tuo indirizzo email per ottenere il codice di verifica', - 'enter_password' => 'Inserisci una nuova password', - 'email' => 'cassetta postale', - 'email_address' => 'indirizzo e-mail', - 'verification_code' => 'Codice di verifica', - 'password' => 'password', - 'confirm_password' => 'conferma password', - 'send_code' => 'Invia codice di verifica', - 'to_back' => 'Torna al passaggio precedente', - 'enter_password' => 'Inserisci la tua password', - 'enter_email' => 'Inserisci la tua email', - 'please_confirm' => 'Per favore conferma la password', - 'password_err' => 'Le password inserite due volte non sono coerenti!!', - 'email_err' => 'Inserisci l\'indirizzo email corretto!', - 'enter_code' => 'Inserisci il codice di verifica', + 'index' => 'password dimenticata', + 'follow_prompt' => 'Segui le istruzioni per recuperare la tua password', + 'email_forCode' => 'Inserisci il tuo indirizzo email per ottenere il codice di verifica', + 'enter_password' => 'Inserisci una nuova password', + 'email' => 'cassetta postale', + 'email_address' => 'indirizzo e-mail', + 'verification_code' => 'Codice di verifica', + 'password' => 'password', + 'confirm_password' => 'conferma password', + 'send_code' => 'Invia codice di verifica', + 'to_back' => 'Torna al passaggio precedente', + 'enter_password' => 'Inserisci la tua password', + 'enter_email' => 'Inserisci la tua email', + 'please_confirm' => 'Per favore conferma la password', + 'password_err' => 'Le password inserite due volte non sono coerenti!!', + 'email_err' => 'Inserisci l\'indirizzo email corretto!', + 'enter_code' => 'Inserisci il codice di verifica', 'verification_code_sent' => 'Il codice di verifica è stato inviato, controlla e inserisci il codice di verifica', - 'password_updated' => 'la password è stata modificata', + 'password_updated' => 'la password è stata modificata', ]; diff --git a/resources/lang/it/shop/login.php b/resources/lang/it/shop/login.php index 01e6d7a7..2f662c23 100644 --- a/resources/lang/it/shop/login.php +++ b/resources/lang/it/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'Accesso utente e registrazione', - 'login_and_sign' => 'login/registrati', - 'home' => 'casa', - 'library' => 'centro personale', - 'login' => 'login', - 'already' => 'Già nostro cliente?', - 'description' => 'Già nostro cliente?', - 'email' => 'E-mail', - 'email_address' => 'indirizzo e-mail', - 'password' => 'password', - 'forget_password' => 'password dimenticata', - 'new' => 'nuovo account', - 'not_already' => 'Non sei ancora nostro cliente registrato?', - 'confirm_password' => 'conferma password', - 'register' => 'registrarsi', - 'enter_password' => 'Inserisci la tua password', - 'enter_email' => 'Inserisci la tua email', - 'please_confirm' => 'Per favore conferma la password', - 'password_err' => 'Le password inserite due volte non sono coerenti!!', - 'email_err' => 'Inserisci l\'indirizzo email corretto!!', - 'check_form' => 'Verifica se il modulo è compilato correttamente', + 'index' => 'Accesso utente e registrazione', + 'login_and_sign' => 'login/registrati', + 'home' => 'casa', + 'library' => 'centro personale', + 'login' => 'login', + 'already' => 'Già nostro cliente?', + 'description' => 'Già nostro cliente?', + 'email' => 'E-mail', + 'email_address' => 'indirizzo e-mail', + 'password' => 'password', + 'forget_password' => 'password dimenticata', + 'new' => 'nuovo account', + 'not_already' => 'Non sei ancora nostro cliente registrato?', + 'confirm_password' => 'conferma password', + 'register' => 'registrarsi', + 'enter_password' => 'Inserisci la tua password', + 'enter_email' => 'Inserisci la tua email', + 'please_confirm' => 'Per favore conferma la password', + 'password_err' => 'Le password inserite due volte non sono coerenti!!', + 'email_err' => 'Inserisci l\'indirizzo email corretto!!', + 'check_form' => 'Verifica se il modulo è compilato correttamente', 'email_or_password_error' => 'Email o password di errore!!', - 'customer_inactive' => 'l\'utente è stato disabilitato', - 'login_successfully' => 'login con successo', - 'register_success' => 'registrato con successo', - 'third_party_logins' => 'Vale la pena citare', + 'customer_inactive' => 'l\'utente è stato disabilitato', + 'login_successfully' => 'login con successo', + 'register_success' => 'registrato con successo', + 'third_party_logins' => 'Vale la pena citare', ]; diff --git a/resources/lang/it/shop/order.php b/resources/lang/it/shop/order.php index 87095083..f28e7c77 100644 --- a/resources/lang/it/shop/order.php +++ b/resources/lang/it/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => 'ordine non valido', - 'confirm_order' => 'L\'utente conferma la ricezione', - 'cancel_order' => 'L\'utente annulla l\'ordine', + 'invalid_order' => 'ordine non valido', + 'confirm_order' => 'L\'utente conferma la ricezione', + 'cancel_order' => 'L\'utente annulla l\'ordine', 'order_already_paid' => 'Ordine pagato', ]; diff --git a/resources/lang/it/shop/products.php b/resources/lang/it/shop/products.php index fdb38883..3cad080e 100644 --- a/resources/lang/it/shop/products.php +++ b/resources/lang/it/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => 'cerca', + 'search' => 'cerca', 'add_to_favorites' => 'Aggiungi ai preferiti', - 'add_to_cart' => 'Aggiungi al carrello', - 'buy_now' => 'Compra ora', - 'product_details' => 'Dettagli prodotto', - 'in_stock' => 'in stock', - 'out_stock' => 'esaurito', - 'model' => 'modello', + 'add_to_cart' => 'Aggiungi al carrello', + 'buy_now' => 'Compra ora', + 'product_details' => 'Dettagli prodotto', + 'in_stock' => 'in stock', + 'out_stock' => 'esaurito', + 'model' => 'modello', ]; diff --git a/resources/lang/it/shop/steps.php b/resources/lang/it/shop/steps.php index 01386224..97d9d4c6 100644 --- a/resources/lang/it/shop/steps.php +++ b/resources/lang/it/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'passo', - 'cart' => 'carrello della spesa', - 'checkout' => 'checkout', + 'index' => 'passo', + 'cart' => 'carrello della spesa', + 'checkout' => 'checkout', 'submitted_successfully' => 'inviato con successo', - 'payment' => 'pagamento', + 'payment' => 'pagamento', ]; diff --git a/resources/lang/it/shop/wishlist.php b/resources/lang/it/shop/wishlist.php index ffb46b84..404ad95c 100644 --- a/resources/lang/it/shop/wishlist.php +++ b/resources/lang/it/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'Aggiungi alla collezione con successo', + 'add_wishlist_success' => 'Aggiungi alla collezione con successo', 'remove_wishlist_success' => 'Rimuovere la raccolta con successo', ]; diff --git a/resources/lang/ja/address.php b/resources/lang/ja/address.php index 75cd2d34..415ba0db 100644 --- a/resources/lang/ja/address.php +++ b/resources/lang/ja/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => '住所を編集', - 'name' => '名前', - 'phone' => '電話番号', + 'index' => '住所を編集', + 'name' => '名前', + 'phone' => '電話番号', 'country_id' => '国 ID', - 'zone' => '州', - 'zone_id' => '州ID', - 'address_1' => '住所（1', - 'address_2' => 'アドレス2', - 'address' => '住所', + 'zone' => '州', + 'zone_id' => '州ID', + 'address_1' => '住所（1', + 'address_2' => 'アドレス2', + 'address' => '住所', 'enter_city' => '住所を入力', - 'post_code' => '郵便番号', - 'default' => 'デフォルトの住所', + 'post_code' => '郵便番号', + 'default' => 'デフォルトの住所', ]; diff --git a/resources/lang/ja/admin/admin_roles.php b/resources/lang/ja/admin/admin_roles.php index d63c890c..f944b7df 100644 --- a/resources/lang/ja/admin/admin_roles.php +++ b/resources/lang/ja/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => 'すべて選択', - 'unselect_all' => 'unselect', - 'role_name' => '役割名', + 'select_all' => 'すべて選択', + 'unselect_all' => 'unselect', + 'role_name' => '役割名', 'role_management' => '役割管理', - 'permission' => '許可', - 'error_roles' => '少なくとも 1 つのロールを選択してください', + 'permission' => '許可', + 'error_roles' => '少なくとも 1 つのロールを選択してください', ]; diff --git a/resources/lang/ja/admin/attribute.php b/resources/lang/ja/admin/attribute.php index fac21f02..db2f47a2 100644 --- a/resources/lang/ja/admin/attribute.php +++ b/resources/lang/ja/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => '属性', - 'attribute_info' => '属性情報', - 'create_at' => '属性を作成', - 'attribute_value' => '属性値', - 'set_attribute' => '構成属性', - 'add_attribute' => '属性値を追加', + 'index' => '属性', + 'attribute_info' => '属性情報', + 'create_at' => '属性を作成', + 'attribute_value' => '属性値', + 'set_attribute' => '構成属性', + 'add_attribute' => '属性値を追加', 'before_attribute' => '最初に左の属性を選択してください', - 'btn_at' => '今すぐ行く', - 'btn_later' => '後で', - 'to_info_values' => '詳細ページに移動して属性値を編集してください', + 'btn_at' => '今すぐ行く', + 'btn_later' => '後で', + 'to_info_values' => '詳細ページに移動して属性値を編集してください', ]; diff --git a/resources/lang/ja/admin/attribute_groups.php b/resources/lang/ja/admin/attribute_groups.php index 9240c953..d22feb4b 100644 --- a/resources/lang/ja/admin/attribute_groups.php +++ b/resources/lang/ja/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => '属性グループ', + 'index' => '属性グループ', 'create_at_groups' => '属性グループの作成', ]; diff --git a/resources/lang/ja/admin/brand.php b/resources/lang/ja/admin/brand.php index dd96987f..ffbfe20b 100644 --- a/resources/lang/ja/admin/brand.php +++ b/resources/lang/ja/admin/brand.php @@ -9,14 +9,13 @@ * @modified 2022-08-02 14:22:41 */ - return [ - 'index' => 'ブランド', + 'index' => 'ブランド', - 'brands_index' => 'ブランド一覧', + 'brands_index' => 'ブランド一覧', 'brands_create' => 'ブランドを作成', - 'brands_show' => 'ブランドの詳細', + 'brands_show' => 'ブランドの詳細', 'brands_update' => 'ブランドの更新', 'brands_delete' => 'ブランドを削除', - 'error_upload' => 'アイコンをアップロードしてください', + 'error_upload' => 'アイコンをアップロードしてください', ]; diff --git a/resources/lang/ja/admin/builder.php b/resources/lang/ja/admin/builder.php index 2a707420..a5dd1fad 100644 --- a/resources/lang/ja/admin/builder.php +++ b/resources/lang/ja/admin/builder.php @@ -11,242 +11,242 @@ */ return [ - 'heading_title' => 'ページ編集', - 'modules_instructions' => '利用可能なモジュール、クリックしてページに追加', - 'text_floor_prompt' => '設定 (ページを更新するには、フロア構成を保存して更新する必要があります)', - 'text_new_page' => '新しいページを追加', - 'text_quit' => '終了', - 'text_save' => '保存', - 'text_view_page' => 'ページを表示', - 'text_module' => 'モジュール', - 'text_module_title' => 'モジュールのタイトル', - 'text_menu' => 'ナビゲーション', - 'text_drag_sort' => 'ドラッグソート', - 'text_set_up' => 'セットアップ', - 'text_delete' => '削除', - 'text_floor' => '床', - 'text_add_module' => 'モジュールを追加', - 'text_to_menu' => 'ナビゲーション メニューの編集', - 'text_other' => 'その他', - 'text_preparing' => '準備中...', - 'text_floor_setting' => 'フロア設定', - 'text_background_color' => '背景色', - 'text_sure' => 'OK', - 'text_page_name' => '新しいページ名を入力してください', - 'text_is_save' => '現在のページ データが保存されていることを確認してください! ', - 'text_pop_ads' => 'ポップアップ広告', - 'text_style_setting' => 'スタイル設定', - 'text_is_save_data' => 'ページを切り替える前に、現在のページ データが保存されていることを確認しますか? ', - 'text_hint' => 'ヒント', - 'text_cancel' => 'キャンセル', - 'text_created_success' => 'ページが正常に作成されました', - 'text_html_none' => 'モジュール読み込みエラー、HTML データが空です! ', - 'text_is_delete' => '削除してもいい', - 'text_enable' => 'enable', - 'text_set_title' => '設定タイトル', - 'text_set_subtitle' => '字幕を設定', - 'text_suggested_size' => '推奨サイズ (幅 x 高さ): ', - 'text_word' => 'テキスト', - 'text_add_pictures' => '画像を追加', - 'text_refresh_cookie' => 'クッキーをリフレッシュ', - 'text_popup_hint' => '注: ユーザーがクリックして閉じる操作は、ブラウザを閉じて再度開くまで表示されません。ローカル テストでは、[Cookie を更新] をクリックしてからブラウザを更新すると、ポップアップ ウィンドウが再びアクティブになります。 ', - 'text_cookie_refresh_success' => 'Cookie が正常に更新されました。ブラウザを更新して、ポップアップ ウィンドウの内容を確認してください。 ', - 'text_add_hot_links' => 'ホット検索リンクを追加', - 'text_add' => '追加', - 'text_margin_top' => 'モジュールパディング - 上', - 'text_margin_bottom' => 'モジュールのパディング - 下', - 'text_file_manager' => 'ファイルマネージャ', - 'modules_link' => 'リンク', - 'modules_choose_link' => 'リンクを選択', - 'text_select_link' => 'ジャンプ先のリンクページを選択してください', - 'text_no' => 'いいえ', - 'text_search' => '検索', - 'text_is_newpage' => '新しいウィンドウを開くかどうか:', - 'text_manage' => '管理', - 'text_title_cover' => 'タイトル (以下で選択したリンク名をカバー)', - 'text_enter_link' => 'リンクアドレスを入力してください', - 'text_states' => 'state', - 'text_disable' => '無効にする', - 'text_no_data' => 'データが存在しないか、削除されています', - 'text_to_add' => '追加する', - 'text_category' => 'カテゴリ', - 'text_information' => '情報ページ', - 'text_manufacturer' => 'ブランド', - 'text_static' => '固定接続', - 'text_custom' => 'カスタム', - 'text_top_text' => 'トップテキスト', - 'text_edit_page_name' => 'ページ名を変更', - 'text_page_name_no' => '名前を空にすることはできません', - 'custom_name' => 'カスタム名', + 'heading_title' => 'ページ編集', + 'modules_instructions' => '利用可能なモジュール、クリックしてページに追加', + 'text_floor_prompt' => '設定 (ページを更新するには、フロア構成を保存して更新する必要があります)', + 'text_new_page' => '新しいページを追加', + 'text_quit' => '終了', + 'text_save' => '保存', + 'text_view_page' => 'ページを表示', + 'text_module' => 'モジュール', + 'text_module_title' => 'モジュールのタイトル', + 'text_menu' => 'ナビゲーション', + 'text_drag_sort' => 'ドラッグソート', + 'text_set_up' => 'セットアップ', + 'text_delete' => '削除', + 'text_floor' => '床', + 'text_add_module' => 'モジュールを追加', + 'text_to_menu' => 'ナビゲーション メニューの編集', + 'text_other' => 'その他', + 'text_preparing' => '準備中...', + 'text_floor_setting' => 'フロア設定', + 'text_background_color' => '背景色', + 'text_sure' => 'OK', + 'text_page_name' => '新しいページ名を入力してください', + 'text_is_save' => '現在のページ データが保存されていることを確認してください! ', + 'text_pop_ads' => 'ポップアップ広告', + 'text_style_setting' => 'スタイル設定', + 'text_is_save_data' => 'ページを切り替える前に、現在のページ データが保存されていることを確認しますか? ', + 'text_hint' => 'ヒント', + 'text_cancel' => 'キャンセル', + 'text_created_success' => 'ページが正常に作成されました', + 'text_html_none' => 'モジュール読み込みエラー、HTML データが空です! ', + 'text_is_delete' => '削除してもいい', + 'text_enable' => 'enable', + 'text_set_title' => '設定タイトル', + 'text_set_subtitle' => '字幕を設定', + 'text_suggested_size' => '推奨サイズ (幅 x 高さ): ', + 'text_word' => 'テキスト', + 'text_add_pictures' => '画像を追加', + 'text_refresh_cookie' => 'クッキーをリフレッシュ', + 'text_popup_hint' => '注: ユーザーがクリックして閉じる操作は、ブラウザを閉じて再度開くまで表示されません。ローカル テストでは、[Cookie を更新] をクリックしてからブラウザを更新すると、ポップアップ ウィンドウが再びアクティブになります。 ', + 'text_cookie_refresh_success' => 'Cookie が正常に更新されました。ブラウザを更新して、ポップアップ ウィンドウの内容を確認してください。 ', + 'text_add_hot_links' => 'ホット検索リンクを追加', + 'text_add' => '追加', + 'text_margin_top' => 'モジュールパディング - 上', + 'text_margin_bottom' => 'モジュールのパディング - 下', + 'text_file_manager' => 'ファイルマネージャ', + 'modules_link' => 'リンク', + 'modules_choose_link' => 'リンクを選択', + 'text_select_link' => 'ジャンプ先のリンクページを選択してください', + 'text_no' => 'いいえ', + 'text_search' => '検索', + 'text_is_newpage' => '新しいウィンドウを開くかどうか:', + 'text_manage' => '管理', + 'text_title_cover' => 'タイトル (以下で選択したリンク名をカバー)', + 'text_enter_link' => 'リンクアドレスを入力してください', + 'text_states' => 'state', + 'text_disable' => '無効にする', + 'text_no_data' => 'データが存在しないか、削除されています', + 'text_to_add' => '追加する', + 'text_category' => 'カテゴリ', + 'text_information' => '情報ページ', + 'text_manufacturer' => 'ブランド', + 'text_static' => '固定接続', + 'text_custom' => 'カスタム', + 'text_top_text' => 'トップテキスト', + 'text_edit_page_name' => 'ページ名を変更', + 'text_page_name_no' => '名前を空にすることはできません', + 'custom_name' => 'カスタム名', // 固定连接 - 'text_static_product_latest' => '最新の製品', - 'text_static_product_special' => '特産品', + 'text_static_product_latest' => '最新の製品', + 'text_static_product_special' => '特産品', 'text_static_product_manufacturer' => 'ブランドエリア', - 'text_static_account_account' => '会員センター', - 'text_static_account_order' => '歴史的順序', - 'text_static_account_wishlist' => 'お気に入りリスト', - 'text_static_affiliate_login' => 'アフィリエイト メンバー', - 'text_static_account_newsletter' => '相談を申し込む', - 'text_static_information_contact' => 'お問い合わせ', - 'text_static_information_sitemap' => 'サイトマップ', - 'text_static_information_faq' => 'よくある質問', - 'text_static_account_voucher' => 'ギフト券', - 'text_static_account_login' => 'ログイン', - 'text_static_account_register' => '登録', - 'text_static_checkout_cart' => 'ショッピングカート', - 'text_static_blog_home' => 'ブログ', + 'text_static_account_account' => '会員センター', + 'text_static_account_order' => '歴史的順序', + 'text_static_account_wishlist' => 'お気に入りリスト', + 'text_static_affiliate_login' => 'アフィリエイト メンバー', + 'text_static_account_newsletter' => '相談を申し込む', + 'text_static_information_contact' => 'お問い合わせ', + 'text_static_information_sitemap' => 'サイトマップ', + 'text_static_information_faq' => 'よくある質問', + 'text_static_account_voucher' => 'ギフト券', + 'text_static_account_login' => 'ログイン', + 'text_static_account_register' => '登録', + 'text_static_checkout_cart' => 'ショッピングカート', + 'text_static_blog_home' => 'ブログ', - 'text_edit_product' => '商品の詳細を編集', - 'text_edit_home' => 'ホーム編集', - 'text_edit_mb_home' => 'モバイルホームページの編集', - 'text_footer_edit' => 'フッターを編集', - 'text_header_edit' => 'ヘッダーを編集', - 'text_save_refresh' => '保存して更新', - 'text_save_refresh_header' => '保存 (ヘッダーを更新)', - 'text_service_icon' => 'サービス アイコン', - 'text_describe' => '説明', - 'text_add_link' => 'リンクを追加', - 'text_is_btn' => 'ボタンを表示するかどうか', - 'text_phone' => '電話', - 'text_address' => 'アドレス', - 'text_email' => 'メールボックス', - 'text_copyright' => '著作権/画像', - 'text_yq_link' => '友情リンク', - 'text_link_bar' => 'リンクバー', - 'text_introduce' => '紹介', - 'text_up_logo' => 'ロゴをアップロード', - 'text_hot_keywords' => 'ホット検索キーワード', - 'text_title' => 'タイトル', - 'text_text_notific' => 'テキスト通知', - 'text_only_home' => 'ホームページにのみ表示', - 'text_background_color' => '背景色', - 'text_font_color' => 'フォントの色', - 'text_image' => '画像', - 'text_show' => '表示', - 'text_is_phone' => '連絡先の電話番号を表示', - 'text_half_angle' => '半角カンマで区切る', - 'text_prompt_words' => 'プロンプトテキスト', - 'text_search_bar' => '検索バー', - 'text_btn_text' => 'ボタンテキスト', - 'text_banner_ad' => 'バナー広告', - 'text_l_c' => '言語/通貨列', - 'text_top_color' => '上部の色', - 'text_title_color' => 'タイトルの色', - 'text_color' => 'color', - 'text_left_text' => '左のテキスト', - 'text_right_icon' => '正しい支払いアイコン', - 'text_bgi' => '背景画像', - 'text_btn' => 'ボタン', + 'text_edit_product' => '商品の詳細を編集', + 'text_edit_home' => 'ホーム編集', + 'text_edit_mb_home' => 'モバイルホームページの編集', + 'text_footer_edit' => 'フッターを編集', + 'text_header_edit' => 'ヘッダーを編集', + 'text_save_refresh' => '保存して更新', + 'text_save_refresh_header' => '保存 (ヘッダーを更新)', + 'text_service_icon' => 'サービス アイコン', + 'text_describe' => '説明', + 'text_add_link' => 'リンクを追加', + 'text_is_btn' => 'ボタンを表示するかどうか', + 'text_phone' => '電話', + 'text_address' => 'アドレス', + 'text_email' => 'メールボックス', + 'text_copyright' => '著作権/画像', + 'text_yq_link' => '友情リンク', + 'text_link_bar' => 'リンクバー', + 'text_introduce' => '紹介', + 'text_up_logo' => 'ロゴをアップロード', + 'text_hot_keywords' => 'ホット検索キーワード', + 'text_title' => 'タイトル', + 'text_text_notific' => 'テキスト通知', + 'text_only_home' => 'ホームページにのみ表示', + 'text_background_color' => '背景色', + 'text_font_color' => 'フォントの色', + 'text_image' => '画像', + 'text_show' => '表示', + 'text_is_phone' => '連絡先の電話番号を表示', + 'text_half_angle' => '半角カンマで区切る', + 'text_prompt_words' => 'プロンプトテキスト', + 'text_search_bar' => '検索バー', + 'text_btn_text' => 'ボタンテキスト', + 'text_banner_ad' => 'バナー広告', + 'text_l_c' => '言語/通貨列', + 'text_top_color' => '上部の色', + 'text_title_color' => 'タイトルの色', + 'text_color' => 'color', + 'text_left_text' => '左のテキスト', + 'text_right_icon' => '正しい支払いアイコン', + 'text_bgi' => '背景画像', + 'text_btn' => 'ボタン', // page - 'page_product_title_size' => '商品タイトルのフォントサイズ', - 'page_product_title_color' => '商品タイトルの色', - 'page_product_price_color' => '商品価格の色', - 'page_product_thumb_position' => 'サムネイルの位置', - 'page_product_image' => '商品画像', - 'page_product_bottom' => '底', - 'page_product_left' => '左側', - 'page_product_magnifying_style' => '虫眼鏡スタイル', - 'page_product_magnifying_window' => '外部ウィンドウ', - 'page_product_magnifying_inner' => '内部停止', - 'page_product_magnifying_lens' => '内部拡大鏡', - 'page_product_share' => '共有', - 'page_product_share_code' => '共有コード', - 'page_product_general_settings' => '一般設定', - 'page_product_font_size' => 'フォントサイズ', + 'page_product_title_size' => '商品タイトルのフォントサイズ', + 'page_product_title_color' => '商品タイトルの色', + 'page_product_price_color' => '商品価格の色', + 'page_product_thumb_position' => 'サムネイルの位置', + 'page_product_image' => '商品画像', + 'page_product_bottom' => '底', + 'page_product_left' => '左側', + 'page_product_magnifying_style' => '虫眼鏡スタイル', + 'page_product_magnifying_window' => '外部ウィンドウ', + 'page_product_magnifying_inner' => '内部停止', + 'page_product_magnifying_lens' => '内部拡大鏡', + 'page_product_share' => '共有', + 'page_product_share_code' => '共有コード', + 'page_product_general_settings' => '一般設定', + 'page_product_font_size' => 'フォントサイズ', // ModuleS List - 'modules_photo_text' => '画像とテキストの組み合わせ', - 'modules_video_module' => 'ビデオ モジュール', - 'modules_customer_reviews' => 'カスタマーレビュー', - 'modules_images_link' => '複数画像リンク', - 'modules_background_icon_text' => '背景アイコン テキスト', - 'modules_slideshow_category' => 'スライドショー カテゴリ', - 'modules_bargain' => 'バーゲン', - 'modules_bestseller' => 'ベストセラー', - 'modules_blog' => 'ブログ', - 'modules_carousel' => 'スイングボーアイコン', - 'modules_category' => 'カテゴリモジュール', - 'modules_coupon' => 'クーポン', - 'modules_flash_sale' => '商品スパイク', - 'modules_group_buying' => '購入グループ', - 'modules_html' => 'リッチテキスト', - 'modules_icon_text' => 'アイコンテキスト', - 'modules_image_100' => '単一画像モジュール', - 'modules_image_200' => '1 行 2 つの画像', - 'modules_image_300' => '1 行 3 つの画像', - 'modules_image_301' => '1 行 3 つの画像 - プロ', - 'modules_image_400' => '1 行 4 つの画像', - 'modules_image_401' => '1 行 4 つの画像 - プロ', - 'modules_latest' => '最新の製品', - 'modules_manufacturer' => 'ブランド リスト', - 'modules_product' => '製品', - 'modules_product_tab' => 'タブ製品', - 'modules_slideshow' => 'slideshow', - 'modules_quantity' => '表示数量制限', - 'modules_manage_bargain' => '交渉商品の管理', - 'modules_manage_blog' => '管理ブログ', - 'modules_no_blog' => '記事はありません。[コンテンツ管理 -> ブログ管理] に移動して記事を設定してください。 ', - 'modules_slides_per_view' => '1画面表示数', - 'modules_enter_content' => 'コンテンツを入力してください', - 'modules_full_screen' => 'フルスクリーンかどうか', - 'modules_content' => 'コンテンツ', - 'modules_edit_content' => 'コンテンツの編集', - 'modules_select_image' => '画像を選択', - 'modules_quantity_line' => '1行で複数表示', - 'modules_please_choose' => '選択してください', - 'modules_choose' => '選択', - 'modules_add_category' => 'カテゴリを追加', - 'modules_choose_category' => 'カテゴリを選択', - 'modules_set_coupon' => 'クーポン設定', - 'modules_no_coupon' => 'クーポンデータなし', - 'modules_manage_flash' => 'スパイク製品の管理', - 'modules_manage_group' => 'グループ製品の管理', - 'modules_no_state' => '現在のモジュールは有効になっていないか、構成されていません。このモジュールを構成するには、バックグラウンド [モジュール管理] に移動してください。 ', - 'modules_grid_mode' => 'グリッドモード', - 'modules_more_link' => 'その他のリンク', - 'modules_choose_brand' => 'ブランドを選択', - 'modules_set_product' => '製品の設定', - 'modules_keywords_search' => 'キーワード検索を入力してください', - 'modules_test_name' => 'テスト名', - 'modules_please_products' => '製品を追加してください', - 'modules_image_size' => '画像サイズ', - 'modules_height' => '高い', - 'modules_width' => '幅', - 'modules_category_style' => 'カテゴリ表示スタイル', - 'modules_down' => '以下', - 'modules_left' => '左', - 'modules_category_no' => '分類しない', - 'modules_review_name' => '名前', - 'modules_profession' => 'プロフェッショナル', - 'modules_video_cover' => 'ビデオ カバー', - 'modules_video' => 'ビデオ', + 'modules_photo_text' => '画像とテキストの組み合わせ', + 'modules_video_module' => 'ビデオ モジュール', + 'modules_customer_reviews' => 'カスタマーレビュー', + 'modules_images_link' => '複数画像リンク', + 'modules_background_icon_text' => '背景アイコン テキスト', + 'modules_slideshow_category' => 'スライドショー カテゴリ', + 'modules_bargain' => 'バーゲン', + 'modules_bestseller' => 'ベストセラー', + 'modules_blog' => 'ブログ', + 'modules_carousel' => 'スイングボーアイコン', + 'modules_category' => 'カテゴリモジュール', + 'modules_coupon' => 'クーポン', + 'modules_flash_sale' => '商品スパイク', + 'modules_group_buying' => '購入グループ', + 'modules_html' => 'リッチテキスト', + 'modules_icon_text' => 'アイコンテキスト', + 'modules_image_100' => '単一画像モジュール', + 'modules_image_200' => '1 行 2 つの画像', + 'modules_image_300' => '1 行 3 つの画像', + 'modules_image_301' => '1 行 3 つの画像 - プロ', + 'modules_image_400' => '1 行 4 つの画像', + 'modules_image_401' => '1 行 4 つの画像 - プロ', + 'modules_latest' => '最新の製品', + 'modules_manufacturer' => 'ブランド リスト', + 'modules_product' => '製品', + 'modules_product_tab' => 'タブ製品', + 'modules_slideshow' => 'slideshow', + 'modules_quantity' => '表示数量制限', + 'modules_manage_bargain' => '交渉商品の管理', + 'modules_manage_blog' => '管理ブログ', + 'modules_no_blog' => '記事はありません。[コンテンツ管理 -> ブログ管理] に移動して記事を設定してください。 ', + 'modules_slides_per_view' => '1画面表示数', + 'modules_enter_content' => 'コンテンツを入力してください', + 'modules_full_screen' => 'フルスクリーンかどうか', + 'modules_content' => 'コンテンツ', + 'modules_edit_content' => 'コンテンツの編集', + 'modules_select_image' => '画像を選択', + 'modules_quantity_line' => '1行で複数表示', + 'modules_please_choose' => '選択してください', + 'modules_choose' => '選択', + 'modules_add_category' => 'カテゴリを追加', + 'modules_choose_category' => 'カテゴリを選択', + 'modules_set_coupon' => 'クーポン設定', + 'modules_no_coupon' => 'クーポンデータなし', + 'modules_manage_flash' => 'スパイク製品の管理', + 'modules_manage_group' => 'グループ製品の管理', + 'modules_no_state' => '現在のモジュールは有効になっていないか、構成されていません。このモジュールを構成するには、バックグラウンド [モジュール管理] に移動してください。 ', + 'modules_grid_mode' => 'グリッドモード', + 'modules_more_link' => 'その他のリンク', + 'modules_choose_brand' => 'ブランドを選択', + 'modules_set_product' => '製品の設定', + 'modules_keywords_search' => 'キーワード検索を入力してください', + 'modules_test_name' => 'テスト名', + 'modules_please_products' => '製品を追加してください', + 'modules_image_size' => '画像サイズ', + 'modules_height' => '高い', + 'modules_width' => '幅', + 'modules_category_style' => 'カテゴリ表示スタイル', + 'modules_down' => '以下', + 'modules_left' => '左', + 'modules_category_no' => '分類しない', + 'modules_review_name' => '名前', + 'modules_profession' => 'プロフェッショナル', + 'modules_video_cover' => 'ビデオ カバー', + 'modules_video' => 'ビデオ', // mobile - 'mobile_search' => '検索バー', - 'mobile_search_normal' => '画面上部に固定されていません', - 'mobile_search_hide' => '上部の検索バーを表示しない', - 'mobile_search_fixed' => '画面上部に固定 (デフォルト)', + 'mobile_search' => '検索バー', + 'mobile_search_normal' => '画面上部に固定されていません', + 'mobile_search_hide' => '上部の検索バーを表示しない', + 'mobile_search_fixed' => '画面上部に固定 (デフォルト)', // Menu - 'main_menu' => 'メインメニュー', - 'please_add_data' => 'データを追加してください', - 'add_main_menu' => 'メインメニューを追加', - 'main_menu_name_link' => 'メインメニュー名/リンク', - 'main_menu_label' => 'メイン メニュー ラベル', - 'label_background_color' => 'ラベルの背景色', - 'label_text_color' => 'ラベルのテキストの色', - 'submenu_group' => 'サブメニュー (グループ)', - 'add_menu_group' => 'メニューグループを追加', - 'full_screen' => 'フルスクリーンかどうか', - 'メニュー' => 'メニュー', - 'add_submenu_link' => 'サブメニュー リンクを追加', - 'type' => 'タイプ', + 'main_menu' => 'メインメニュー', + 'please_add_data' => 'データを追加してください', + 'add_main_menu' => 'メインメニューを追加', + 'main_menu_name_link' => 'メインメニュー名/リンク', + 'main_menu_label' => 'メイン メニュー ラベル', + 'label_background_color' => 'ラベルの背景色', + 'label_text_color' => 'ラベルのテキストの色', + 'submenu_group' => 'サブメニュー (グループ)', + 'add_menu_group' => 'メニューグループを追加', + 'full_screen' => 'フルスクリーンかどうか', + 'メニュー' => 'メニュー', + 'add_submenu_link' => 'サブメニュー リンクを追加', + 'type' => 'タイプ', // footer - 'footer_edit' => 'フッター エディター', - 'sub_title' => 'サブタイトル', - 'introduction' => 'はじめに', - 'copyright_settings' => '著作権設定', + 'footer_edit' => 'フッター エディター', + 'sub_title' => 'サブタイトル', + 'introduction' => 'はじめに', + 'copyright_settings' => '著作権設定', ]; diff --git a/resources/lang/ja/admin/category.php b/resources/lang/ja/admin/category.php index ade5274e..28fe9306 100644 --- a/resources/lang/ja/admin/category.php +++ b/resources/lang/ja/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'カテゴリ', - 'edit_category' => 'カテゴリを編集', - 'upper_category' => '上位カテゴリ', + 'index' => 'カテゴリ', + 'edit_category' => 'カテゴリを編集', + 'upper_category' => '上位カテゴリ', - 'categories_index' => 'カテゴリーリスト', - 'categories_create' => 'カテゴリを作成', - 'categories_show' => 'カテゴリーの詳細', - 'categories_update' => 'カテゴリを更新', - 'categories_delete' => 'カテゴリを削除', + 'categories_index' => 'カテゴリーリスト', + 'categories_create' => 'カテゴリを作成', + 'categories_show' => 'カテゴリーの詳細', + 'categories_update' => 'カテゴリを更新', + 'categories_delete' => 'カテゴリを削除', ]; diff --git a/resources/lang/ja/admin/common.php b/resources/lang/ja/admin/common.php index 3017494d..2b61b4b5 100644 --- a/resources/lang/ja/admin/common.php +++ b/resources/lang/ja/admin/common.php @@ -10,65 +10,65 @@ */ return [ - 'admin_panel' => 'バックステージ管理', - 'edit' => '編集', - 'status' => 'ステータス', - 'action' => 'アクション', - 'install' => 'インストール', - 'uninstall' => 'アンインストール', + 'admin_panel' => 'バックステージ管理', + 'edit' => '編集', + 'status' => 'ステータス', + 'action' => 'アクション', + 'install' => 'インストール', + 'uninstall' => 'アンインストール', // errors - 'forbidden' => '禁止', - 'has_no_permission' => 'このページにアクセスする権限がありません。システム管理者に連絡してください。 ', + 'forbidden' => '禁止', + 'has_no_permission' => 'このページにアクセスする権限がありません。システム管理者に連絡してください。 ', // header - 'home' => 'ホームページを管理する', - 'order' => '注文管理', - 'rma' => 'アフターサービス管理', - 'rma_reason' => '返品理由管理', - 'product' => '製品管理', - 'brand' => 'ブランド管理', - 'category' => 'カテゴリ管理', - 'customer_group' => '顧客グループ管理', - 'customer' => '顧客管理', - 'content' => 'コンテンツ管理', - 'setting' => 'システム設定', - 'plugin' => 'プラグイン管理', - 'admin_user' => 'バックエンド ユーザー', - 'admin_role' => 'ユーザーの役割', - 'region' => '地域のグループ化', - 'tax_rate' => '税率管理', - 'tax_class' => '税務管理', - 'currency' => '通貨管理', - 'language' => '言語管理', - 'zone' => '地方管理', - 'country' => '国の管理', - 'file_manager' => 'ファイルマネージャー', - 'access_frontend' => 'フロントエンドにアクセス', + 'home' => 'ホームページを管理する', + 'order' => '注文管理', + 'rma' => 'アフターサービス管理', + 'rma_reason' => '返品理由管理', + 'product' => '製品管理', + 'brand' => 'ブランド管理', + 'category' => 'カテゴリ管理', + 'customer_group' => '顧客グループ管理', + 'customer' => '顧客管理', + 'content' => 'コンテンツ管理', + 'setting' => 'システム設定', + 'plugin' => 'プラグイン管理', + 'admin_user' => 'バックエンド ユーザー', + 'admin_role' => 'ユーザーの役割', + 'region' => '地域のグループ化', + 'tax_rate' => '税率管理', + 'tax_class' => '税務管理', + 'currency' => '通貨管理', + 'language' => '言語管理', + 'zone' => '地方管理', + 'country' => '国の管理', + 'file_manager' => 'ファイルマネージャー', + 'access_frontend' => 'フロントエンドにアクセス', // sidebar - 'settings_index' => 'システム設定', - 'admin_users_index' => 'バックエンド ユーザー', - 'plugins_index' => 'プラグインリスト', - 'regions_index' => '地域のグループ化', - 'tax_rates_index' => '税率設定', - 'tax_classes_index' => '税区分', - 'currencies_index' => '通貨管理', - 'languages_index' => '言語管理', - 'design_index' => '家の装飾', - 'pages_index' => '情報ページ', - 'design_footer_index' => 'フッターの装飾', - 'design_menu_index' => 'ナビゲーション構成', - 'categories_index' => '製品カテゴリ', - 'products_index' => '製品管理', - 'products_trashed' => 'ごみ箱', - 'customers_trashed' => 'ごみ箱', - 'brands_index' => '製品ブランド', - 'orders_index' => '注文リスト', - 'rmas_index' => 'アフター管理', - 'rma_reasons_index' => 'アフターセールスの理由', - 'customers_index' => '顧客リスト', + 'settings_index' => 'システム設定', + 'admin_users_index' => 'バックエンド ユーザー', + 'plugins_index' => 'プラグインリスト', + 'regions_index' => '地域のグループ化', + 'tax_rates_index' => '税率設定', + 'tax_classes_index' => '税区分', + 'currencies_index' => '通貨管理', + 'languages_index' => '言語管理', + 'design_index' => '家の装飾', + 'pages_index' => '情報ページ', + 'design_footer_index' => 'フッターの装飾', + 'design_menu_index' => 'ナビゲーション構成', + 'categories_index' => '製品カテゴリ', + 'products_index' => '製品管理', + 'products_trashed' => 'ごみ箱', + 'customers_trashed' => 'ごみ箱', + 'brands_index' => '製品ブランド', + 'orders_index' => '注文リスト', + 'rmas_index' => 'アフター管理', + 'rma_reasons_index' => 'アフターセールスの理由', + 'customers_index' => '顧客リスト', 'customer_groups_index' => '顧客グループ', - 'countries_index' => '国の管理', - 'zones_index' => '州管理', + 'countries_index' => '国の管理', + 'zones_index' => '州管理', ]; diff --git a/resources/lang/ja/admin/country.php b/resources/lang/ja/admin/country.php index 31ff4a59..329eea3e 100644 --- a/resources/lang/ja/admin/country.php +++ b/resources/lang/ja/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => '国名', + 'country_name' => '国名', - 'countries_index' => '国リスト', + 'countries_index' => '国リスト', 'countries_create' => '国を作成', 'countries_update' => '国を更新', ]; diff --git a/resources/lang/ja/admin/currency.php b/resources/lang/ja/admin/currency.php index c0741c44..a081510b 100644 --- a/resources/lang/ja/admin/currency.php +++ b/resources/lang/ja/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => '通貨リスト', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => '通貨リスト', 'currencies_create' => '通貨の作成', - 'currencies_show' => '通貨の詳細', + 'currencies_show' => '通貨の詳細', 'currencies_update' => '通貨の更新', 'currencies_delete' => '通貨を削除', -]; \ No newline at end of file +]; diff --git a/resources/lang/ja/admin/customer.php b/resources/lang/ja/admin/customer.php index bb9dd537..478e7dd8 100644 --- a/resources/lang/ja/admin/customer.php +++ b/resources/lang/ja/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => '顧客リスト', - 'customers_create' => '顧客の作成', - 'customers_show' => '顧客の詳細', - 'customers_update' => '顧客の更新', - 'customers_delete' => '顧客を削除', + 'customers_index' => '顧客リスト', + 'customers_create' => '顧客の作成', + 'customers_show' => '顧客の詳細', + 'customers_update' => '顧客の更新', + 'customers_delete' => '顧客を削除', - 'user_info' => 'ユーザー情報', - 'address_management' => 'アドレス管理', - 'user_name' => 'ユーザー名', - 'password_info' => '空白のままにして元のパスワードを変更しない', - 'add_address' => 'アドレスを追加', - 'no_address' => '当座預金口座には住所がありません', - 'edit_address' => '住所を編集', - 'address' => '住所', - 'choose_country' => '国を選択', - 'zones' => '都道府県', - 'choose_zones' => '州を選択', - 'enter_city' => '都市を入力してください', - 'city' => '都市', - 'zipcode' => '郵便番号', - 'address_1' => '詳細アドレス 1', - 'address_2' => '詳細アドレス 2', + 'user_info' => 'ユーザー情報', + 'address_management' => 'アドレス管理', + 'user_name' => 'ユーザー名', + 'password_info' => '空白のままにして元のパスワードを変更しない', + 'add_address' => 'アドレスを追加', + 'no_address' => '当座預金口座には住所がありません', + 'edit_address' => '住所を編集', + 'address' => '住所', + 'choose_country' => '国を選択', + 'zones' => '都道府県', + 'choose_zones' => '州を選択', + 'enter_city' => '都市を入力してください', + 'city' => '都市', + 'zipcode' => '郵便番号', + 'address_1' => '詳細アドレス 1', + 'address_2' => '詳細アドレス 2', - 'cannot_delete_root' => 'Root アカウントを削除できません', - 'error_email' => '正しいメール形式を入力してください', - 'confirm_delete_address' => '本当にアドレスを削除しますか? ', + 'cannot_delete_root' => 'Root アカウントを削除できません', + 'error_email' => '正しいメール形式を入力してください', + 'confirm_delete_address' => '本当にアドレスを削除しますか? ', ]; diff --git a/resources/lang/ja/admin/customer_group.php b/resources/lang/ja/admin/customer_group.php index 0a631fc7..ccd1cbb4 100644 --- a/resources/lang/ja/admin/customer_group.php +++ b/resources/lang/ja/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => '顧客グループ', - 'consumption_limit' => '消費制限', - 'discount_rate' => '割引率', - 'reward_points_factor' => '報酬ポイント係数', - 'integral_factor' => '積分係数を使用', + 'index' => '顧客グループ', + 'consumption_limit' => '消費制限', + 'discount_rate' => '割引率', + 'reward_points_factor' => '報酬ポイント係数', + 'integral_factor' => '積分係数を使用', - 'customer_groups_index' => '顧客グループリスト', + 'customer_groups_index' => '顧客グループリスト', 'customer_groups_create' => '顧客グループの作成', - 'customer_groups_show' => '顧客グループの詳細', + 'customer_groups_show' => '顧客グループの詳細', 'customer_groups_update' => '顧客グループを更新', 'customer_groups_delete' => '顧客グループを削除', - 'default_cannot_delete' => 'デフォルトの顧客グループは削除できません', -]; \ No newline at end of file + 'default_cannot_delete' => 'デフォルトの顧客グループは削除できません', +]; diff --git a/resources/lang/ja/admin/dashboard.php b/resources/lang/ja/admin/dashboard.php index 4cfe1da3..1cbb2494 100644 --- a/resources/lang/ja/admin/dashboard.php +++ b/resources/lang/ja/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => 'ユーザーの訪問', - 'order_total' => '注文金額', - 'customer_new' => 'ユーザーを追加', - 'order_amount' => '売上', - 'yesterday' => '昨日', - 'day_before' => '前日', + 'order_total' => '注文金額', + 'customer_new' => 'ユーザーを追加', + 'order_amount' => '売上', + 'yesterday' => '昨日', + 'day_before' => '前日', - 'order_report' => '注文統計', - 'latest_month' => '月', - 'latest_week' => '週', - 'latest_year' => '1 年', -]; \ No newline at end of file + 'order_report' => '注文統計', + 'latest_month' => '月', + 'latest_week' => '週', + 'latest_year' => '1 年', +]; diff --git a/resources/lang/ja/admin/design_builder.php b/resources/lang/ja/admin/design_builder.php index c2cc5184..0f14ca71 100644 --- a/resources/lang/ja/admin/design_builder.php +++ b/resources/lang/ja/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'ブランドモジュール', - 'module_banner' => 'バナーモジュール', - 'module_four_image_pro' => '1 行 4 つの画像 PRO', - 'module_slideshow' => 'スライド モジュール', - 'module_tab_products' => 'タブ製品', + 'module_brand' => 'ブランドモジュール', + 'module_banner' => 'バナーモジュール', + 'module_four_image_pro' => '1 行 4 つの画像 PRO', + 'module_slideshow' => 'スライド モジュール', + 'module_tab_products' => 'タブ製品', ]; diff --git a/resources/lang/ja/admin/file_manager.php b/resources/lang/ja/admin/file_manager.php index c9bdd800..a6393ef3 100644 --- a/resources/lang/ja/admin/file_manager.php +++ b/resources/lang/ja/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'ディレクトリ/ファイルを作成', - 'file_manager_show' => 'ディレクトリ/ファイルを表示', - 'file_manager_update' => 'rename', - 'file_manager_delete' => 'ディレクトリ/ファイルを削除', + 'file_manager_create' => 'ディレクトリ/ファイルを作成', + 'file_manager_show' => 'ディレクトリ/ファイルを表示', + 'file_manager_update' => 'rename', + 'file_manager_delete' => 'ディレクトリ/ファイルを削除', 'directory_already_exist' => 'ディレクトリは既に存在します', - 'directory_not_empty' => 'ディレクトリは空ではありません', - 'target_not_exist' => '元のファイルまたはフォルダーが存在しません', - 'create_folder' => 'フォルダを作成', - 'rename' => 'rename', - 'download' => 'ダウンロード', - 'upload_files' => 'ファイルをアップロード', - 'click_upload' => 'クリックしてアップロードするか、画像をここにドラッグ', - 'image_uploading' => '画像のアップロード', - 'no_file' => 'ファイルなし', - 'picture_space' => 'ピクチャースペース', - 'show_pc' => ' PCで操作してください', + 'directory_not_empty' => 'ディレクトリは空ではありません', + 'target_not_exist' => '元のファイルまたはフォルダーが存在しません', + 'create_folder' => 'フォルダを作成', + 'rename' => 'rename', + 'download' => 'ダウンロード', + 'upload_files' => 'ファイルをアップロード', + 'click_upload' => 'クリックしてアップロードするか、画像をここにドラッグ', + 'image_uploading' => '画像のアップロード', + 'no_file' => 'ファイルなし', + 'picture_space' => 'ピクチャースペース', + 'show_pc' => ' PCで操作してください', - 'confirm_delete_file' => '選択したファイルを削除しますか', - 'confirm_delete_folder' => 'フォルダの削除操作が進行中です。フォルダ内のすべてのファイルが削除されます。確認しますか? ', - 'new_folder' => '新しいフォルダー', - 'can_empty' => '空にすることはできません', - 'finish' => '終了', - 'uploading' => 'アップロード中', - 'file_manager' => '画像マネージャー', -]; \ No newline at end of file + 'confirm_delete_file' => '選択したファイルを削除しますか', + 'confirm_delete_folder' => 'フォルダの削除操作が進行中です。フォルダ内のすべてのファイルが削除されます。確認しますか? ', + 'new_folder' => '新しいフォルダー', + 'can_empty' => '空にすることはできません', + 'finish' => '終了', + 'uploading' => 'アップロード中', + 'file_manager' => '画像マネージャー', +]; diff --git a/resources/lang/ja/admin/language.php b/resources/lang/ja/admin/language.php index 2798277f..cf21c665 100644 --- a/resources/lang/ja/admin/language.php +++ b/resources/lang/ja/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => '言語リスト', - 'languages_create' => '言語の作成', - 'languages_show' => '言語の詳細', - 'languages_update' => '言語を更新', - 'languages_delete' => '言語を削除', - 'error_default_language_cannot_delete' => 'デフォルトの言語は削除できません! ', - 'help_install' => '注: 新しい言語をインストールするには、対応する言語の製品、カテゴリ、ナビゲーション、ホームページ モジュール、ページ フッターなどを構成する必要があります。そうしないと、異常なページ表示が発生します', -]; \ No newline at end of file + 'languages_index' => '言語リスト', + 'languages_create' => '言語の作成', + 'languages_show' => '言語の詳細', + 'languages_update' => '言語を更新', + 'languages_delete' => '言語を削除', + 'error_default_language_cannot_delete' => 'デフォルトの言語は削除できません! ', + 'help_install' => '注: 新しい言語をインストールするには、対応する言語の製品、カテゴリ、ナビゲーション、ホームページ モジュール、ページ フッターなどを構成する必要があります。そうしないと、異常なページ表示が発生します', +]; diff --git a/resources/lang/ja/admin/login.php b/resources/lang/ja/admin/login.php index b289e0e6..5b555db3 100644 --- a/resources/lang/ja/admin/login.php +++ b/resources/lang/ja/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => 'BeikeShop バックエンドへのログイン', - 'log_in' => 'ログイン', + 'log_in' => 'ログイン', ]; diff --git a/resources/lang/ja/admin/marketing.php b/resources/lang/ja/admin/marketing.php index 6174b9e7..84d62cd0 100644 --- a/resources/lang/ja/admin/marketing.php +++ b/resources/lang/ja/admin/marketing.php @@ -10,16 +10,16 @@ */ return [ - 'marketing_list' => 'プラグイン市場', - 'marketing_show' => 'プラグインの詳細', - 'set_token' => 'セットトークン', - 'get_token' => '获取 Token', - 'download_count' => 'ダウンロード数', - 'last_update' => '最終更新', - 'text_version' => 'バージョン', - 'text_compatibility' => '互換性', - 'text_author' => 'プラグイン作成者', - 'download_plugin' => 'プラグインをダウンロード', + 'marketing_list' => 'プラグイン市場', + 'marketing_show' => 'プラグインの詳細', + 'set_token' => 'セットトークン', + 'get_token' => '获取 Token', + 'download_count' => 'ダウンロード数', + 'last_update' => '最終更新', + 'text_version' => 'バージョン', + 'text_compatibility' => '互換性', + 'text_author' => 'プラグイン作成者', + 'download_plugin' => 'プラグインをダウンロード', 'download_description' => 'プラグインの説明', - 'text_free' => '無料', + 'text_free' => '無料', ]; diff --git a/resources/lang/ja/admin/order.php b/resources/lang/ja/admin/order.php index 98ac3826..53d94ad5 100644 --- a/resources/lang/ja/admin/order.php +++ b/resources/lang/ja/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => '注文リスト', + 'list' => '注文リスト', - 'order_quantity' => '注文数量', - 'order_amount' => '注文金額', - 'orders_index' => '注文リスト', - 'orders_create' => '注文を作成', - 'orders_show' => '注文の詳細', - 'orders_export' => '輸出注文', - 'orders_update' => '注文を更新', - 'notify' => '通知するかどうか', - 'orders_delete' => '注文を削除', - 'orders_update_status' => '更新ステータス', - 'error_status' => 'ステータスを選択してください', -]; \ No newline at end of file + 'order_quantity' => '注文数量', + 'order_amount' => '注文金額', + 'orders_index' => '注文リスト', + 'orders_create' => '注文を作成', + 'orders_show' => '注文の詳細', + 'orders_export' => '輸出注文', + 'orders_update' => '注文を更新', + 'notify' => '通知するかどうか', + 'orders_delete' => '注文を削除', + 'orders_update_status' => '更新ステータス', + 'error_status' => 'ステータスを選択してください', +]; diff --git a/resources/lang/ja/admin/page.php b/resources/lang/ja/admin/page.php index 2cf34aa3..74d2eb6f 100644 --- a/resources/lang/ja/admin/page.php +++ b/resources/lang/ja/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '情報ページ', - 'info_title' => '情報タイトル', - 'info_content' => 'コンテンツ', + 'index' => '情報ページ', + 'info_title' => '情報タイトル', + 'info_content' => 'コンテンツ', - 'pages_index' => '単一ページリスト', - 'pages_create' => '単一のページを作成', - 'pages_show' => '単一ページの詳細', - 'pages_update' => '単一ページ編集', - 'pages_delete' => '単一のページを削除', -]; \ No newline at end of file + 'pages_index' => '単一ページリスト', + 'pages_create' => '単一のページを作成', + 'pages_show' => '単一ページの詳細', + 'pages_update' => '単一ページ編集', + 'pages_delete' => '単一のページを削除', +]; diff --git a/resources/lang/ja/admin/plugin.php b/resources/lang/ja/admin/plugin.php index e390bf63..db4f9ec7 100644 --- a/resources/lang/ja/admin/plugin.php +++ b/resources/lang/ja/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => 'プラグインリスト', - 'plugins_import' => 'アップロードプラグイン', - 'plugins_show' => 'プラグインの詳細', - 'plugins_update' => 'プラグインの更新', - 'plugins_update_status' => '更新ステータス', - 'plugins_install' => 'インストール', - 'plugins_uninstall' => 'アンインストール', + 'plugins_index' => 'プラグインリスト', + 'plugins_import' => 'アップロードプラグイン', + 'plugins_show' => 'プラグインの詳細', + 'plugins_update' => 'プラグインの更新', + 'plugins_update_status' => '更新ステータス', + 'plugins_install' => 'インストール', + 'plugins_uninstall' => 'アンインストール', - 'plugin_list' => 'プラグイン リスト', - 'plugin_code' => 'プラグインコード', - 'plugin_type' => 'プラグインタイプ', - 'plugin_description' => 'プラグインの説明', - 'plugin_upload' => 'アップロード プラグイン (zip ファイルのみをサポート)', + 'plugin_list' => 'プラグイン リスト', + 'plugin_code' => 'プラグインコード', + 'plugin_type' => 'プラグインタイプ', + 'plugin_description' => 'プラグインの説明', + 'plugin_upload' => 'アップロード プラグイン (zip ファイルのみをサポート)', - 'shipping' => '配送方法', - 'payment' => '支払い方法', - 'total' => '注文計算', - 'view' => 'ページの変更', -]; \ No newline at end of file + 'shipping' => '配送方法', + 'payment' => '支払い方法', + 'total' => '注文計算', + 'view' => 'ページの変更', +]; diff --git a/resources/lang/ja/admin/product.php b/resources/lang/ja/admin/product.php index c4072e04..9a571b1f 100644 --- a/resources/lang/ja/admin/product.php +++ b/resources/lang/ja/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => '商品リスト', - 'products_create' => '製品の作成', - 'products_show' => '商品の詳細', - 'products_update' => '製品の更新', - 'products_delete' => '商品を削除', - 'products_trashed' => 'ごみ箱', - 'products_restore' => 'ごみ箱を復元', - 'clear_restore' => '空のごみ箱', + 'products_index' => '商品リスト', + 'products_create' => '製品の作成', + 'products_show' => '商品の詳細', + 'products_update' => '製品の更新', + 'products_delete' => '商品を削除', + 'products_trashed' => 'ごみ箱', + 'products_restore' => 'ごみ箱を復元', + 'clear_restore' => '空のごみ箱', + 'batch_delete' => '一括削除', + 'batch_active' => 'バッチ リスト', + 'batch_inactive' => '既製バッチ', - 'batch_delete' => '一括削除', - 'batch_active' => 'バッチ リスト', - 'batch_inactive' => '既製バッチ', + 'basic_information' => '基本情報', + 'product_details' => '商品の詳細', + 'product_relations' => '関連商品', + 'stocks' => '商品在庫', + 'model' => 'モデル', + 'price' => '価格', + 'origin_price' => '元の価格', + 'cost_price' => '原価', + 'quantity' => '数量', + 'enable_multi_spec' => 'マルチスペックを有効にする', + 'image_help' => '最初の画像が商品のメイン画像として使用され、複数の画像を同時にアップロードでき、複数の画像の位置を自由に調整できます', + 'add_variable' => '指定を追加', + 'add_variable_value' => '指定値を追加', + 'add_variable_image' => '仕様画像追加', + 'default_main_product' => 'デフォルトのメイン製品', + 'modify_order' => 'ダブルクリックして変更、ドラッグして順序を調整', - 'basic_information' => '基本情報', - 'product_details' => '商品の詳細', - 'product_relations' => '関連商品', - 'stocks' => '商品在庫', - 'model' => 'モデル', - 'price' => '価格', - 'origin_price' => '元の価格', - 'cost_price' => '原価', - 'quantity' => '数量', - 'enable_multi_spec' => 'マルチスペックを有効にする', - 'image_help' => '最初の画像が商品のメイン画像として使用され、複数の画像を同時にアップロードでき、複数の画像の位置を自由に調整できます', - 'add_variable' => '指定を追加', - 'add_variable_value' => '指定値を追加', - 'add_variable_image' => '仕様画像追加', - 'default_main_product' => 'デフォルトのメイン製品', - 'modify_order' => 'ダブルクリックして変更、ドラッグして順序を調整', - - 'confirm_batch_product' => '選択した製品をまとめて削除しますか? ', - 'confirm_batch_status' => 'バッチで選択した製品のステータスを変更することを確認しますか? ', - 'confirm_batch_restore' => '選択した製品の復元を確認しますか? ', + 'confirm_batch_product' => '選択した製品をまとめて削除しますか? ', + 'confirm_batch_status' => 'バッチで選択した製品のステータスを変更することを確認しますか? ', + 'confirm_batch_restore' => '選択した製品の復元を確認しますか? ', 'confirm_delete_restore' => 'ごみ箱を空にしてもよろしいですか? ', -]; \ No newline at end of file +]; diff --git a/resources/lang/ja/admin/region.php b/resources/lang/ja/admin/region.php index bef22bbd..974ebed3 100644 --- a/resources/lang/ja/admin/region.php +++ b/resources/lang/ja/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => '地域グループ', - 'regions_index' => 'リージョン グループ リスト', - 'regions_create' => '地域グループを作成', - 'regions_show' => '地域グループの詳細', - 'regions_update' => '地域グループの更新', - 'regions_delete' => '地域グループを削除', - 'name' => '名前', - 'describe' => '説明', - 'country' => '国', - 'zone' => '都道府県', -]; \ No newline at end of file + 'index' => '地域グループ', + 'regions_index' => 'リージョン グループ リスト', + 'regions_create' => '地域グループを作成', + 'regions_show' => '地域グループの詳細', + 'regions_update' => '地域グループの更新', + 'regions_delete' => '地域グループを削除', + 'name' => '名前', + 'describe' => '説明', + 'country' => '国', + 'zone' => '都道府県', +]; diff --git a/resources/lang/ja/admin/rma.php b/resources/lang/ja/admin/rma.php index 2d30cd51..68345841 100644 --- a/resources/lang/ja/admin/rma.php +++ b/resources/lang/ja/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'アフターセールスアプリケーション', + 'index' => 'アフターセールスアプリケーション', - 'rmas_index' => 'アフターサービス一覧', - 'rmas_show' => 'アフターサービス詳細', - 'rmas_update' => 'アフターサービスの更新', - 'rmas_delete' => 'アフターサービスの削除', + 'rmas_index' => 'アフターサービス一覧', + 'rmas_show' => 'アフターサービス詳細', + 'rmas_update' => 'アフターサービスの更新', + 'rmas_delete' => 'アフターサービスの削除', - 'customers_name' => '顧客名', - 'quantity' => '数量', - 'service_type' => 'サービス タイプ', - 'rma_details' => 'アフターセールスアプリケーションの詳細', - 'reasons_return' => '返品理由', - 'current_state' => '現在の状態', - 'modify_status' => 'ステータスの変更', - 'remarks' => '備考', - 'update_status' => '更新ステータス', - 'operation_history' => '操作履歴', -]; \ No newline at end of file + 'customers_name' => '顧客名', + 'quantity' => '数量', + 'service_type' => 'サービス タイプ', + 'rma_details' => 'アフターセールスアプリケーションの詳細', + 'reasons_return' => '返品理由', + 'current_state' => '現在の状態', + 'modify_status' => 'ステータスの変更', + 'remarks' => '備考', + 'update_status' => '更新ステータス', + 'operation_history' => '操作履歴', +]; diff --git a/resources/lang/ja/admin/rma_reason.php b/resources/lang/ja/admin/rma_reason.php index 9966bc24..81d1cda0 100644 --- a/resources/lang/ja/admin/rma_reason.php +++ b/resources/lang/ja/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => '理由リスト', - 'rma_reasons_create' => '作成理由', - 'rma_reasons_update' => '更新理由', - 'rma_reasons_delete' => '削除理由', + 'rma_reasons_index' => '理由リスト', + 'rma_reasons_create' => '作成理由', + 'rma_reasons_update' => '更新理由', + 'rma_reasons_delete' => '削除理由', ]; diff --git a/resources/lang/ja/admin/role.php b/resources/lang/ja/admin/role.php index bb1781e6..36381878 100644 --- a/resources/lang/ja/admin/role.php +++ b/resources/lang/ja/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => '役割リスト', - 'admin_roles_create' => 'ロールの作成', - 'admin_roles_show' => '役割の詳細', - 'admin_roles_update' => 'ロールの更新', - 'admin_roles_delete' => '役割の削除', - 'select_one_at_least' => '権限を空にすることはできません。少なくとも 1 つ選択してください', + 'admin_roles_index' => '役割リスト', + 'admin_roles_create' => 'ロールの作成', + 'admin_roles_show' => '役割の詳細', + 'admin_roles_update' => 'ロールの更新', + 'admin_roles_delete' => '役割の削除', + 'select_one_at_least' => '権限を空にすることはできません。少なくとも 1 つ選択してください', ]; diff --git a/resources/lang/ja/admin/setting.php b/resources/lang/ja/admin/setting.php index dab69936..34233a27 100644 --- a/resources/lang/ja/admin/setting.php +++ b/resources/lang/ja/admin/setting.php @@ -10,61 +10,61 @@ */ return [ - 'index' => 'システム設定', - 'settings_index' => 'システム設定を表示', - 'settings_update' => 'システム設定の変更', - 'design_index' => 'ホーム エディター', - 'design_footer_index' => 'フッター エディター', - 'design_menu_index' => 'ナビゲーション エディター', - 'product_per_page' => '各ページに表示される商品の数', + 'index' => 'システム設定', + 'settings_index' => 'システム設定を表示', + 'settings_update' => 'システム設定の変更', + 'design_index' => 'ホーム エディター', + 'design_footer_index' => 'フッター エディター', + 'design_menu_index' => 'ナビゲーション エディター', + 'product_per_page' => '各ページに表示される商品の数', - '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」にログとして保存されますが、', + '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' => '配送先住所', - 'payment_address' => '請求先住所', - 'meta_title' => 'メタタイトル', - 'meta_description' => 'メタディスクリプション', - 'meta_keywords' => 'メタキーワード', - 'telephone' => '連絡先電話', - 'email' => 'メールボックス', - 'default_address' => 'デフォルトアドレス', - 'default_country_set' => 'デフォルトの国設定', - 'default_zone_set' => 'デフォルトの州設定', - 'default_language' => 'デフォルトの言語', - 'default_currency' => 'デフォルトの通貨', + 'guest_checkout' => '訪問者チェックアウト', + 'theme_default' => 'デフォルトのテーマ', + 'theme_black' => '黒のテーマ', + 'shipping_address' => '配送先住所', + 'payment_address' => '請求先住所', + 'meta_title' => 'メタタイトル', + 'meta_description' => 'メタディスクリプション', + 'meta_keywords' => 'メタキーワード', + 'telephone' => '連絡先電話', + 'email' => 'メールボックス', + 'default_address' => 'デフォルトアドレス', + 'default_country_set' => 'デフォルトの国設定', + 'default_zone_set' => 'デフォルトの州設定', + 'default_language' => 'デフォルトの言語', + 'default_currency' => 'デフォルトの通貨', 'default_customer_group' => 'デフォルトの顧客グループ', - 'admin_name' => 'バックグラウンド ディレクトリ', - 'admin_name_info' => '管理バックグラウンド ディレクトリ、デフォルトは admin', - 'enable_tax' => '税金を有効にする', - 'enable_tax_info' => '税金計算を有効にするかどうか', - 'tax_address' => '納税先住所', - 'tax_address_info' => '税金を計算する住所に応じて', - 'logo' => 'ウェブサイトのロゴ', - 'favicon' => 'ファビコン', - 'favicon_info' => 'ブラウザー タブに表示される小さいアイコンは PNG 形式で、サイズは 32*32 でなければなりません', - 'placeholder_image' => 'プレースホルダー画像', + 'admin_name' => 'バックグラウンド ディレクトリ', + 'admin_name_info' => '管理バックグラウンド ディレクトリ、デフォルトは admin', + 'enable_tax' => '税金を有効にする', + 'enable_tax_info' => '税金計算を有効にするかどうか', + 'tax_address' => '納税先住所', + 'tax_address_info' => '税金を計算する住所に応じて', + 'logo' => 'ウェブサイトのロゴ', + 'favicon' => 'ファビコン', + 'favicon_info' => 'ブラウザー タブに表示される小さいアイコンは PNG 形式で、サイズは 32*32 でなければなりません', + 'placeholder_image' => 'プレースホルダー画像', 'placeholder_image_info' => '画像がない場合や画像が見つからない場合に表示されるプレースホルダー画像、推奨サイズ: 500*500', - 'head_code' => '挿入コード', - 'head_code_info' => '入力ボックスのコードはフロントエンド ページの先頭に挿入され、コードのカウントや特別なプラグインの追加などに使用できます', + 'head_code' => '挿入コード', + 'head_code_info' => '入力ボックスのコードはフロントエンド ページの先頭に挿入され、コードのカウントや特別なプラグインの追加などに使用できます', ]; diff --git a/resources/lang/ja/admin/tax_class.php b/resources/lang/ja/admin/tax_class.php index 36fdf497..6cf461f9 100644 --- a/resources/lang/ja/admin/tax_class.php +++ b/resources/lang/ja/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '税区分', - 'rule' => 'ルール', - 'based_on' => 'based on', - 'priority' => '優先度', - 'tax_classes_index' => '税クラスリスト', - 'tax_classes_create' => '税クラスの作成', - 'tax_classes_show' => '税クラスの詳細', - 'tax_classes_update' => '税クラスの更新', - 'tax_classes_delete' => '税金クラスを削除', + 'index' => '税区分', + 'rule' => 'ルール', + 'based_on' => 'based on', + 'priority' => '優先度', + 'tax_classes_index' => '税クラスリスト', + 'tax_classes_create' => '税クラスの作成', + 'tax_classes_show' => '税クラスの詳細', + 'tax_classes_update' => '税クラスの更新', + 'tax_classes_delete' => '税金クラスを削除', ]; diff --git a/resources/lang/ja/admin/tax_rate.php b/resources/lang/ja/admin/tax_rate.php index f13a8ad8..f0f7679e 100644 --- a/resources/lang/ja/admin/tax_rate.php +++ b/resources/lang/ja/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => '税金設定', - 'tax_classes_index' => '税クラスの設定', - 'tax' => '税の種類', - 'tax_rate' => '税率', - 'type' => 'タイプ', - 'area' => '面積', - 'percentage' => 'パーセンテージ', - 'fixed_tax_rate' => '固定税率', - 'tax_rates_index' => '税率リスト', - 'tax_rates_create' => '税率の作成', - 'tax_rates_show' => '税金の詳細', - 'tax_rates_update' => '税率を更新', - 'tax_rates_delete' => '税率を削除', + 'index' => '税金設定', + 'tax_classes_index' => '税クラスの設定', + 'tax' => '税の種類', + 'tax_rate' => '税率', + 'type' => 'タイプ', + 'area' => '面積', + 'percentage' => 'パーセンテージ', + 'fixed_tax_rate' => '固定税率', + 'tax_rates_index' => '税率リスト', + 'tax_rates_create' => '税率の作成', + 'tax_rates_show' => '税金の詳細', + 'tax_rates_update' => '税率を更新', + 'tax_rates_delete' => '税率を削除', ]; diff --git a/resources/lang/ja/admin/user.php b/resources/lang/ja/admin/user.php index a4cb7a76..3280260c 100644 --- a/resources/lang/ja/admin/user.php +++ b/resources/lang/ja/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'ユーザーリスト', - 'admin_users_create' => 'ユーザーの作成', - 'admin_users_show' => 'ユーザーの詳細', - 'admin_users_update' => 'ユーザーの更新', - 'admin_users_delete' => 'ユーザーの削除', - 'verify_code_expired' => '確認コードの有効期限が切れています (10 分)。もう一度取得してください', - 'verify_code_error' => '確認コードが間違っています', - 'account_not_exist' => 'アカウントが存在しません', + 'admin_users_index' => 'ユーザーリスト', + 'admin_users_create' => 'ユーザーの作成', + 'admin_users_show' => 'ユーザーの詳細', + 'admin_users_update' => 'ユーザーの更新', + 'admin_users_delete' => 'ユーザーの削除', + 'verify_code_expired' => '確認コードの有効期限が切れています (10 分)。もう一度取得してください', + 'verify_code_error' => '確認コードが間違っています', + 'account_not_exist' => 'アカウントが存在しません', ]; diff --git a/resources/lang/ja/admin/zone.php b/resources/lang/ja/admin/zone.php index be040f4d..4adc9e09 100644 --- a/resources/lang/ja/admin/zone.php +++ b/resources/lang/ja/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => '州名', - 'country_of_origin' => '原産国', + 'zone_name' => '州名', + 'country_of_origin' => '原産国', - 'zones_index' => '都道府県リスト', - 'zones_create' => '州を作成', - 'zones_update' => '州を更新', - 'zones_delete' => '州を削除', + 'zones_index' => '都道府県リスト', + 'zones_create' => '州を作成', + 'zones_update' => '州を更新', + 'zones_delete' => '州を削除', - 'error_country' => '国を選択してください', + 'error_country' => '国を選択してください', ]; diff --git a/resources/lang/ja/auth.php b/resources/lang/ja/auth.php index f1697268..2ceb6f90 100644 --- a/resources/lang/ja/auth.php +++ b/resources/lang/ja/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => 'アカウントのパスワードが一致しません', + 'failed' => 'アカウントのパスワードが一致しません', 'password' => 'パスワードが正しくありません', 'throttle' => '失敗が多すぎます。:seconds 分後にもう一度お試しください。', diff --git a/resources/lang/ja/brand.php b/resources/lang/ja/brand.php index 3825aac3..bb331d06 100644 --- a/resources/lang/ja/brand.php +++ b/resources/lang/ja/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => 'ブランド名', - 'icon' => 'アイコン', + 'name' => 'ブランド名', + 'icon' => 'アイコン', 'first_letter' => 'イニシャル', ]; diff --git a/resources/lang/ja/cart.php b/resources/lang/ja/cart.php index ef60b25f..cf77d29e 100644 --- a/resources/lang/ja/cart.php +++ b/resources/lang/ja/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => '購入数量', + 'sku_id' => 'SKU ID', + 'quantity' => '購入数量', 'stock_out' => '在庫不足', ]; diff --git a/resources/lang/ja/common.php b/resources/lang/ja/common.php index df598dc9..7cd3775b 100644 --- a/resources/lang/ja/common.php +++ b/resources/lang/ja/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => '記入してください :name', // 这个有用别删了，:name 是一个变量 + 'error_required' => '記入してください :name', // 这个有用别删了，:name 是一个变量 'error_input_required' => '入力ボックスを空にすることはできません', - 'error_form' => 'フォームが正しく記入されていることを確認してください', - 'email' => '郵便', - 'unauthenticated' => '最初にログインしてください', - 'success' => '成功', - 'no_data' => 'まだデータがありません〜', - 'empty_items' => 'データなし', - 'created_success' => '正常に作成されました!', - 'deleted_success' => '正常に削除されました!', - 'restored_success' => '回復に成功する!', - 'updated_success' => '更新成功!', - 'edit_success' => '修正に成功する!', - 'get_success' => '成功する!', - 'all' => '全て', - 'status' => '州', - 'enable' => '有効', - 'disable' => '無効', - 'enabled' => '有効', - 'disabled' => '無効', - 'home' => '表紙', - 'submit' => '参加する', - 'title' => '題名', - 'save' => '保存', - 'cancel' => 'キャンセル', - 'confirm' => 'もちろん', - 'no' => '番号', - 'yes' => 'はい', - 'delete' => '消去', - 'sign_out' => 'サインアウト', - 'contact_us' => 'お問い合わせ', - 'input' => 'ここに検索を入力してください', - 'filter' => 'フィルター', - 'reset' => 'リセット', - 'export' => '書き出す', - 'edit' => '編集', - 'action' => '操作する', - 'add' => '追加', - 'please_choose' => '選んでください', - 'recommend_size' => '推奨サイズ', - 'pick_datetime' => '選考期間', - 'confirm_delete' => '削除してもよろしいですか?', - 'text_hint' => 'ヒント', - 'restore' => '回復します', - 'name' => '名前', - 'image' => '写真', - 'data' => 'データ', - 'view' => '小切手', - 'phone' => '電話', - 'exit' => '終了する', - 'return' => '戻る', - 'language' => '言語', - 'select_all' => 'すべて選択', - 'sign_out' => 'サインアウト', - 'menu' => 'メニュー', - 'whether_open' => '開くかどうか', - 'to_setting' => '設定する', + 'error_form' => 'フォームが正しく記入されていることを確認してください', + 'email' => '郵便', + 'unauthenticated' => '最初にログインしてください', + 'success' => '成功', + 'no_data' => 'まだデータがありません〜', + 'empty_items' => 'データなし', + 'created_success' => '正常に作成されました!', + 'deleted_success' => '正常に削除されました!', + 'restored_success' => '回復に成功する!', + 'updated_success' => '更新成功!', + 'edit_success' => '修正に成功する!', + 'get_success' => '成功する!', + 'all' => '全て', + 'status' => '州', + 'enable' => '有効', + 'disable' => '無効', + 'enabled' => '有効', + 'disabled' => '無効', + 'home' => '表紙', + 'submit' => '参加する', + 'title' => '題名', + 'save' => '保存', + 'cancel' => 'キャンセル', + 'confirm' => 'もちろん', + 'no' => '番号', + 'yes' => 'はい', + 'delete' => '消去', + 'sign_out' => 'サインアウト', + 'contact_us' => 'お問い合わせ', + 'input' => 'ここに検索を入力してください', + 'filter' => 'フィルター', + 'reset' => 'リセット', + 'export' => '書き出す', + 'edit' => '編集', + 'action' => '操作する', + 'add' => '追加', + 'please_choose' => '選んでください', + 'recommend_size' => '推奨サイズ', + 'pick_datetime' => '選考期間', + 'confirm_delete' => '削除してもよろしいですか?', + 'text_hint' => 'ヒント', + 'restore' => '回復します', + 'name' => '名前', + 'image' => '写真', + 'data' => 'データ', + 'view' => '小切手', + 'phone' => '電話', + 'exit' => '終了する', + 'return' => '戻る', + 'language' => '言語', + 'select_all' => 'すべて選択', + 'sign_out' => 'サインアウト', + 'menu' => 'メニュー', + 'whether_open' => '開くかどうか', + 'to_setting' => '設定する', - 'id' => 'ID', - 'created_at' => '作成時間', - 'updated_at' => '時間を変更する', - 'sort_order' => '選別', - 'error_page' => 'アクセスしたデータは存在しないか削除されています~', - 'error_page_btn' => '前のページに戻る', + 'id' => 'ID', + 'created_at' => '作成時間', + 'updated_at' => '時間を変更する', + 'sort_order' => '選別', + 'error_page' => 'アクセスしたデータは存在しないか削除されています~', + 'error_page_btn' => '前のページに戻る', - 'order' => [ - 'unpaid' => '支払われる', - 'paid' => '有料', - 'shipped' => '発送済み', + 'order' => [ + 'unpaid' => '支払われる', + 'paid' => '有料', + 'shipped' => '発送済み', 'completed' => '完了', 'cancelled' => 'キャンセル', - ] + ], ]; - - diff --git a/resources/lang/ja/currency.php b/resources/lang/ja/currency.php index 5dd49f67..ba29d5f4 100644 --- a/resources/lang/ja/currency.php +++ b/resources/lang/ja/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => '名前', - 'code' => 'コーディング', - 'icon' => 'アイコン', - 'symbol_left' => '左サイン', - 'symbol_right' => '右記号', - 'value' => '為替レート値', - 'decimal_place' => '小数位', + 'name' => '名前', + 'code' => 'コーディング', + 'icon' => 'アイコン', + 'symbol_left' => '左サイン', + 'symbol_right' => '右記号', + 'value' => '為替レート値', + 'decimal_place' => '小数位', ]; diff --git a/resources/lang/ja/customer.php b/resources/lang/ja/customer.php index 87c45eb5..2fad8d9f 100644 --- a/resources/lang/ja/customer.php +++ b/resources/lang/ja/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => '名前', - 'email' => 'Email', - 'from' => '登録ソース', + 'name' => '名前', + 'email' => 'Email', + 'from' => '登録ソース', 'customer_group' => 'ユーザー・グループ', ]; diff --git a/resources/lang/ja/customer_group.php b/resources/lang/ja/customer_group.php index f696aaa1..1a67044d 100644 --- a/resources/lang/ja/customer_group.php +++ b/resources/lang/ja/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => '学年', - 'name' => '顧客グループ名', + 'name' => '顧客グループ名', ]; diff --git a/resources/lang/ja/mail.php b/resources/lang/ja/mail.php index 619bc791..d779a4d3 100644 --- a/resources/lang/ja/mail.php +++ b/resources/lang/ja/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => '注文は正常に送信されました', - 'order_update' => '注文状況の更新', - 'order_success_info' => 'ご注文は正常に送信されました。以下が注文の詳細です', - 'not_oneself' => '非個人的な操作は無視できます。 ', - 'customer_name' => '親愛なる :name ユーザー様、こんにちは! ', - '心から' => '心から', - 'チーム' => 'チーム', - 'order_update_status' => '注文 :number のステータスが更新されました', - 'welcome_register' => '登録へようこそ', - 'register_end' => '登録が完了しました。モールに戻るには、下のボタンをクリックしてください。 ', - 'btn_buy_now' => '今すぐ購入', - 'retrieve_password_title' => 'パスワードを取得', - 'retrieve_password_text' => 'パスワードを取得しています。下のボタンをクリックして操作を完了してください。 ', - 'retrieve_password_btn' => 'ここをクリックしてメールを確認', + 'order_success' => '注文は正常に送信されました', + 'order_update' => '注文状況の更新', + 'order_success_info' => 'ご注文は正常に送信されました。以下が注文の詳細です', + 'not_oneself' => '非個人的な操作は無視できます。 ', + 'customer_name' => '親愛なる :name ユーザー様、こんにちは! ', + '心から' => '心から', + 'チーム' => 'チーム', + 'order_update_status' => '注文 :number のステータスが更新されました', + 'welcome_register' => '登録へようこそ', + 'register_end' => '登録が完了しました。モールに戻るには、下のボタンをクリックしてください。 ', + 'btn_buy_now' => '今すぐ購入', + 'retrieve_password_title' => 'パスワードを取得', + 'retrieve_password_text' => 'パスワードを取得しています。下のボタンをクリックして操作を完了してください。 ', + 'retrieve_password_btn' => 'ここをクリックしてメールを確認', ]; diff --git a/resources/lang/ja/order.php b/resources/lang/ja/order.php index d2c6497a..813557fb 100644 --- a/resources/lang/ja/order.php +++ b/resources/lang/ja/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'number' => '注文番号', - 'customer_name' => '顧客の名前', - 'payment_method' => '支払方法', - 'email' => 'Email', - 'telephone' => '連絡先番号', - 'created_at' => '作成時間', - 'updated_at' => '更新時間', - 'status' => '州', - 'status_format' => '州', - 'total' => '合計注文', - 'express_number' => 'エクスプレス注文番号', - 'express_company' => '運送会社', - 'order_shipments' => '出荷情報', + 'id' => 'ID', + 'number' => '注文番号', + 'customer_name' => '顧客の名前', + 'payment_method' => '支払方法', + 'email' => 'Email', + 'telephone' => '連絡先番号', + 'created_at' => '作成時間', + 'updated_at' => '更新時間', + 'status' => '州', + 'status_format' => '州', + 'total' => '合計注文', + 'express_number' => 'エクスプレス注文番号', + 'express_company' => '運送会社', + 'order_shipments' => '出荷情報', - 'address_info' => '住所情報', - 'shipping_address' => '配送先住所', - 'payment_address' => '請求先住所', - 'order_status' => '注文の状況', - 'current_status' => '現在の状態', - 'change_to_status' => 'ステータスの変更', - 'comment' => '備考', - 'submit_status' => '最新状況', + 'address_info' => '住所情報', + 'shipping_address' => '配送先住所', + 'payment_address' => '請求先住所', + 'order_status' => '注文の状況', + 'current_status' => '現在の状態', + 'change_to_status' => 'ステータスの変更', + 'comment' => '備考', + 'submit_status' => '最新状況', - 'product_info' => '製品情報', - 'product_name' => '名前', - 'product_price' => '価格', - 'product_sub_price' => '小計', - 'product_quantity' => '量', - 'product_sku' => 'SKU', + 'product_info' => '製品情報', + 'product_name' => '名前', + 'product_price' => '価格', + 'product_sub_price' => '小計', + 'product_quantity' => '量', + 'product_sku' => 'SKU', - 'action_history' => '操作ログ', - 'history_status' => '州', - 'history_comment' => '述べる', + 'action_history' => '操作ログ', + 'history_status' => '州', + 'history_comment' => '述べる', 'history_created_at' => '更新しました', - 'unpaid' => '支払われる', - 'paid' => '有料', - 'shipped' => '発送済み', - 'completed' => '完了', - 'cancelled' => 'キャンセル', + 'unpaid' => '支払われる', + 'paid' => '有料', + 'shipped' => '発送済み', + 'completed' => '完了', + 'cancelled' => 'キャンセル', ]; diff --git a/resources/lang/ja/page.php b/resources/lang/ja/page.php index ff19b974..0e26408f 100644 --- a/resources/lang/ja/page.php +++ b/resources/lang/ja/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => '題名', + 'title' => '題名', 'content' => 'コンテンツ', ]; diff --git a/resources/lang/ja/product.php b/resources/lang/ja/product.php index 59742742..1bfa592a 100644 --- a/resources/lang/ja/product.php +++ b/resources/lang/ja/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => '名前', - 'sku' => 'SKU', - 'price' => '価格', - 'origin_price' => '元値', - 'cost_price' => '原価', - 'brand' => 'ブランド', - 'category' => '分類', - 'model' => 'モデル', - 'quantity' => '在庫あり', - 'image' => '写真', + 'name' => '名前', + 'sku' => 'SKU', + 'price' => '価格', + 'origin_price' => '元値', + 'cost_price' => '原価', + 'brand' => 'ブランド', + 'category' => '分類', + 'model' => 'モデル', + 'quantity' => '在庫あり', + 'image' => '写真', - 'active' => '棚の上', - 'inactive' => '降ろす', + 'active' => '棚の上', + 'inactive' => '降ろす', 'has_been_inactive' => 'この商品は販売を終了しました', ]; diff --git a/resources/lang/ja/rma.php b/resources/lang/ja/rma.php index 799f2c49..7ca4c7cc 100644 --- a/resources/lang/ja/rma.php +++ b/resources/lang/ja/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => '注文', + 'order_id' => '注文', 'order_product_id' => '注文品', - 'customer_id' => 'お客様', - 'quantity' => '量', - 'opened' => '開梱', - 'rma_reason_id' => '返却理由', - 'type' => 'アフターサービスの種類', + 'customer_id' => 'お客様', + 'quantity' => '量', + 'opened' => '開梱', + 'rma_reason_id' => '返却理由', + 'type' => 'アフターサービスの種類', - 'status_pending' => '処理する', - 'status_rejected' => '拒否されました', - 'status_approved' => '承認済み（お客様都合による返品）', - 'status_shipped' => '発送済み（返品）', + 'status_pending' => '処理する', + 'status_rejected' => '拒否されました', + 'status_approved' => '承認済み（お客様都合による返品）', + 'status_shipped' => '発送済み（返品）', 'status_completed' => '完了', - 'type_return' => '商品を返品する', - 'type_exchange' => '両替', - 'type_repair' => '修理', - 'type_reissue' => '復刻品', - 'type_refund' => '返金のみ', + 'type_return' => '商品を返品する', + 'type_exchange' => '両替', + 'type_repair' => '修理', + 'type_reissue' => '復刻品', + 'type_refund' => '返金のみ', ]; diff --git a/resources/lang/ja/shop/account.php b/resources/lang/ja/shop/account.php index f6c18b13..fbc14bde 100644 --- a/resources/lang/ja/shop/account.php +++ b/resources/lang/ja/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'パーソナルセンター', - 'revise_info' => '情報の改訂', - 'collect' => '集める', - 'coupon' => 'クーポン', - 'my_order' => '私の注文', - 'orders' => 'すべての注文', - 'pending_payment' => '支払い予定', - 'pending_send' => '発送予定', - 'pending_receipt' => '受信予定', - 'after_sales' => 'after-sales', - 'no_order' => 'まだ注文がありません! ', - 'to_buy' => '注文に行く', - 'order_number' => '注文番号', - 'order_time' => '注文時間', - 'state' => '状態', - 'amount' => '金額', - 'check_details' => '詳細を確認', - 'all' => '合計', - 'items' => 'アイテム', + 'index' => 'パーソナルセンター', + 'revise_info' => '情報の改訂', + 'collect' => '集める', + 'coupon' => 'クーポン', + 'my_order' => '私の注文', + 'orders' => 'すべての注文', + 'pending_payment' => '支払い予定', + 'pending_send' => '発送予定', + 'pending_receipt' => '受信予定', + 'after_sales' => 'after-sales', + 'no_order' => 'まだ注文がありません! ', + 'to_buy' => '注文に行く', + 'order_number' => '注文番号', + 'order_time' => '注文時間', + 'state' => '状態', + 'amount' => '金額', + 'check_details' => '詳細を確認', + 'all' => '合計', + 'items' => 'アイテム', 'verify_code_expired' => '確認コードの有効期限が切れています (10 分)。もう一度取得してください', - 'verify_code_error' => '確認コードが間違っています', - 'account_not_exist' => 'アカウントが存在しません', + 'verify_code_error' => '確認コードが間違っています', + 'account_not_exist' => 'アカウントが存在しません', - 'edit' => [ - 'index' => '個人情報の変更', - 'modify_avatar' => 'アバターの変更', - 'suggest' => 'JPG または PNG 画像をアップロードします。 300 x 300 をお勧めします。 ', - 'name' => '名前', - 'email' => 'メールボックス', - 'crop' => 'クロップ', + 'edit' => [ + 'index' => '個人情報の変更', + 'modify_avatar' => 'アバターの変更', + 'suggest' => 'JPG または PNG 画像をアップロードします。 300 x 300 をお勧めします。 ', + 'name' => '名前', + 'email' => 'メールボックス', + 'crop' => 'クロップ', 'password_edit_success' => 'パスワードが正常に変更されました', - 'origin_password_fail' => '元のパスワード エラー', + 'origin_password_fail' => '元のパスワード エラー', ], - 'wishlist' => [ - 'index' => 'お気に入り', - 'product' => '製品', - 'price' => '価格', + 'wishlist' => [ + 'index' => 'お気に入り', + 'product' => '製品', + 'price' => '価格', 'check_details' => '詳細を確認', ], - 'order' => [ - 'index' => '私の注文', - 'completed' => '受領確認', - 'cancelled' => '注文がキャンセルされました', + 'order' => [ + 'index' => '私の注文', + 'completed' => '受領確認', + 'cancelled' => '注文がキャンセルされました', 'order_details' => '注文の詳細', - 'amount' => '金額', - 'state' => '状態', - 'order_number' => '注文番号', - 'check' => 'チェック', + 'amount' => '金額', + 'state' => '状態', + 'order_number' => '注文番号', + 'check' => 'チェック', - 'order_info' => [ - 'index' => '注文詳細', - 'order_details' => '注文の詳細', - 'to_pay' => '支払う', - 'cancel' => '注文をキャンセル', - 'confirm_receipt' => '領収書の確認', - 'order_number' => '注文番号', - 'order_date' => '注文日', - 'state' => '状態', - 'order_amount' => '注文金額', - 'order_items' => '注文商品', + 'order_info' => [ + 'index' => '注文詳細', + 'order_details' => '注文の詳細', + 'to_pay' => '支払う', + 'cancel' => '注文をキャンセル', + 'confirm_receipt' => '領収書の確認', + 'order_number' => '注文番号', + 'order_date' => '注文日', + 'state' => '状態', + 'order_amount' => '注文金額', + 'order_items' => '注文商品', 'apply_after_sales' => '販売後に適用', - 'order_total' => '注文合計', - 'logistics_status' => '物流ステータス', - 'order_status' => '注文ステータス', - 'remark' => 'コメント', - 'update_time' => '更新時間', + 'order_total' => '注文合計', + 'logistics_status' => '物流ステータス', + 'order_status' => '注文ステータス', + 'remark' => 'コメント', + 'update_time' => '更新時間', ], 'order_success' => [ - 'order_success' => 'おめでとう、注文は正常に生成されました! ', - 'order_number' => '注文番号', - 'amounts_payable' => '支払金額', - 'payment_method' => '支払い方法', - 'view_order' => '注文の詳細を表示', - 'pay_now' => '今すぐ支払う', - 'kind_tips' => 'ご注意: ご注文は正常に処理されました。できるだけ早くお支払いを完了してください~', - 'also' => 'あなたもできる', - 'continue_purchase' => '購入を続ける', + 'order_success' => 'おめでとう、注文は正常に生成されました! ', + 'order_number' => '注文番号', + 'amounts_payable' => '支払金額', + 'payment_method' => '支払い方法', + 'view_order' => '注文の詳細を表示', + 'pay_now' => '今すぐ支払う', + 'kind_tips' => 'ご注意: ご注文は正常に処理されました。できるだけ早くお支払いを完了してください~', + 'also' => 'あなたもできる', + 'continue_purchase' => '購入を続ける', 'contact_customer_service' => '注文プロセス中にご不明な点がございましたら、いつでもカスタマー サービス スタッフにお問い合わせください', - 'emaill' => 'メールボックス', - 'service_hotline' => 'サービス ホットライン', - ] + 'emaill' => 'メールボックス', + 'service_hotline' => 'サービス ホットライン', + ], ], - 'addresses' => [ - 'index' => '私のアドレス', - 'add_address' => '新しいアドレスを追加', + 'addresses' => [ + 'index' => '私のアドレス', + 'add_address' => '新しいアドレスを追加', 'default_address' => 'デフォルトアドレス', - 'delete' => '削除', - 'edit' => '編集', - 'enter_name' => 'あなたの名前を入力してください', - 'enter_phone' => '電話番号を入力してください', - 'enter_address' => '詳しい住所を入力してください 1', + 'delete' => '削除', + 'edit' => '編集', + 'enter_name' => 'あなたの名前を入力してください', + 'enter_phone' => '電話番号を入力してください', + 'enter_address' => '詳しい住所を入力してください 1', 'select_province' => '都道府県を選択してください', - 'enter_city' => '都市を入力してください', - 'confirm_delete' => '本当にアドレスを削除しますか? ', - 'hint' => 'ヒント', - 'check_form' => 'フォームが正しく記入されているか確認してください', + 'enter_city' => '都市を入力してください', + 'confirm_delete' => '本当にアドレスを削除しますか? ', + 'hint' => 'ヒント', + 'check_form' => 'フォームが正しく記入されているか確認してください', ], - 'rma' => [ - 'index' => '私のアフターセールス', - 'commodity' => '商品', - 'quantity' => '数量', - 'service_type' => 'サービス タイプ', + 'rma' => [ + 'index' => '私のアフターセールス', + 'commodity' => '商品', + 'quantity' => '数量', + 'service_type' => 'サービス タイプ', 'return_reason' => '返品理由', 'creation_time' => '作成時間', - 'check' => 'チェック', + 'check' => 'チェック', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'アフターセールスの詳細', ], - 'rma_form' => [ - 'index' => 'アフターセールス情報の送信', - 'service_type' => 'サービス タイプ', + 'rma_form' => [ + 'index' => 'アフターセールス情報の送信', + 'service_type' => 'サービス タイプ', 'return_quantity' => '返品数量', - 'unpacked' => 'unpacked', - 'return_reason' => '返品理由', - 'remark' => 'コメント', - ] - ] + 'unpacked' => 'unpacked', + 'return_reason' => '返品理由', + 'remark' => 'コメント', + ], + ], ]; diff --git a/resources/lang/ja/shop/carts.php b/resources/lang/ja/shop/carts.php index b1210ccf..43bafb98 100644 --- a/resources/lang/ja/shop/carts.php +++ b/resources/lang/ja/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'ショッピングカート', - 'added_to_cart' => 'カートに追加されました', - 'select_all' => 'すべて選択', - 'commodity' => '商品', - 'quantity' => '量', - 'subtotal' => '小計', - 'product_total' => '商品合計', - 'order_total' => '総支払額', - 'shipping_fee' => '貨物', - 'all' => '全て', - 'selected' => '選択済み', - 'to_checkout' => 'チェックアウトに行きます', - 'cart_empty' => 'ショッピングカートは空です', - 'go_buy' => '買いたいものを見に行くことができる', - 'go_shopping' => '買い物に行く', - 'must_select' => '少なくとも 1 つの製品を選択してください', - 'mini' => 'あなたのカート', - 'delete' => '消去', - 'check_cart' => 'ショッピングカートを確認する', + 'index' => 'ショッピングカート', + 'added_to_cart' => 'カートに追加されました', + 'select_all' => 'すべて選択', + 'commodity' => '商品', + 'quantity' => '量', + 'subtotal' => '小計', + 'product_total' => '商品合計', + 'order_total' => '総支払額', + 'shipping_fee' => '貨物', + 'all' => '全て', + 'selected' => '選択済み', + 'to_checkout' => 'チェックアウトに行きます', + 'cart_empty' => 'ショッピングカートは空です', + 'go_buy' => '買いたいものを見に行くことができる', + 'go_shopping' => '買い物に行く', + 'must_select' => '少なくとも 1 つの製品を選択してください', + 'mini' => 'あなたのカート', + 'delete' => '消去', + 'check_cart' => 'ショッピングカートを確認する', - 'invalid_customer' => '無効なカートの顧客', - 'empty_selected_products' => 'ショッピングカートで選択した商品は空です', + 'invalid_customer' => '無効なカートの顧客', + 'empty_selected_products' => 'ショッピングカートで選択した商品は空です', 'invalid_shipping_address' => '配送先住所が無効です', - 'invalid_payment_address' => '請求先住所が無効です', - 'invalid_shipping_method' => '配送方法が利用できません', - 'invalid_payment_method' => 'お支払い方法が利用できません', + 'invalid_payment_address' => '請求先住所が無効です', + 'invalid_shipping_method' => '配送方法が利用できません', + 'invalid_payment_method' => 'お支払い方法が利用できません', ]; diff --git a/resources/lang/ja/shop/checkout.php b/resources/lang/ja/shop/checkout.php index c352fa81..1e241279 100644 --- a/resources/lang/ja/shop/checkout.php +++ b/resources/lang/ja/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'お勘定お願いします', - 'address' => '配送先住所', - 'payment_address' => '請求先住所', + 'index' => 'お勘定お願いします', + 'address' => '配送先住所', + 'payment_address' => '請求先住所', 'same_as_shipping_address' => '請求先住所と配送先住所', - 'chosen' => '選ばれた', - 'edit' => '編集', - 'choose_another_address' => '別の住所を選択', - 'add_new_address' => '新しいアドレスを追加', - 'payment_method' => '支払方法', - 'delivery_method' => '配送方法', - 'cart_totals' => 'カートの総数', - 'submit_order' => '注文を送信', - 'enter_name' => 'あなたの名前を入力してください', - 'enter_phone' => '電話番号を入力してください', - 'enter_address' => '詳細な住所を入力してください 1', - 'select_province' => '都道府県を選択してください', - 'enter_city' => '都市を入力してください', - 'check_form' => 'フォームが正しく記入されていることを確認してください', - 'error_payment_address' => '請求先住所を選択してください', + 'chosen' => '選ばれた', + 'edit' => '編集', + 'choose_another_address' => '別の住所を選択', + 'add_new_address' => '新しいアドレスを追加', + 'payment_method' => '支払方法', + 'delivery_method' => '配送方法', + 'cart_totals' => 'カートの総数', + 'submit_order' => '注文を送信', + 'enter_name' => 'あなたの名前を入力してください', + 'enter_phone' => '電話番号を入力してください', + 'enter_address' => '詳細な住所を入力してください 1', + 'select_province' => '都道府県を選択してください', + 'enter_city' => '都市を入力してください', + 'check_form' => 'フォームが正しく記入されていることを確認してください', + 'error_payment_address' => '請求先住所を選択してください', - 'payment' => [ - 'index' => '支払ってください', - 'please_pay' => '注文が正常に送信されました。お支払いください', - 'order_number' => '注文番号', + 'payment' => [ + 'index' => '支払ってください', + 'please_pay' => '注文が正常に送信されました。お支払いください', + 'order_number' => '注文番号', 'amounts_payable' => '支払額', - 'payment_method' => '支払方法', - ] + 'payment_method' => '支払方法', + ], ]; diff --git a/resources/lang/ja/shop/common.php b/resources/lang/ja/shop/common.php index 337e31fc..3584e1c1 100644 --- a/resources/lang/ja/shop/common.php +++ b/resources/lang/ja/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => '表紙', - 'submit' => '参加する', - 'cancel' => 'キャンセル', + 'home' => '表紙', + 'submit' => '参加する', + 'cancel' => 'キャンセル', 'confirm' => 'もちろん', - 'no' => '番号', - 'yes' => 'はい', + 'no' => '番号', + 'yes' => 'はい', ]; diff --git a/resources/lang/ja/shop/currency.php b/resources/lang/ja/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/ja/shop/currency.php +++ b/resources/lang/ja/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/ja/shop/forgotten.php b/resources/lang/ja/shop/forgotten.php index 212a4c2b..6897c4b8 100644 --- a/resources/lang/ja/shop/forgotten.php +++ b/resources/lang/ja/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'パスワードをお忘れですか', - 'follow_prompt' => 'プロンプトに従ってパスワードを取得してください', - 'email_forCode' => '確認コードを取得するには、メールアドレスを入力してください', - 'enter_password' => '新しいパスワードを入力してください', - 'email' => '郵便', - 'email_address' => '電子メールアドレス', - 'verification_code' => '検証コード', - 'password' => 'パスワード', - 'confirm_password' => 'パスワードを認証する', - 'send_code' => '確認コードを送信する', - 'to_back' => '前のステップに戻る', - 'enter_password' => 'パスワードを入力してください', - 'enter_email' => 'メールアドレスを入力してください', - 'please_confirm' => 'パスワードを確認してください', - 'password_err' => '2 回入力したパスワードが一致しません!', - 'email_err' => '有効なメールアドレスを入力してください!', - 'enter_code' => '確認コードを入力してください', + 'index' => 'パスワードをお忘れですか', + 'follow_prompt' => 'プロンプトに従ってパスワードを取得してください', + 'email_forCode' => '確認コードを取得するには、メールアドレスを入力してください', + 'enter_password' => '新しいパスワードを入力してください', + 'email' => '郵便', + 'email_address' => '電子メールアドレス', + 'verification_code' => '検証コード', + 'password' => 'パスワード', + 'confirm_password' => 'パスワードを認証する', + 'send_code' => '確認コードを送信する', + 'to_back' => '前のステップに戻る', + 'enter_password' => 'パスワードを入力してください', + 'enter_email' => 'メールアドレスを入力してください', + 'please_confirm' => 'パスワードを確認してください', + 'password_err' => '2 回入力したパスワードが一致しません!', + 'email_err' => '有効なメールアドレスを入力してください!', + 'enter_code' => '確認コードを入力してください', 'verification_code_sent' => '確認コードが送信されました。確認して確認コードを入力してください', - 'password_updated' => 'パスワードが変更されました', + 'password_updated' => 'パスワードが変更されました', ]; diff --git a/resources/lang/ja/shop/login.php b/resources/lang/ja/shop/login.php index b752c9a9..ed4131bd 100644 --- a/resources/lang/ja/shop/login.php +++ b/resources/lang/ja/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'ユーザーのログインと登録', - 'login_and_sign' => 'ログイン 登録', - 'home' => '表紙', - 'library' => 'パーソナルセンター', - 'login' => 'ログイン', - 'already' => 'すでにお客様ですか？', - 'description' => 'すでにお客様ですか？', - 'email' => '郵便物', - 'email_address' => '電子メールアドレス', - 'password' => 'パスワード', - 'forget_password' => 'パスワードをお忘れですか', - 'new' => '新しいアカウント', - 'not_already' => 'まだ登録されていませんか？', - 'confirm_password' => 'パスワードを認証する', - 'register' => '登録', - 'enter_password' => 'パスワードを入力してください', - 'enter_email' => 'メールアドレスを入力してください', - 'please_confirm' => 'パスワードを確認してください', - 'password_err' => '2 回入力したパスワードが一致しません!', - 'email_err' => '有効なメールアドレスを入力してください!', - 'check_form' => 'フォームが正しく記入されていることを確認してください', + 'index' => 'ユーザーのログインと登録', + 'login_and_sign' => 'ログイン 登録', + 'home' => '表紙', + 'library' => 'パーソナルセンター', + 'login' => 'ログイン', + 'already' => 'すでにお客様ですか？', + 'description' => 'すでにお客様ですか？', + 'email' => '郵便物', + 'email_address' => '電子メールアドレス', + 'password' => 'パスワード', + 'forget_password' => 'パスワードをお忘れですか', + 'new' => '新しいアカウント', + 'not_already' => 'まだ登録されていませんか？', + 'confirm_password' => 'パスワードを認証する', + 'register' => '登録', + 'enter_password' => 'パスワードを入力してください', + 'enter_email' => 'メールアドレスを入力してください', + 'please_confirm' => 'パスワードを確認してください', + 'password_err' => '2 回入力したパスワードが一致しません!', + 'email_err' => '有効なメールアドレスを入力してください!', + 'check_form' => 'フォームが正しく記入されていることを確認してください', 'email_or_password_error' => 'メールまたはパスワードのエラー!', - 'customer_inactive' => 'ユーザーは無効です', - 'login_successfully' => 'ログイン成功', - 'register_success' => '登録完了', - 'third_party_logins' => '言及する価値がある', + 'customer_inactive' => 'ユーザーは無効です', + 'login_successfully' => 'ログイン成功', + 'register_success' => '登録完了', + 'third_party_logins' => '言及する価値がある', ]; diff --git a/resources/lang/ja/shop/order.php b/resources/lang/ja/shop/order.php index eeaac343..255c08b3 100644 --- a/resources/lang/ja/shop/order.php +++ b/resources/lang/ja/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => '無効な注文', - 'confirm_order' => 'ユーザーが受領を確認', - 'cancel_order' => 'ユーザーが注文をキャンセル', + 'invalid_order' => '無効な注文', + 'confirm_order' => 'ユーザーが受領を確認', + 'cancel_order' => 'ユーザーが注文をキャンセル', 'order_already_paid' => '支払った注文', ]; diff --git a/resources/lang/ja/shop/products.php b/resources/lang/ja/shop/products.php index ba412c58..ca8ecfaf 100644 --- a/resources/lang/ja/shop/products.php +++ b/resources/lang/ja/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => '探す', + 'search' => '探す', 'add_to_favorites' => 'お気に入りに追加', - 'add_to_cart' => 'ショッピングカートに入れる', - 'buy_now' => '今買う', - 'product_details' => '製品詳細', - 'in_stock' => '在庫あり', - 'out_stock' => '在庫切れ', - 'model' => 'モデル', + 'add_to_cart' => 'ショッピングカートに入れる', + 'buy_now' => '今買う', + 'product_details' => '製品詳細', + 'in_stock' => '在庫あり', + 'out_stock' => '在庫切れ', + 'model' => 'モデル', ]; diff --git a/resources/lang/ja/shop/steps.php b/resources/lang/ja/shop/steps.php index 99ca115a..ffd089a4 100644 --- a/resources/lang/ja/shop/steps.php +++ b/resources/lang/ja/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'ステップ', - 'cart' => 'ショッピングカート', - 'checkout' => 'お勘定お願いします', + 'index' => 'ステップ', + 'cart' => 'ショッピングカート', + 'checkout' => 'お勘定お願いします', 'submitted_successfully' => '正常に送信されました', - 'payment' => '支払い', + 'payment' => '支払い', ]; diff --git a/resources/lang/ja/shop/wishlist.php b/resources/lang/ja/shop/wishlist.php index b98a2d4e..84a2dad7 100644 --- a/resources/lang/ja/shop/wishlist.php +++ b/resources/lang/ja/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'お気に入りに追加', + 'add_wishlist_success' => 'お気に入りに追加', 'remove_wishlist_success' => 'お気に入りを削除しました', ]; diff --git a/resources/lang/ru/address.php b/resources/lang/ru/address.php index 16a9df15..35d5ab88 100644 --- a/resources/lang/ru/address.php +++ b/resources/lang/ru/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'Изменить адрес', - 'name' => 'Имя', - 'phone' => 'номер телефона', + 'index' => 'Изменить адрес', + 'name' => 'Имя', + 'phone' => 'номер телефона', 'country_id' => 'Идентификатор страны', - 'zone' => 'провинция', - 'zone_id' => 'Идентификатор провинции', - 'address_1' => 'адрес 1', - 'address_2' => 'Адрес 2', - 'address' => 'адрес', + 'zone' => 'провинция', + 'zone_id' => 'Идентификатор провинции', + 'address_1' => 'адрес 1', + 'address_2' => 'Адрес 2', + 'address' => 'адрес', 'enter_city' => 'введите адрес', - 'post_code' => 'почтовый индекс', - 'default' => 'адрес по умолчанию', + 'post_code' => 'почтовый индекс', + 'default' => 'адрес по умолчанию', ]; diff --git a/resources/lang/ru/admin/admin_roles.php b/resources/lang/ru/admin/admin_roles.php index dd93a4b6..63f81118 100644 --- a/resources/lang/ru/admin/admin_roles.php +++ b/resources/lang/ru/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => 'выбрать все', - 'unselect_all' => 'отменить выбор', - 'role_name' => 'имя роли', + 'select_all' => 'выбрать все', + 'unselect_all' => 'отменить выбор', + 'role_name' => 'имя роли', 'role_management' => 'управление ролями', - 'permission' => 'разрешение', - 'error_roles' => 'Выберите хотя бы одну роль', + 'permission' => 'разрешение', + 'error_roles' => 'Выберите хотя бы одну роль', ]; diff --git a/resources/lang/ru/admin/attribute.php b/resources/lang/ru/admin/attribute.php index 2e5aa569..68130da4 100644 --- a/resources/lang/ru/admin/attribute.php +++ b/resources/lang/ru/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'атрибут', - 'attribute_info' => 'информация об атрибутах', - 'create_at' => 'создать атрибут', - 'attribute_value' => 'значение атрибута', - 'set_attribute' => 'атрибут конфигурации', - 'add_attribute' => 'добавить значение атрибута', + 'index' => 'атрибут', + 'attribute_info' => 'информация об атрибутах', + 'create_at' => 'создать атрибут', + 'attribute_value' => 'значение атрибута', + 'set_attribute' => 'атрибут конфигурации', + 'add_attribute' => 'добавить значение атрибута', 'before_attribute' => 'Сначала выберите левый атрибут', - 'btn_at' => 'Иди сейчас', - 'btn_later' => 'позже', - 'to_info_values' => 'Пожалуйста, перейдите на страницу сведений, чтобы изменить значения атрибутов', + 'btn_at' => 'Иди сейчас', + 'btn_later' => 'позже', + 'to_info_values' => 'Пожалуйста, перейдите на страницу сведений, чтобы изменить значения атрибутов', ]; diff --git a/resources/lang/ru/admin/attribute_groups.php b/resources/lang/ru/admin/attribute_groups.php index 0724624b..903cfe26 100644 --- a/resources/lang/ru/admin/attribute_groups.php +++ b/resources/lang/ru/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => 'группа атрибутов', + 'index' => 'группа атрибутов', 'create_at_groups' => 'создать группу атрибутов', ]; diff --git a/resources/lang/ru/admin/brand.php b/resources/lang/ru/admin/brand.php index 26cfbac9..9a044ed1 100644 --- a/resources/lang/ru/admin/brand.php +++ b/resources/lang/ru/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => 'бренд', + 'index' => 'бренд', - 'brands_index' => 'список брендов', + 'brands_index' => 'список брендов', 'brands_create' => 'Создать бренд', - 'brands_show' => 'детали бренда', + 'brands_show' => 'детали бренда', 'brands_update' => 'обновить бренд', 'brands_delete' => 'удалить бренд', - 'error_upload' => 'Пожалуйста, загрузите иконку' + 'error_upload' => 'Пожалуйста, загрузите иконку', ]; diff --git a/resources/lang/ru/admin/builder.php b/resources/lang/ru/admin/builder.php index 56e9e8d3..a83ff3ad 100644 --- a/resources/lang/ru/admin/builder.php +++ b/resources/lang/ru/admin/builder.php @@ -11,243 +11,243 @@ */ return [ - 'heading_title' => 'редактирование страницы', - 'modules_instructions' => 'Доступные модули, нажмите Добавить на страницу', - 'text_floor_prompt' => 'Настройки (конфигурация этажа должна быть сохранена и обновлена ​​для обновления страницы)', - 'text_new_page' => 'Добавить новую страницу', - 'text_quit' => 'Выйти', - 'text_save' => 'Сохранить', - 'text_view_page' => 'Просмотреть страницу', - 'text_module' => 'модуль', - 'text_module_title' => 'название модуля', - 'text_menu' => 'Навигация', - 'text_drag_sort' => 'Сортировка перетаскиванием', - 'text_set_up' => 'настройка', - 'text_delete' => 'Удалить', - 'text_floor' => 'этаж', - 'text_add_module' => 'Добавить модуль', - 'text_to_menu' => 'Редактировать меню навигации', - 'text_other' => 'другое', - 'text_preparing' => 'Подготовка...', - 'text_floor_setting' => 'настройка этажа', - 'text_background_color' => 'цвет фона', - 'text_sure' => 'ОК', - 'text_page_name' => 'Пожалуйста, введите новое название страницы', - 'text_is_save' => 'Убедитесь, что данные текущей страницы сохранены!', - 'text_pop_ads' => 'всплывающая реклама', - 'text_style_setting' => 'настройки стиля', - 'text_is_save_data' => 'Перед переключением страниц убедитесь, что данные текущей страницы сохранены?', - 'text_hint' => 'намекать', - 'text_cancel' => 'Отмена', - 'text_created_success' => 'Страница успешно создана', - 'text_html_none' => 'Ошибка загрузки модуля, данные HTML пусты!', - 'text_is_delete' => 'уверен, что хочешь удалить', - 'text_enable' => 'включить', - 'text_set_title' => 'заголовок конфигурации', - 'text_set_subtitle' => 'Настроить субтитры', - 'text_suggested_size' => 'Рекомендуемые размеры (ШхВ): ', - 'text_word' => 'Слово', - 'text_add_pictures' => 'добавить картинки', - 'text_refresh_cookie' => 'Обновить Cookie', - 'text_popup_hint' => 'ПРИМЕЧАНИЕ. Пользователь нажимает «Закрыть», и он больше не будет отображаться до тех пор, пока браузер не будет закрыт и снова открыт. Для локального тестирования вы можете нажать «Обновить файл cookie», затем обновить браузер, и всплывающее окно можно снова активировать. ', - 'text_cookie_refresh_success' => 'Файл cookie успешно обновлен, обновите браузер, чтобы увидеть содержимое всплывающего окна.', - 'text_add_hot_links' => 'Добавить горячую ссылку для поиска', - 'text_add' => 'Добавить к', - 'text_margin_top' => 'Заполнение модуля — верх', - 'text_margin_bottom' => 'заполнение модуля - низ', - 'text_file_manager' => 'файловый менеджер', - 'modules_link' => 'ссылка', - 'modules_choose_link' => 'Выбрать ссылку', - 'text_select_link' => 'Пожалуйста, выберите страницу ссылки для перехода', - 'text_no' => '无', - 'text_search' => 'никто', - 'text_is_newpage' => 'открывать ли новое окно:', - 'text_manage' => 'управлять', - 'text_title_cover' => 'Заголовок (переопределяет название ссылки, выбранное ниже)', - 'text_enter_link' => 'Пожалуйста, введите адрес ссылки', - 'text_states' => 'государство', - 'text_disable' => 'инвалид', - 'text_no_data' => 'Данные не существуют или были удалены', - 'text_to_add' => 'добавить', - 'text_category' => 'Классификация', - 'text_information' => 'Информационная страница', - 'text_manufacturer' => 'марка', - 'text_static' => 'Фиксированное соединение', - 'text_custom' => 'настроить', - 'text_top_text' => 'Заголовок', - 'text_edit_page_name' => 'Изменить название страницы', - 'text_page_name_no' => 'Укажите имя', - 'custom_name' => 'пользовательское имя', + 'heading_title' => 'редактирование страницы', + 'modules_instructions' => 'Доступные модули, нажмите Добавить на страницу', + 'text_floor_prompt' => 'Настройки (конфигурация этажа должна быть сохранена и обновлена ​​для обновления страницы)', + 'text_new_page' => 'Добавить новую страницу', + 'text_quit' => 'Выйти', + 'text_save' => 'Сохранить', + 'text_view_page' => 'Просмотреть страницу', + 'text_module' => 'модуль', + 'text_module_title' => 'название модуля', + 'text_menu' => 'Навигация', + 'text_drag_sort' => 'Сортировка перетаскиванием', + 'text_set_up' => 'настройка', + 'text_delete' => 'Удалить', + 'text_floor' => 'этаж', + 'text_add_module' => 'Добавить модуль', + 'text_to_menu' => 'Редактировать меню навигации', + 'text_other' => 'другое', + 'text_preparing' => 'Подготовка...', + 'text_floor_setting' => 'настройка этажа', + 'text_background_color' => 'цвет фона', + 'text_sure' => 'ОК', + 'text_page_name' => 'Пожалуйста, введите новое название страницы', + 'text_is_save' => 'Убедитесь, что данные текущей страницы сохранены!', + 'text_pop_ads' => 'всплывающая реклама', + 'text_style_setting' => 'настройки стиля', + 'text_is_save_data' => 'Перед переключением страниц убедитесь, что данные текущей страницы сохранены?', + 'text_hint' => 'намекать', + 'text_cancel' => 'Отмена', + 'text_created_success' => 'Страница успешно создана', + 'text_html_none' => 'Ошибка загрузки модуля, данные HTML пусты!', + 'text_is_delete' => 'уверен, что хочешь удалить', + 'text_enable' => 'включить', + 'text_set_title' => 'заголовок конфигурации', + 'text_set_subtitle' => 'Настроить субтитры', + 'text_suggested_size' => 'Рекомендуемые размеры (ШхВ): ', + 'text_word' => 'Слово', + 'text_add_pictures' => 'добавить картинки', + 'text_refresh_cookie' => 'Обновить Cookie', + 'text_popup_hint' => 'ПРИМЕЧАНИЕ. Пользователь нажимает «Закрыть», и он больше не будет отображаться до тех пор, пока браузер не будет закрыт и снова открыт. Для локального тестирования вы можете нажать «Обновить файл cookie», затем обновить браузер, и всплывающее окно можно снова активировать. ', + 'text_cookie_refresh_success' => 'Файл cookie успешно обновлен, обновите браузер, чтобы увидеть содержимое всплывающего окна.', + 'text_add_hot_links' => 'Добавить горячую ссылку для поиска', + 'text_add' => 'Добавить к', + 'text_margin_top' => 'Заполнение модуля — верх', + 'text_margin_bottom' => 'заполнение модуля - низ', + 'text_file_manager' => 'файловый менеджер', + 'modules_link' => 'ссылка', + 'modules_choose_link' => 'Выбрать ссылку', + 'text_select_link' => 'Пожалуйста, выберите страницу ссылки для перехода', + 'text_no' => '无', + 'text_search' => 'никто', + 'text_is_newpage' => 'открывать ли новое окно:', + 'text_manage' => 'управлять', + 'text_title_cover' => 'Заголовок (переопределяет название ссылки, выбранное ниже)', + 'text_enter_link' => 'Пожалуйста, введите адрес ссылки', + 'text_states' => 'государство', + 'text_disable' => 'инвалид', + 'text_no_data' => 'Данные не существуют или были удалены', + 'text_to_add' => 'добавить', + 'text_category' => 'Классификация', + 'text_information' => 'Информационная страница', + 'text_manufacturer' => 'марка', + 'text_static' => 'Фиксированное соединение', + 'text_custom' => 'настроить', + 'text_top_text' => 'Заголовок', + 'text_edit_page_name' => 'Изменить название страницы', + 'text_page_name_no' => 'Укажите имя', + 'custom_name' => 'пользовательское имя', // 固定连接 - 'text_static_product_latest' => 'Последний продукт', - 'text_static_product_special' => 'особый продукт', + 'text_static_product_latest' => 'Последний продукт', + 'text_static_product_special' => 'особый продукт', 'text_static_product_manufacturer' => 'зона бренда', - 'text_static_account_account' => 'Центр участников', - 'text_static_account_order' => 'исторический порядок', - 'text_static_account_wishlist' => 'Список избранного', - 'text_static_affiliate_login' => 'партнер', - 'text_static_account_newsletter' => 'Подпишитесь на консультацию', - 'text_static_information_contact' => 'свяжитесь с нами', - 'text_static_information_sitemap' => 'Карта сайта', - 'text_static_information_faq' => 'Общая проблема', - 'text_static_account_voucher' => 'ваучер', - 'text_static_account_login' => 'Авторизоваться', - 'text_static_account_register' => 'регистр', - 'text_static_checkout_cart' => 'корзина покупателя', - 'text_static_blog_home' => 'блог', + 'text_static_account_account' => 'Центр участников', + 'text_static_account_order' => 'исторический порядок', + 'text_static_account_wishlist' => 'Список избранного', + 'text_static_affiliate_login' => 'партнер', + 'text_static_account_newsletter' => 'Подпишитесь на консультацию', + 'text_static_information_contact' => 'свяжитесь с нами', + 'text_static_information_sitemap' => 'Карта сайта', + 'text_static_information_faq' => 'Общая проблема', + 'text_static_account_voucher' => 'ваучер', + 'text_static_account_login' => 'Авторизоваться', + 'text_static_account_register' => 'регистр', + 'text_static_checkout_cart' => 'корзина покупателя', + 'text_static_blog_home' => 'блог', - 'text_edit_product' => 'Изменить сведения о продукте', - 'text_edit_home' => 'Изменить дом', - 'text_edit_mb_home' => 'Изменить домашнюю страницу для мобильных устройств', - 'text_footer_edit' => 'Изменить нижний колонтитул', - 'text_header_edit' => 'изменить заголовок', - 'text_save_refresh' => 'сохранить и обновить', - 'text_save_refresh_header' => 'сохранить (обновить заголовок)', - 'text_service_icon' => 'значок службы', - 'text_describe' => 'описывать', - 'text_add_link' => 'Добавить ссылку', - 'text_is_btn' => 'показывать ли кнопку', - 'text_phone' => 'телефон', - 'text_address' => 'адрес', - 'text_email' => 'Почта', - 'text_copyright' => 'Авторское право/Изображение', - 'text_yq_link' => 'Ссылки', - 'text_link_bar' => 'панель ссылок', - 'text_introduce' => 'вводить', - 'text_up_logo' => 'загрузить logo', - 'text_hot_keywords' => 'Горячие ключевые слова для поиска', - 'text_title' => 'заглавие', - 'text_text_notific' => 'текстовое уведомление', - 'text_only_home' => 'Показывать только на главной странице', - 'text_background_color' => 'фоновый цвет', - 'text_font_color' => 'Цвет шрифта', - 'text_image' => 'картина', - 'text_show' => 'отображать', - 'text_is_phone' => 'Показать контактный номер телефона', - 'text_is_phone' => 'Показать контактный номер телефона', - 'text_half_angle' => 'Используйте запятые половинной ширины для разделения', - 'text_prompt_words' => 'текст подсказки', - 'text_search_bar' => 'панель поиска', - 'text_btn_text' => 'текст кнопки', - 'text_banner_ad' => 'баннерная реклама', - 'text_l_c' => 'столбец языка/валюты', - 'text_top_color' => 'Верхний цвет', - 'text_title_color' => 'цвет заголовка', - 'text_color' => 'цвет', - 'text_left_text' => 'левый текст', - 'text_right_icon' => 'правильный значок платежа', - 'text_bgi' => 'фоновое изображение', - 'text_btn' => 'кнопка', + 'text_edit_product' => 'Изменить сведения о продукте', + 'text_edit_home' => 'Изменить дом', + 'text_edit_mb_home' => 'Изменить домашнюю страницу для мобильных устройств', + 'text_footer_edit' => 'Изменить нижний колонтитул', + 'text_header_edit' => 'изменить заголовок', + 'text_save_refresh' => 'сохранить и обновить', + 'text_save_refresh_header' => 'сохранить (обновить заголовок)', + 'text_service_icon' => 'значок службы', + 'text_describe' => 'описывать', + 'text_add_link' => 'Добавить ссылку', + 'text_is_btn' => 'показывать ли кнопку', + 'text_phone' => 'телефон', + 'text_address' => 'адрес', + 'text_email' => 'Почта', + 'text_copyright' => 'Авторское право/Изображение', + 'text_yq_link' => 'Ссылки', + 'text_link_bar' => 'панель ссылок', + 'text_introduce' => 'вводить', + 'text_up_logo' => 'загрузить logo', + 'text_hot_keywords' => 'Горячие ключевые слова для поиска', + 'text_title' => 'заглавие', + 'text_text_notific' => 'текстовое уведомление', + 'text_only_home' => 'Показывать только на главной странице', + 'text_background_color' => 'фоновый цвет', + 'text_font_color' => 'Цвет шрифта', + 'text_image' => 'картина', + 'text_show' => 'отображать', + 'text_is_phone' => 'Показать контактный номер телефона', + 'text_is_phone' => 'Показать контактный номер телефона', + 'text_half_angle' => 'Используйте запятые половинной ширины для разделения', + 'text_prompt_words' => 'текст подсказки', + 'text_search_bar' => 'панель поиска', + 'text_btn_text' => 'текст кнопки', + 'text_banner_ad' => 'баннерная реклама', + 'text_l_c' => 'столбец языка/валюты', + 'text_top_color' => 'Верхний цвет', + 'text_title_color' => 'цвет заголовка', + 'text_color' => 'цвет', + 'text_left_text' => 'левый текст', + 'text_right_icon' => 'правильный значок платежа', + 'text_bgi' => 'фоновое изображение', + 'text_btn' => 'кнопка', // page - 'page_product_title_size' => 'Размер шрифта названия товара', - 'page_product_title_color' => 'Цвет названия товара', - 'page_product_price_color' => 'Цвет цены товара', - 'page_product_thumb_position' => 'позиция эскиза', - 'page_product_image' => 'изображение товара', - 'page_product_bottom' => 'внизу', - 'page_product_left' => 'левая сторона', - 'page_product_magnifying_style' => 'стиль увеличительного стекла', - 'page_product_magnifying_window' => 'внешнее окно', - 'page_product_magnifying_inner' => 'внутренняя подвеска', - 'page_product_magnifying_lens' => 'внутреннее увеличительное стекло', - 'page_product_share' => 'Поделиться', - 'page_product_share_code' => 'Поделиться кодом', - 'page_product_general_settings' => 'Общие настройки', - 'page_product_font_size' => 'размер шрифта', + 'page_product_title_size' => 'Размер шрифта названия товара', + 'page_product_title_color' => 'Цвет названия товара', + 'page_product_price_color' => 'Цвет цены товара', + 'page_product_thumb_position' => 'позиция эскиза', + 'page_product_image' => 'изображение товара', + 'page_product_bottom' => 'внизу', + 'page_product_left' => 'левая сторона', + 'page_product_magnifying_style' => 'стиль увеличительного стекла', + 'page_product_magnifying_window' => 'внешнее окно', + 'page_product_magnifying_inner' => 'внутренняя подвеска', + 'page_product_magnifying_lens' => 'внутреннее увеличительное стекло', + 'page_product_share' => 'Поделиться', + 'page_product_share_code' => 'Поделиться кодом', + 'page_product_general_settings' => 'Общие настройки', + 'page_product_font_size' => 'размер шрифта', // ModuleS List - 'modules_photo_text' => 'смесь изображения и текста', - 'modules_video_module' => 'видео модуль', - 'modules_customer_reviews' => 'отзывы клиентов', - 'modules_images_link' => 'ссылка на несколько изображений', - 'modules_background_icon_text' => 'текст фонового значка', - 'modules_slideshow_category' => 'категория слайд-шоу', - 'modules_bargain' => 'торговаться', - 'modules_bestseller' => 'Хит продаж', - 'modules_blog' => 'блог', - 'modules_carousel' => 'Значок Качели Бо', - 'modules_category' => 'модуль категории', - 'modules_coupon' => 'купон', - 'modules_flash_sale' => 'Скачок товаров', - 'modules_group_buying' => 'группа покупок', - 'modules_html' => 'форматированный текст', - 'modules_icon_text' => 'текст значка', - 'modules_image_100' => 'Модуль с одним изображением', - 'modules_image_200' => 'одна строка два изображения', - 'modules_image_300' => 'одна строка три изображения', - 'modules_image_301' => 'одна строка три изображения-про', - 'modules_image_400' => 'одна строка четыре изображения', - 'modules_image_401' => 'одна строка четыре изображения-про', - 'modules_latest' => 'последний продукт', - 'modules_manufacturer' => 'список брендов', - 'modules_product' => 'продукт', - 'modules_product_tab' => 'вкладка товаров', - 'modules_slideshow' => 'слайд-шоу', - 'modules_quantity' => 'Ограничение количества отображения', - 'modules_manage_bargain' => 'Управление товарами для торга', - 'modules_manage_blog' => 'Блог руководства', - 'modules_no_blog' => 'Нет статей, перейдите в [Управление контентом -> Управление блогами], чтобы настроить статьи. ', - 'modules_slides_per_view' => 'Количество показов на одном экране', - 'modules_enter_content' => 'Пожалуйста, введите содержимое', - 'modules_full_screen' => 'Во весь экран', - 'modules_content' => 'контент', - 'modules_edit_content' => 'редактировать содержимое', - 'modules_select_image' => 'выбрать изображение', - 'modules_quantity_line' => 'одна строка показывает несколько', - 'modules_please_choose' => 'пожалуйста, выберите', - 'modules_choose' => 'выбрать', - 'modules_add_category' => 'Добавить категорию', - 'modules_choose_category' => 'Выберите категорию', - 'modules_set_coupon' => 'Конфигурация купона', - 'modules_no_coupon' => 'Нет данных купона', - 'modules_manage_flash' => 'Управление пиковыми продуктами', - 'modules_manage_group' => 'Управление продуктами группы', - 'modules_no_state' => 'Текущий модуль не включен или не настроен, перейдите в фоновый режим [управление модулями], чтобы настроить этот модуль. ', - 'modules_grid_mode' => 'режим сетки', - 'modules_more_link' => 'больше ссылок', - 'modules_choose_brand' => 'Выберите марку', - 'modules_set_product' => 'Настроить продукты', - 'modules_keywords_search' => 'Пожалуйста, введите поиск по ключевым словам', - 'modules_test_name' => 'имя теста', - 'modules_please_products' => 'пожалуйста, добавьте товары', - 'modules_image_size' => 'размер изображения', - 'modules_height' => 'высокий', - 'modules_width' => 'ширина', - 'modules_category_style' => 'стиль отображения категорий', - 'modules_down' => 'ниже', - 'modules_left' => 'слева', - 'modules_category_no' => 'Не классифицировать', - 'modules_review_name' => 'имя', - 'modules_profession' => 'профессионал', - 'modules_video_cover' => 'обложка видео', - 'modules_video' => 'видео', + 'modules_photo_text' => 'смесь изображения и текста', + 'modules_video_module' => 'видео модуль', + 'modules_customer_reviews' => 'отзывы клиентов', + 'modules_images_link' => 'ссылка на несколько изображений', + 'modules_background_icon_text' => 'текст фонового значка', + 'modules_slideshow_category' => 'категория слайд-шоу', + 'modules_bargain' => 'торговаться', + 'modules_bestseller' => 'Хит продаж', + 'modules_blog' => 'блог', + 'modules_carousel' => 'Значок Качели Бо', + 'modules_category' => 'модуль категории', + 'modules_coupon' => 'купон', + 'modules_flash_sale' => 'Скачок товаров', + 'modules_group_buying' => 'группа покупок', + 'modules_html' => 'форматированный текст', + 'modules_icon_text' => 'текст значка', + 'modules_image_100' => 'Модуль с одним изображением', + 'modules_image_200' => 'одна строка два изображения', + 'modules_image_300' => 'одна строка три изображения', + 'modules_image_301' => 'одна строка три изображения-про', + 'modules_image_400' => 'одна строка четыре изображения', + 'modules_image_401' => 'одна строка четыре изображения-про', + 'modules_latest' => 'последний продукт', + 'modules_manufacturer' => 'список брендов', + 'modules_product' => 'продукт', + 'modules_product_tab' => 'вкладка товаров', + 'modules_slideshow' => 'слайд-шоу', + 'modules_quantity' => 'Ограничение количества отображения', + 'modules_manage_bargain' => 'Управление товарами для торга', + 'modules_manage_blog' => 'Блог руководства', + 'modules_no_blog' => 'Нет статей, перейдите в [Управление контентом -> Управление блогами], чтобы настроить статьи. ', + 'modules_slides_per_view' => 'Количество показов на одном экране', + 'modules_enter_content' => 'Пожалуйста, введите содержимое', + 'modules_full_screen' => 'Во весь экран', + 'modules_content' => 'контент', + 'modules_edit_content' => 'редактировать содержимое', + 'modules_select_image' => 'выбрать изображение', + 'modules_quantity_line' => 'одна строка показывает несколько', + 'modules_please_choose' => 'пожалуйста, выберите', + 'modules_choose' => 'выбрать', + 'modules_add_category' => 'Добавить категорию', + 'modules_choose_category' => 'Выберите категорию', + 'modules_set_coupon' => 'Конфигурация купона', + 'modules_no_coupon' => 'Нет данных купона', + 'modules_manage_flash' => 'Управление пиковыми продуктами', + 'modules_manage_group' => 'Управление продуктами группы', + 'modules_no_state' => 'Текущий модуль не включен или не настроен, перейдите в фоновый режим [управление модулями], чтобы настроить этот модуль. ', + 'modules_grid_mode' => 'режим сетки', + 'modules_more_link' => 'больше ссылок', + 'modules_choose_brand' => 'Выберите марку', + 'modules_set_product' => 'Настроить продукты', + 'modules_keywords_search' => 'Пожалуйста, введите поиск по ключевым словам', + 'modules_test_name' => 'имя теста', + 'modules_please_products' => 'пожалуйста, добавьте товары', + 'modules_image_size' => 'размер изображения', + 'modules_height' => 'высокий', + 'modules_width' => 'ширина', + 'modules_category_style' => 'стиль отображения категорий', + 'modules_down' => 'ниже', + 'modules_left' => 'слева', + 'modules_category_no' => 'Не классифицировать', + 'modules_review_name' => 'имя', + 'modules_profession' => 'профессионал', + 'modules_video_cover' => 'обложка видео', + 'modules_video' => 'видео', // mobile - 'mobile_search' => 'панель поиска', - 'mobile_search_normal' => 'Не зафиксировано вверху экрана', - 'mobile_search_hide' => 'Не отображать верхнюю строку поиска', - 'mobile_search_fixed' => 'фиксировано вверху экрана (по умолчанию)', + 'mobile_search' => 'панель поиска', + 'mobile_search_normal' => 'Не зафиксировано вверху экрана', + 'mobile_search_hide' => 'Не отображать верхнюю строку поиска', + 'mobile_search_fixed' => 'фиксировано вверху экрана (по умолчанию)', // Menu - 'main_menu' => 'главное меню', - 'please_add_data' => 'добавьте данные', - 'add_main_menu' => 'Добавить главное меню', - 'main_menu_name_link' => 'название/ссылка главного меню', - 'main_menu_label' => 'Ярлык главного меню', - 'label_background_color' => 'цвет фона метки', - 'label_text_color' => 'цвет текста метки', - 'submenu_group' => 'подменю (группа)', - 'add_menu_group' => 'Добавить группу меню', - 'full_screen' => 'Во весь экран', - 'меню' => 'меню', - 'add_submenu_link' => 'Добавить ссылку на подменю', - 'тип' => 'тип', + 'main_menu' => 'главное меню', + 'please_add_data' => 'добавьте данные', + 'add_main_menu' => 'Добавить главное меню', + 'main_menu_name_link' => 'название/ссылка главного меню', + 'main_menu_label' => 'Ярлык главного меню', + 'label_background_color' => 'цвет фона метки', + 'label_text_color' => 'цвет текста метки', + 'submenu_group' => 'подменю (группа)', + 'add_menu_group' => 'Добавить группу меню', + 'full_screen' => 'Во весь экран', + 'меню' => 'меню', + 'add_submenu_link' => 'Добавить ссылку на подменю', + 'тип' => 'тип', - //footer - 'footer_edit' => 'редактор нижнего колонтитула', - 'sub_title' => 'подзаголовок', - 'Введение' => 'Введение', - 'copyright_settings' => 'настройки авторских прав', + //footer + 'footer_edit' => 'редактор нижнего колонтитула', + 'sub_title' => 'подзаголовок', + 'Введение' => 'Введение', + 'copyright_settings' => 'настройки авторских прав', ]; diff --git a/resources/lang/ru/admin/category.php b/resources/lang/ru/admin/category.php index 135dd293..58733f34 100644 --- a/resources/lang/ru/admin/category.php +++ b/resources/lang/ru/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'категория', - 'edit_category' => 'Изменить категорию', - 'upper_category' => 'категория', + 'index' => 'категория', + 'edit_category' => 'Изменить категорию', + 'upper_category' => 'категория', - 'categories_index' => 'список категорий', + 'categories_index' => 'список категорий', 'categories_create' => 'Создать категории', - 'categories_show' => 'детали категории', + 'categories_show' => 'детали категории', 'categories_update' => 'Обновить категории', 'categories_delete' => 'Удалить категорию', ]; diff --git a/resources/lang/ru/admin/common.php b/resources/lang/ru/admin/common.php index 5bca8511..2eabc86f 100644 --- a/resources/lang/ru/admin/common.php +++ b/resources/lang/ru/admin/common.php @@ -10,65 +10,65 @@ */ return [ - 'admin_panel' => 'Закулисное управление', - 'edit' => 'редактировать', - 'status' => 'статус', - 'action' => 'действие', - 'install' => 'установить', - 'uninstall' => 'удалить', + 'admin_panel' => 'Закулисное управление', + 'edit' => 'редактировать', + 'status' => 'статус', + 'action' => 'действие', + 'install' => 'установить', + 'uninstall' => 'удалить', // errors - 'forbidden' => 'Нет доступа', - 'has_no_permission' => 'У вас нет разрешения на доступ к этой странице, обратитесь к системному администратору.', + 'forbidden' => 'Нет доступа', + 'has_no_permission' => 'У вас нет разрешения на доступ к этой странице, обратитесь к системному администратору.', // header - 'home' => 'Управление домашней страницей', - 'order' => 'управление заказами', - 'rma' => 'управление послепродажным обслуживанием', - 'rma_reason' => 'Управление причинами возврата', - 'product' => 'управление продуктом', - 'brand' => 'управление брендом', - 'category' => 'управление категориями', - 'customer_group' => 'управление группой клиентов', - 'customer' => 'управление клиентами', - 'content' => 'управление контентом', - 'setting' => 'системные настройки', - 'plugin' => 'управление плагинами', - 'admin_user' => 'бэкенд-пользователь', - 'admin_role' => 'роль пользователя', - 'region' => 'группировка регионов', - 'tax_rate' => 'управление налоговой ставкой', - 'tax_class' => 'управление налогами', - 'currency' => 'управление валютой', - 'language' => 'управление языком', - 'zone' => 'управление провинциями', - 'country' => 'управление страной', - 'file_manager' => 'файловый менеджер', - 'access_frontend' => 'Доступ к внешнему интерфейсу', + 'home' => 'Управление домашней страницей', + 'order' => 'управление заказами', + 'rma' => 'управление послепродажным обслуживанием', + 'rma_reason' => 'Управление причинами возврата', + 'product' => 'управление продуктом', + 'brand' => 'управление брендом', + 'category' => 'управление категориями', + 'customer_group' => 'управление группой клиентов', + 'customer' => 'управление клиентами', + 'content' => 'управление контентом', + 'setting' => 'системные настройки', + 'plugin' => 'управление плагинами', + 'admin_user' => 'бэкенд-пользователь', + 'admin_role' => 'роль пользователя', + 'region' => 'группировка регионов', + 'tax_rate' => 'управление налоговой ставкой', + 'tax_class' => 'управление налогами', + 'currency' => 'управление валютой', + 'language' => 'управление языком', + 'zone' => 'управление провинциями', + 'country' => 'управление страной', + 'file_manager' => 'файловый менеджер', + 'access_frontend' => 'Доступ к внешнему интерфейсу', // sidebar - 'settings_index' => 'системные настройки', - 'admin_users_index' => 'фоновый пользователь', - 'plugins_index' => 'список плагинов', - 'regions_index' => 'группировка регионов', - 'tax_rates_index' => 'настройки ставки налога', - 'tax_classes_index' => 'налоговая категория', - 'currencies_index' => 'управление валютой', - 'languages_index' => 'управление языками', - 'design_index' => 'Украшение дома', - 'pages_index' => 'информационная страница', - 'design_footer_index' => 'украшение нижнего колонтитула', - 'design_menu_index' => 'Конфигурация навигации', - 'categories_index' => 'категория товара', - 'products_index' => 'товарный менеджмент', - 'products_trashed' => 'корзина', - 'customers_trashed' => 'корзина', - 'brands_index' => 'бренд продукта', - 'orders_index' => 'Список заказа', - 'rmas_index' => 'Послепродажное управление', - 'rma_reasons_index' => 'Причина послепродажного обслуживания', - 'customers_index' => 'Список клиентов', + 'settings_index' => 'системные настройки', + 'admin_users_index' => 'фоновый пользователь', + 'plugins_index' => 'список плагинов', + 'regions_index' => 'группировка регионов', + 'tax_rates_index' => 'настройки ставки налога', + 'tax_classes_index' => 'налоговая категория', + 'currencies_index' => 'управление валютой', + 'languages_index' => 'управление языками', + 'design_index' => 'Украшение дома', + 'pages_index' => 'информационная страница', + 'design_footer_index' => 'украшение нижнего колонтитула', + 'design_menu_index' => 'Конфигурация навигации', + 'categories_index' => 'категория товара', + 'products_index' => 'товарный менеджмент', + 'products_trashed' => 'корзина', + 'customers_trashed' => 'корзина', + 'brands_index' => 'бренд продукта', + 'orders_index' => 'Список заказа', + 'rmas_index' => 'Послепродажное управление', + 'rma_reasons_index' => 'Причина послепродажного обслуживания', + 'customers_index' => 'Список клиентов', 'customer_groups_index' => 'группа клиентов', - 'countries_index' => 'Государственное управление', - 'zones_index' => 'Управление провинции', + 'countries_index' => 'Государственное управление', + 'zones_index' => 'Управление провинции', ]; diff --git a/resources/lang/ru/admin/country.php b/resources/lang/ru/admin/country.php index 562041f5..8854c677 100644 --- a/resources/lang/ru/admin/country.php +++ b/resources/lang/ru/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => 'Имя страны', + 'country_name' => 'Имя страны', - 'countries_index' => 'список стран', + 'countries_index' => 'список стран', 'countries_create' => 'создать страну', 'countries_update' => 'обновить страну', ]; diff --git a/resources/lang/ru/admin/currency.php b/resources/lang/ru/admin/currency.php index 46764505..d70c47f7 100644 --- a/resources/lang/ru/admin/currency.php +++ b/resources/lang/ru/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => 'Список валют', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => 'Список валют', 'currencies_create' => 'Создать валюту', - 'currencies_show' => 'Детали валюты', + 'currencies_show' => 'Детали валюты', 'currencies_update' => 'обновить валюту', 'currencies_delete' => 'удалить валюту', ]; diff --git a/resources/lang/ru/admin/customer.php b/resources/lang/ru/admin/customer.php index a120031f..35fac3e9 100644 --- a/resources/lang/ru/admin/customer.php +++ b/resources/lang/ru/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => 'Список клиентов', - 'customers_create' => 'Создать клиента', - 'customers_show' => 'Сведения о клиенте', - 'customers_update' => 'обновить клиента', - 'customers_delete' => 'удалить клиента', + 'customers_index' => 'Список клиентов', + 'customers_create' => 'Создать клиента', + 'customers_show' => 'Сведения о клиенте', + 'customers_update' => 'обновить клиента', + 'customers_delete' => 'удалить клиента', - 'user_info' => 'Информация о пользователе', - 'address_management' => 'управление адресами', - 'user_name' => 'имя пользователя', - 'password_info' => 'Оставьте пустым, чтобы сохранить исходный пароль без изменений.', - 'add_address' => 'Добавить адрес', - 'no_address' => 'Текущий счет не имеет адреса', - 'edit_address' => 'Изменить адрес', - 'address' => 'адрес', - 'choose_country' => 'Выберите страну', - 'zones' => 'провинция', - 'choose_zones' => 'выберите провинцию', - 'enter_city' => 'войти в город', - 'city' => 'Город', - 'zipcode' => 'почтовый индекс', - 'address_1' => 'Адрес 1', - 'address_2' => 'Адрес 2', + 'user_info' => 'Информация о пользователе', + 'address_management' => 'управление адресами', + 'user_name' => 'имя пользователя', + 'password_info' => 'Оставьте пустым, чтобы сохранить исходный пароль без изменений.', + 'add_address' => 'Добавить адрес', + 'no_address' => 'Текущий счет не имеет адреса', + 'edit_address' => 'Изменить адрес', + 'address' => 'адрес', + 'choose_country' => 'Выберите страну', + 'zones' => 'провинция', + 'choose_zones' => 'выберите провинцию', + 'enter_city' => 'войти в город', + 'city' => 'Город', + 'zipcode' => 'почтовый индекс', + 'address_1' => 'Адрес 1', + 'address_2' => 'Адрес 2', - 'cannot_delete_root' => 'Не могу удалить учетную запись root', - 'error_email' => 'Пожалуйста, введите правильный формат электронной почты', + 'cannot_delete_root' => 'Не могу удалить учетную запись root', + 'error_email' => 'Пожалуйста, введите правильный формат электронной почты', 'confirm_delete_address' => 'Вы уверены, что хотите удалить адрес?', ]; diff --git a/resources/lang/ru/admin/customer_group.php b/resources/lang/ru/admin/customer_group.php index e94997fd..97d07143 100644 --- a/resources/lang/ru/admin/customer_group.php +++ b/resources/lang/ru/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => 'группа клиентов', - 'consumption_limit' => 'лимит потребления', - 'discount_rate' => 'Учетная ставка', - 'reward_points_factor' => 'Фактор бонусных баллов', - 'integral_factor' => 'Используйте интегральный коэффициент', + 'index' => 'группа клиентов', + 'consumption_limit' => 'лимит потребления', + 'discount_rate' => 'Учетная ставка', + 'reward_points_factor' => 'Фактор бонусных баллов', + 'integral_factor' => 'Используйте интегральный коэффициент', - 'customer_groups_index' => 'список групп клиентов', + 'customer_groups_index' => 'список групп клиентов', 'customer_groups_create' => 'Создать группу клиентов', - 'customer_groups_show' => 'Детали группы клиентов', + 'customer_groups_show' => 'Детали группы клиентов', 'customer_groups_update' => 'Обновить группу клиентов', 'customer_groups_delete' => 'удалить группу клиентов', - 'default_cannot_delete' => 'Группа клиентов по умолчанию не может быть удалена', + 'default_cannot_delete' => 'Группа клиентов по умолчанию не может быть удалена', ]; diff --git a/resources/lang/ru/admin/dashboard.php b/resources/lang/ru/admin/dashboard.php index e9e892c1..1e606c73 100644 --- a/resources/lang/ru/admin/dashboard.php +++ b/resources/lang/ru/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => 'посещения пользователей', - 'order_total' => 'сумма заказа', - 'customer_new' => 'Добавить пользователя', - 'order_amount' => 'Продажи', - 'yesterday' => 'вчера', - 'day_before' => 'за день до', + 'order_total' => 'сумма заказа', + 'customer_new' => 'Добавить пользователя', + 'order_amount' => 'Продажи', + 'yesterday' => 'вчера', + 'day_before' => 'за день до', - 'order_report' => 'статистика заказов', - 'latest_month' => 'месяц', - 'latest_week' => 'неделя', - 'latest_year' => 'один год', + 'order_report' => 'статистика заказов', + 'latest_month' => 'месяц', + 'latest_week' => 'неделя', + 'latest_year' => 'один год', ]; diff --git a/resources/lang/ru/admin/design_builder.php b/resources/lang/ru/admin/design_builder.php index 6260d8e9..e6880981 100644 --- a/resources/lang/ru/admin/design_builder.php +++ b/resources/lang/ru/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => 'модуль бренда', - 'module_banner' => 'баннерный модуль', + 'module_brand' => 'модуль бренда', + 'module_banner' => 'баннерный модуль', 'module_four_image_pro' => 'Четыре картинки в одну строку PRO', - 'module_slideshow' => 'модуль слайд-шоу', - 'module_tab_products' => 'элемент вкладки', + 'module_slideshow' => 'модуль слайд-шоу', + 'module_tab_products' => 'элемент вкладки', ]; diff --git a/resources/lang/ru/admin/file_manager.php b/resources/lang/ru/admin/file_manager.php index d7686709..cd422d4d 100644 --- a/resources/lang/ru/admin/file_manager.php +++ b/resources/lang/ru/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => 'создать каталог/файл', - 'file_manager_show' => 'Просмотр каталога/файла', - 'file_manager_update' => 'Переименовать', - 'file_manager_delete' => 'удалить каталог/файл', + 'file_manager_create' => 'создать каталог/файл', + 'file_manager_show' => 'Просмотр каталога/файла', + 'file_manager_update' => 'Переименовать', + 'file_manager_delete' => 'удалить каталог/файл', 'directory_already_exist' => 'каталог уже существует', - 'directory_not_empty' => 'Каталог не пуст', - 'target_not_exist' => 'Исходный файл или папка не существует', - 'create_folder' => 'Создать папку', - 'rename' => 'Переименовать', - 'download' => 'скачать', - 'upload_files' => 'загрузить файлы', - 'click_upload' => 'Нажмите загрузить или перетащите изображение сюда', - 'image_uploading' => 'загрузка изображения', - 'no_file' => 'Нет файла', - 'picture_space' => 'картина пространство', - 'show_pc' => 'пожалуйста, перейдите на ПК к оператору', + 'directory_not_empty' => 'Каталог не пуст', + 'target_not_exist' => 'Исходный файл или папка не существует', + 'create_folder' => 'Создать папку', + 'rename' => 'Переименовать', + 'download' => 'скачать', + 'upload_files' => 'загрузить файлы', + 'click_upload' => 'Нажмите загрузить или перетащите изображение сюда', + 'image_uploading' => 'загрузка изображения', + 'no_file' => 'Нет файла', + 'picture_space' => 'картина пространство', + 'show_pc' => 'пожалуйста, перейдите на ПК к оператору', - 'confirm_delete_file' => 'Вы хотите удалить выбранный файл', - 'confirm_delete_folder' => 'Выполняется операция удаления папки, все файлы в папке будут удалены, подтвердить?', - 'new_folder' => 'новая папка', - 'can_empty' => 'Не может быть пустым', - 'finish' => 'Заканчивать', - 'uploading' => 'загрузка', - 'file_manager' => 'Менеджер изображений', + 'confirm_delete_file' => 'Вы хотите удалить выбранный файл', + 'confirm_delete_folder' => 'Выполняется операция удаления папки, все файлы в папке будут удалены, подтвердить?', + 'new_folder' => 'новая папка', + 'can_empty' => 'Не может быть пустым', + 'finish' => 'Заканчивать', + 'uploading' => 'загрузка', + 'file_manager' => 'Менеджер изображений', ]; diff --git a/resources/lang/ru/admin/language.php b/resources/lang/ru/admin/language.php index 4c52a543..13d1a0fa 100644 --- a/resources/lang/ru/admin/language.php +++ b/resources/lang/ru/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => 'список языков', - 'languages_create' => 'создать язык', - 'languages_show' => 'детали языка', - 'languages_update' => 'обновить язык', - 'languages_delete' => 'удалить язык', + 'languages_index' => 'список языков', + 'languages_create' => 'создать язык', + 'languages_show' => 'детали языка', + 'languages_update' => 'обновить язык', + 'languages_delete' => 'удалить язык', 'error_default_language_cannot_delete' => 'Язык по умолчанию удалить нельзя! ', - 'help_install' => 'Примечание. Чтобы установить новый язык, вам необходимо настроить продукты, категории, навигацию, модули домашней страницы, нижние колонтитулы и т. д. соответствующего языка, иначе страницы будут отображаться некорректно', + 'help_install' => 'Примечание. Чтобы установить новый язык, вам необходимо настроить продукты, категории, навигацию, модули домашней страницы, нижние колонтитулы и т. д. соответствующего языка, иначе страницы будут отображаться некорректно', ]; diff --git a/resources/lang/ru/admin/login.php b/resources/lang/ru/admin/login.php index 8805b3df..dab915e6 100644 --- a/resources/lang/ru/admin/login.php +++ b/resources/lang/ru/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => '登录到 BeikeShop 后台', - 'log_in' => '登录', + 'log_in' => '登录', ]; diff --git a/resources/lang/ru/admin/marketing.php b/resources/lang/ru/admin/marketing.php index 674044fe..89d08c98 100644 --- a/resources/lang/ru/admin/marketing.php +++ b/resources/lang/ru/admin/marketing.php @@ -10,16 +10,16 @@ */ return [ - 'marketing_list' => 'рынок плагинов', - 'marketing_show' => 'детали плагина', - 'set_token' => 'Установить токен', - 'get_token' => 'Получить токен', - 'download_count' => 'количество загрузок', - 'last_update' => 'последнее обновление', - 'text_version' => 'версия', - 'text_compatibility' => 'совместимость', - 'text_author' => 'автор плагина', - 'download_plugin' => 'скачать плагин', + 'marketing_list' => 'рынок плагинов', + 'marketing_show' => 'детали плагина', + 'set_token' => 'Установить токен', + 'get_token' => 'Получить токен', + 'download_count' => 'количество загрузок', + 'last_update' => 'последнее обновление', + 'text_version' => 'версия', + 'text_compatibility' => 'совместимость', + 'text_author' => 'автор плагина', + 'download_plugin' => 'скачать плагин', 'download_description' => 'Описание плагина', - 'text_free' => 'бесплатно', + 'text_free' => 'бесплатно', ]; diff --git a/resources/lang/ru/admin/order.php b/resources/lang/ru/admin/order.php index 75b93628..85986108 100644 --- a/resources/lang/ru/admin/order.php +++ b/resources/lang/ru/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => 'список заказов', + 'list' => 'список заказов', - 'order_quantity' => 'количество заказа', - 'order_amount' => 'сумма заказа', - 'orders_index' => 'список заказов', - 'orders_create' => 'создать заказ', - 'orders_show' => 'детали заказа', - 'orders_export' => 'экспорт заказов', - 'notify' => 'Напомнить ли', - 'orders_update' => 'обновить заказ', - 'orders_delete' => 'удалить заказ', + 'order_quantity' => 'количество заказа', + 'order_amount' => 'сумма заказа', + 'orders_index' => 'список заказов', + 'orders_create' => 'создать заказ', + 'orders_show' => 'детали заказа', + 'orders_export' => 'экспорт заказов', + 'notify' => 'Напомнить ли', + 'orders_update' => 'обновить заказ', + 'orders_delete' => 'удалить заказ', 'orders_update_status' => 'обновить статус', - 'error_status' => 'Выберите статус', + 'error_status' => 'Выберите статус', ]; diff --git a/resources/lang/ru/admin/page.php b/resources/lang/ru/admin/page.php index 54066fd9..1a4fe99a 100644 --- a/resources/lang/ru/admin/page.php +++ b/resources/lang/ru/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'информационная страница', - 'info_title' => 'заголовок информации', + 'index' => 'информационная страница', + 'info_title' => 'заголовок информации', 'info_content' => 'контент', - 'pages_index' => 'Список одной страницы', + 'pages_index' => 'Список одной страницы', 'pages_create' => 'Создать одну страницу', - 'pages_show' => 'Подробности одной страницы', + 'pages_show' => 'Подробности одной страницы', 'pages_update' => 'Редактирование одной страницы', - 'pages_delete' => 'Удалить одну страницу' + 'pages_delete' => 'Удалить одну страницу', ]; diff --git a/resources/lang/ru/admin/plugin.php b/resources/lang/ru/admin/plugin.php index 6fe53495..3d582489 100644 --- a/resources/lang/ru/admin/plugin.php +++ b/resources/lang/ru/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => 'список плагинов', - 'plugins_import' => 'Загрузить плагин', - 'plugins_show' => 'детали плагинов', - 'plugins_update' => 'обновление плагинов', + 'plugins_index' => 'список плагинов', + 'plugins_import' => 'Загрузить плагин', + 'plugins_show' => 'детали плагинов', + 'plugins_update' => 'обновление плагинов', 'plugins_update_status' => 'статус обновления', - 'plugins_install' => 'Установить', - 'plugins_uninstall' => 'удалить', + 'plugins_install' => 'Установить', + 'plugins_uninstall' => 'удалить', - 'plugin_list' => 'Список плагинов', - 'plugin_code' => 'код плагина', - 'plugin_type' => 'Тип плагина', - 'plugin_description' => 'Описание плагина', - 'plugin_upload' => 'Загрузить плагин (поддерживаются только zip-файлы)', + 'plugin_list' => 'Список плагинов', + 'plugin_code' => 'код плагина', + 'plugin_type' => 'Тип плагина', + 'plugin_description' => 'Описание плагина', + 'plugin_upload' => 'Загрузить плагин (поддерживаются только zip-файлы)', - 'shipping' => 'способ доставки', - 'payment' => 'метод оплаты', - 'total' => 'Расчет заказа', - 'view' => 'модификация страницы', + 'shipping' => 'способ доставки', + 'payment' => 'метод оплаты', + 'total' => 'Расчет заказа', + 'view' => 'модификация страницы', ]; diff --git a/resources/lang/ru/admin/product.php b/resources/lang/ru/admin/product.php index 68fdb8f7..ce69e5e8 100644 --- a/resources/lang/ru/admin/product.php +++ b/resources/lang/ru/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => 'список товаров', - 'products_create' => 'создать товары', - 'products_show' => 'Подробнее о продукте', - 'products_update' => 'обновить товары', - 'products_delete' => 'удалить товар', - 'products_trashed' => 'корзина', - 'products_restore' => 'Восстановить корзину', - 'clear_restore' => 'очистить корзину', + 'products_index' => 'список товаров', + 'products_create' => 'создать товары', + 'products_show' => 'Подробнее о продукте', + 'products_update' => 'обновить товары', + 'products_delete' => 'удалить товар', + 'products_trashed' => 'корзина', + 'products_restore' => 'Восстановить корзину', + 'clear_restore' => 'очистить корзину', + 'batch_delete' => 'пакетное удаление', + 'batch_active' => 'список партий', + 'batch_inactive' => 'Серийная партия', - 'batch_delete' => 'пакетное удаление', - 'batch_active' => 'список партий', - 'batch_inactive' => 'Серийная партия', + 'basic_information' => 'основная информация', + 'product_details' => 'Подробнее о продукте', + 'product_relations' => 'сопутствующие товары', + 'stocks' => 'инвентаризация товаров', + 'model' => 'модель', + 'price' => 'цена', + 'origin_price' => 'исходная цена', + 'cost_price' => 'себестоимость', + 'quantity' => 'количество', + 'enable_multi_spec' => 'Включить несколько спецификаций', + 'image_help' => 'Первое изображение будет использоваться как основное изображение товара, при этом одновременно можно загружать несколько изображений, а положение нескольких изображений можно регулировать по желанию', + 'add_variable' => 'добавить характеристики', + 'add_variable_value' => 'Добавить значение спецификации', + 'add_variable_image' => 'Добавить изображение спецификации', + 'default_main_product' => 'Основной продукт по умолчанию', + 'modify_order' => 'Дважды щелкните, чтобы изменить, перетащите, чтобы настроить порядок', - 'basic_information' => 'основная информация', - 'product_details' => 'Подробнее о продукте', - 'product_relations' => 'сопутствующие товары', - 'stocks' => 'инвентаризация товаров', - 'model' => 'модель', - 'price' => 'цена', - 'origin_price' => 'исходная цена', - 'cost_price' => 'себестоимость', - 'quantity' => 'количество', - 'enable_multi_spec' => 'Включить несколько спецификаций', - 'image_help' => 'Первое изображение будет использоваться как основное изображение товара, при этом одновременно можно загружать несколько изображений, а положение нескольких изображений можно регулировать по желанию', - 'add_variable' => 'добавить характеристики', - 'add_variable_value' => 'Добавить значение спецификации', - 'add_variable_image' => 'Добавить изображение спецификации', - 'default_main_product' => 'Основной продукт по умолчанию', - 'modify_order' => 'Дважды щелкните, чтобы изменить, перетащите, чтобы настроить порядок', - - 'confirm_batch_product' => 'Вы уверены, что хотите удалить выбранные элементы сразу?', - 'confirm_batch_status' => 'Вы уверены, что хотите массово изменить статус выбранных элементов?', - 'confirm_batch_restore' => 'Вы уверены, что хотите восстановить выбранный элемент?', + 'confirm_batch_product' => 'Вы уверены, что хотите удалить выбранные элементы сразу?', + 'confirm_batch_status' => 'Вы уверены, что хотите массово изменить статус выбранных элементов?', + 'confirm_batch_restore' => 'Вы уверены, что хотите восстановить выбранный элемент?', 'confirm_delete_restore' => 'Вы уверены, что хотите очистить корзину?', ]; diff --git a/resources/lang/ru/admin/region.php b/resources/lang/ru/admin/region.php index 7312fde8..d6234c49 100644 --- a/resources/lang/ru/admin/region.php +++ b/resources/lang/ru/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => 'территориальная группа', - 'regions_index' => 'Список групп зон', + 'index' => 'территориальная группа', + 'regions_index' => 'Список групп зон', 'regions_create' => 'Создайте группу зон', - 'regions_show' => 'Сведения о группе областей', + 'regions_show' => 'Сведения о группе областей', 'regions_update' => 'Обновить группу зон', 'regions_delete' => 'удалить группу полей', - 'name' => 'имя', - 'describe' => 'описывать', - 'country' => 'нация', - 'zone' => 'провинция', + 'name' => 'имя', + 'describe' => 'описывать', + 'country' => 'нация', + 'zone' => 'провинция', ]; diff --git a/resources/lang/ru/admin/rma.php b/resources/lang/ru/admin/rma.php index 1a9c867a..a3e2bd53 100644 --- a/resources/lang/ru/admin/rma.php +++ b/resources/lang/ru/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => 'Послепродажное приложение', + 'index' => 'Послепродажное приложение', - 'rmas_index' => 'Список послепродажного обслуживания', - 'rmas_show' => 'Детали послепродажного обслуживания', - 'rmas_update' => 'Обновление послепродажного обслуживания', - 'rmas_delete' => 'удалить послепродажное обслуживание', + 'rmas_index' => 'Список послепродажного обслуживания', + 'rmas_show' => 'Детали послепродажного обслуживания', + 'rmas_update' => 'Обновление послепродажного обслуживания', + 'rmas_delete' => 'удалить послепродажное обслуживание', - 'customers_name' => 'имя клиента', - 'quantity' => 'количество', - 'service_type' => 'Тип Обслуживания', - 'rma_details' => 'Детали послепродажного обслуживания', - 'reasons_return' => 'причины возвращения', - 'current_state' => 'Текущее состояние', - 'modify_status' => 'Изменить статус', - 'remarks' => 'Примечания', - 'update_status' => 'обновить состояние', + 'customers_name' => 'имя клиента', + 'quantity' => 'количество', + 'service_type' => 'Тип Обслуживания', + 'rma_details' => 'Детали послепродажного обслуживания', + 'reasons_return' => 'причины возвращения', + 'current_state' => 'Текущее состояние', + 'modify_status' => 'Изменить статус', + 'remarks' => 'Примечания', + 'update_status' => 'обновить состояние', 'operation_history' => 'История операций', ]; diff --git a/resources/lang/ru/admin/rma_reason.php b/resources/lang/ru/admin/rma_reason.php index 6f0e641e..ed4e5ac8 100644 --- a/resources/lang/ru/admin/rma_reason.php +++ b/resources/lang/ru/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => 'список причин', + 'rma_reasons_index' => 'список причин', 'rma_reasons_create' => 'причина создания', 'rma_reasons_update' => 'причина обновления', - 'rma_reasons_delete' => 'удалить причину' + 'rma_reasons_delete' => 'удалить причину', ]; diff --git a/resources/lang/ru/admin/role.php b/resources/lang/ru/admin/role.php index 0a47e053..c5a98e50 100644 --- a/resources/lang/ru/admin/role.php +++ b/resources/lang/ru/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => 'список ролей', - 'admin_roles_create' => 'Создать роли', - 'admin_roles_show' => 'детали ролей', - 'admin_roles_update' => 'обновить роли', - 'admin_roles_delete' => 'удалить роль', - 'select_one_at_least' => 'Разрешения не могут быть пустыми, выберите хотя бы одно' + 'admin_roles_index' => 'список ролей', + 'admin_roles_create' => 'Создать роли', + 'admin_roles_show' => 'детали ролей', + 'admin_roles_update' => 'обновить роли', + 'admin_roles_delete' => 'удалить роль', + 'select_one_at_least' => 'Разрешения не могут быть пустыми, выберите хотя бы одно', ]; diff --git a/resources/lang/ru/admin/setting.php b/resources/lang/ru/admin/setting.php index 0c38df5d..3253301b 100644 --- a/resources/lang/ru/admin/setting.php +++ b/resources/lang/ru/admin/setting.php @@ -10,61 +10,61 @@ */ return [ - 'index' => 'системные настройки', - 'settings_index' => 'Просмотр настроек системы', - 'settings_update' => 'Изменить системные настройки', - 'design_index' => 'Домашний редактор', - 'design_footer_index' => 'Редактор нижнего колонтитула', - 'design_menu_index' => 'Редактор навигации', - 'product_per_page' => 'Количество товаров, отображаемых на каждой странице', + 'index' => 'системные настройки', + 'settings_index' => 'Просмотр настроек системы', + 'settings_update' => 'Изменить системные настройки', + 'design_index' => 'Домашний редактор', + 'design_footer_index' => 'Редактор нижнего колонтитула', + 'design_menu_index' => 'Редактор навигации', + 'product_per_page' => 'Количество товаров, отображаемых на каждой странице', - '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` в виде журнала', + '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' => 'адресс доставки', - 'payment_address' => 'Адрес для выставления счета', - 'meta_title' => 'Мета-заголовок', - 'meta_description' => 'Мета-описание', - 'meta_keywords' => 'Мета-ключевые слова', - 'telephone' => 'Контактный номер', - 'email' => 'Почта', - 'default_address' => 'адрес по умолчанию', - 'default_country_set' => 'Настройка страны по умолчанию', - 'default_zone_set' => 'Настройки провинции по умолчанию', - 'default_language' => 'язык по умолчанию', - 'default_currency' => 'валюта по умолчанию', + 'guest_checkout' => 'оформить заказ посетителя', + 'theme_default' => 'Тема по умолчанию', + 'theme_black' => 'черная тема', + 'shipping_address' => 'адресс доставки', + 'payment_address' => 'Адрес для выставления счета', + 'meta_title' => 'Мета-заголовок', + 'meta_description' => 'Мета-описание', + 'meta_keywords' => 'Мета-ключевые слова', + 'telephone' => 'Контактный номер', + 'email' => 'Почта', + 'default_address' => 'адрес по умолчанию', + 'default_country_set' => 'Настройка страны по умолчанию', + 'default_zone_set' => 'Настройки провинции по умолчанию', + 'default_language' => 'язык по умолчанию', + 'default_currency' => 'валюта по умолчанию', 'default_customer_group' => 'Группа клиентов по умолчанию', - 'admin_name' => 'внутренний каталог', - 'admin_name_info' => 'Фоновый каталог управления, по умолчанию admin', - 'enable_tax' => 'Включить налоги', - 'enable_tax_info' => 'Включить ли расчет налога', - 'tax_address' => 'налоговый адрес', - 'tax_address_info' => 'По какому адресу рассчитывается налог?', - 'logo' => 'логотип сайта', - 'favicon' => 'фавикон', - 'favicon_info' => 'Маленькая иконка, отображаемая на вкладке браузера, должна быть в формате PNG, размер: 32*32.', - 'placeholder_image' => 'карта-заполнитель', + 'admin_name' => 'внутренний каталог', + 'admin_name_info' => 'Фоновый каталог управления, по умолчанию admin', + 'enable_tax' => 'Включить налоги', + 'enable_tax_info' => 'Включить ли расчет налога', + 'tax_address' => 'налоговый адрес', + 'tax_address_info' => 'По какому адресу рассчитывается налог?', + 'logo' => 'логотип сайта', + 'favicon' => 'фавикон', + 'favicon_info' => 'Маленькая иконка, отображаемая на вкладке браузера, должна быть в формате PNG, размер: 32*32.', + 'placeholder_image' => 'карта-заполнитель', 'placeholder_image_info' => 'Изображение-заполнитель, отображаемое, когда изображение отсутствует или изображение не найдено, рекомендуемый размер: 500*500', - 'head_code' => 'вставить код', - 'head_code_info' => 'Код из поля ввода будет вставлен в шапку страницы интерфейса, что можно использовать для подсчета кода или добавления специальных плагинов и т.д.', + 'head_code' => 'вставить код', + 'head_code_info' => 'Код из поля ввода будет вставлен в шапку страницы интерфейса, что можно использовать для подсчета кода или добавления специальных плагинов и т.д.', ]; diff --git a/resources/lang/ru/admin/tax_class.php b/resources/lang/ru/admin/tax_class.php index 3aaacdec..ab4cc0c3 100644 --- a/resources/lang/ru/admin/tax_class.php +++ b/resources/lang/ru/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => 'налоговая категория', - 'rule' => 'правило', - 'based_on' => 'основанный на', - 'priority' => 'приоритет', - 'tax_classes_index' => 'список налоговых классов', + 'index' => 'налоговая категория', + 'rule' => 'правило', + 'based_on' => 'основанный на', + 'priority' => 'приоритет', + 'tax_classes_index' => 'список налоговых классов', 'tax_classes_create' => 'Создать налоговые классы', - 'tax_classes_show' => 'детали налогового класса', + 'tax_classes_show' => 'детали налогового класса', 'tax_classes_update' => 'Обновить налоговые классы', 'tax_classes_delete' => 'удалить налоговый класс', ]; diff --git a/resources/lang/ru/admin/tax_rate.php b/resources/lang/ru/admin/tax_rate.php index 0451b144..9ced0eef 100644 --- a/resources/lang/ru/admin/tax_rate.php +++ b/resources/lang/ru/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => 'настройки налоговой ставки', + 'index' => 'настройки налоговой ставки', 'tax_classes_index' => 'налоговые настройки', - 'tax' => 'налог', - 'tax_rate' => 'ставка налога', - 'type' => 'тип', - 'area' => 'область', - 'percentage' => 'процент', - 'fixed_tax_rate' => 'фиксированная налоговая ставка', - 'tax_rates_index' => 'Список налоговых ставок', - 'tax_rates_create' => 'Создание налоговых ставок', - 'tax_rates_show' => 'Налоговая информация', - 'tax_rates_update' => 'Обновить налоговую ставку', - 'tax_rates_delete' => 'удалить налоговую ставку', + 'tax' => 'налог', + 'tax_rate' => 'ставка налога', + 'type' => 'тип', + 'area' => 'область', + 'percentage' => 'процент', + 'fixed_tax_rate' => 'фиксированная налоговая ставка', + 'tax_rates_index' => 'Список налоговых ставок', + 'tax_rates_create' => 'Создание налоговых ставок', + 'tax_rates_show' => 'Налоговая информация', + 'tax_rates_update' => 'Обновить налоговую ставку', + 'tax_rates_delete' => 'удалить налоговую ставку', ]; diff --git a/resources/lang/ru/admin/user.php b/resources/lang/ru/admin/user.php index 27ee1b0b..28351518 100644 --- a/resources/lang/ru/admin/user.php +++ b/resources/lang/ru/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => 'список пользователей', - 'admin_users_create' => 'Создать пользователя', - 'admin_users_show' => 'Сведения о пользователе', - 'admin_users_update' => 'обновить пользователей', - 'admin_users_delete' => 'удалить пользователя', + 'admin_users_index' => 'список пользователей', + 'admin_users_create' => 'Создать пользователя', + 'admin_users_show' => 'Сведения о пользователе', + 'admin_users_update' => 'обновить пользователей', + 'admin_users_delete' => 'удалить пользователя', 'verify_code_expired' => 'Срок действия вашего кода подтверждения истек (10 минут), получите его еще раз', - 'verify_code_error' => 'Ваш код подтверждения неверен', - 'account_not_exist' => 'аккаунт не существует', + 'verify_code_error' => 'Ваш код подтверждения неверен', + 'account_not_exist' => 'аккаунт не существует', ]; diff --git a/resources/lang/ru/admin/zone.php b/resources/lang/ru/admin/zone.php index 1380f80c..2419f5fb 100644 --- a/resources/lang/ru/admin/zone.php +++ b/resources/lang/ru/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => 'название провинции', + 'zone_name' => 'название провинции', 'country_of_origin' => 'страна происхождения', - 'zones_index' => 'список провинций', - 'zones_create' => 'создать провинцию', - 'zones_update' => 'обновить провинцию', - 'zones_delete' => 'Удалить провинцию', + 'zones_index' => 'список провинций', + 'zones_create' => 'создать провинцию', + 'zones_update' => 'обновить провинцию', + 'zones_delete' => 'Удалить провинцию', - 'error_country' => 'Выберите страну', + 'error_country' => 'Выберите страну', ]; diff --git a/resources/lang/ru/brand.php b/resources/lang/ru/brand.php index 2873bf07..59b8500f 100644 --- a/resources/lang/ru/brand.php +++ b/resources/lang/ru/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => 'торговая марка', - 'icon' => 'значок', + 'name' => 'торговая марка', + 'icon' => 'значок', 'first_letter' => 'Инициалы', ]; diff --git a/resources/lang/ru/cart.php b/resources/lang/ru/cart.php index eb1791be..19595106 100644 --- a/resources/lang/ru/cart.php +++ b/resources/lang/ru/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => 'Количество покупок', + 'sku_id' => 'SKU ID', + 'quantity' => 'Количество покупок', 'stock_out' => 'Нехватка инвентаря', ]; diff --git a/resources/lang/ru/common.php b/resources/lang/ru/common.php index 9f5787f7..3e0b9ea2 100644 --- a/resources/lang/ru/common.php +++ b/resources/lang/ru/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => 'Пожалуйста, заполните :имя', // 这个有用别删了，:name 是一个变量 + 'error_required' => 'Пожалуйста, заполните :имя', // 这个有用别删了，:name 是一个变量 'error_input_required' => 'Поле ввода не может быть пустым', - 'error_form' => 'Пожалуйста, проверьте правильность заполнения формы', - 'email' => 'Почта', - 'unauthenticated' => 'Пожалуйста, войдите сначала', - 'success' => 'успех', - 'no_data' => 'Данных пока нет~', - 'empty_items' => 'нет данных', - 'created_success' => 'Создано успешно!', - 'deleted_success' => 'успешно удален!', - 'restored_success' => 'восстановление прошло успешно!', - 'updated_success' => 'обновление завершено!', - 'edit_success' => 'Успешно изменено!', - 'get_success' => 'добиться успеха!', - 'all' => 'все', - 'status' => 'статус', - 'enable' => 'включить', - 'disable' => 'отключить', - 'enabled' => 'включено', - 'disabled' => 'отключено', - 'home' => 'дом', - 'submit' => 'Отправить', - 'title' => 'название', - 'save' => 'сохранить', - 'cancel' => 'Отмена', - 'confirm' => 'подтвердить', - 'no' => 'нет', - 'yes' => 'да', - 'delete' => 'удалить', - 'sign_out' => 'Выйти', - 'contact_us' => 'свяжитесь с нами', - 'input' => 'Введите свой поиск здесь', - 'filter' => 'фильтр', - 'reset' => 'сброс', - 'export' => 'экспорт', - 'edit' => 'редактировать', - 'action' => 'действие', - 'add' => 'Добавить', - 'please_choose' => 'пожалуйста, выберите', - 'recommend_size' => 'рекомендуемый размер', - 'pick_datetime' => 'выберите время', - 'confirm_delete' => 'Вы уверены, что хотите удалить?', - 'text_hint' => 'подсказка', - 'restore' => 'восстановить', - 'name' => 'имя', - 'image' => 'изображение', - 'data' => 'данные', - 'view' => 'просмотр', - 'phone' => 'телефон', - 'exit' => 'выход', - 'return' => 'возврат', - 'language' => 'язык', - 'select_all' => 'выбрать все', - 'sign_out' => 'Выйти', - 'menu' => 'меню', - 'whether_open' => 'открывать ли', - 'to_setting' => 'настроить', + 'error_form' => 'Пожалуйста, проверьте правильность заполнения формы', + 'email' => 'Почта', + 'unauthenticated' => 'Пожалуйста, войдите сначала', + 'success' => 'успех', + 'no_data' => 'Данных пока нет~', + 'empty_items' => 'нет данных', + 'created_success' => 'Создано успешно!', + 'deleted_success' => 'успешно удален!', + 'restored_success' => 'восстановление прошло успешно!', + 'updated_success' => 'обновление завершено!', + 'edit_success' => 'Успешно изменено!', + 'get_success' => 'добиться успеха!', + 'all' => 'все', + 'status' => 'статус', + 'enable' => 'включить', + 'disable' => 'отключить', + 'enabled' => 'включено', + 'disabled' => 'отключено', + 'home' => 'дом', + 'submit' => 'Отправить', + 'title' => 'название', + 'save' => 'сохранить', + 'cancel' => 'Отмена', + 'confirm' => 'подтвердить', + 'no' => 'нет', + 'yes' => 'да', + 'delete' => 'удалить', + 'sign_out' => 'Выйти', + 'contact_us' => 'свяжитесь с нами', + 'input' => 'Введите свой поиск здесь', + 'filter' => 'фильтр', + 'reset' => 'сброс', + 'export' => 'экспорт', + 'edit' => 'редактировать', + 'action' => 'действие', + 'add' => 'Добавить', + 'please_choose' => 'пожалуйста, выберите', + 'recommend_size' => 'рекомендуемый размер', + 'pick_datetime' => 'выберите время', + 'confirm_delete' => 'Вы уверены, что хотите удалить?', + 'text_hint' => 'подсказка', + 'restore' => 'восстановить', + 'name' => 'имя', + 'image' => 'изображение', + 'data' => 'данные', + 'view' => 'просмотр', + 'phone' => 'телефон', + 'exit' => 'выход', + 'return' => 'возврат', + 'language' => 'язык', + 'select_all' => 'выбрать все', + 'sign_out' => 'Выйти', + 'menu' => 'меню', + 'whether_open' => 'открывать ли', + 'to_setting' => 'настроить', - 'id' => 'ID', - 'created_at' => 'время создания', - 'updated_at' => 'измененное время', - 'sort_order' => 'сортировать', - 'error_page' => 'Данные, к которым вы обращались, не существуют или были удалены~', - 'error_page_btn' => 'Вернуться на предыдущую страницу', + 'id' => 'ID', + 'created_at' => 'время создания', + 'updated_at' => 'измененное время', + 'sort_order' => 'сортировать', + 'error_page' => 'Данные, к которым вы обращались, не существуют или были удалены~', + 'error_page_btn' => 'Вернуться на предыдущую страницу', - 'order' => [ - 'unpaid' => 'подлежит оплате', - 'paid' => 'оплачено', - 'shipped' => 'отправлено', + 'order' => [ + 'unpaid' => 'подлежит оплате', + 'paid' => 'оплачено', + 'shipped' => 'отправлено', 'completed' => 'завершено', 'cancelled' => 'Отменено', - ] + ], ]; - - diff --git a/resources/lang/ru/currency.php b/resources/lang/ru/currency.php index e8f7b2ff..963fa57d 100644 --- a/resources/lang/ru/currency.php +++ b/resources/lang/ru/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => 'имя', - 'code' => 'код', - 'icon' => 'значок', - 'symbol_left' => 'левый символ', - 'symbol_right' => 'правильный символ', - 'value' => 'Стоимость обменного курса', - 'decimal_place' => 'Десятичные разряды', + 'name' => 'имя', + 'code' => 'код', + 'icon' => 'значок', + 'symbol_left' => 'левый символ', + 'symbol_right' => 'правильный символ', + 'value' => 'Стоимость обменного курса', + 'decimal_place' => 'Десятичные разряды', ]; diff --git a/resources/lang/ru/customer.php b/resources/lang/ru/customer.php index 126074d4..575e72b7 100644 --- a/resources/lang/ru/customer.php +++ b/resources/lang/ru/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => 'имя', - 'email' => 'Email', - 'from' => 'источник регистрации', + 'name' => 'имя', + 'email' => 'Email', + 'from' => 'источник регистрации', 'customer_group' => 'группа пользователей', ]; diff --git a/resources/lang/ru/customer_group.php b/resources/lang/ru/customer_group.php index 9df3d29f..5152ff0c 100644 --- a/resources/lang/ru/customer_group.php +++ b/resources/lang/ru/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => 'уровень', - 'name' => 'имя группы клиентов', + 'name' => 'имя группы клиентов', ]; diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php index 1a0dde2f..1b22ff38 100644 --- a/resources/lang/ru/mail.php +++ b/resources/lang/ru/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => 'заказ успешно отправлен', - 'order_update' => 'обновление статуса заказа', - 'order_success_info' => 'Ваш заказ успешно отправлен, ниже приведены детали заказа', - 'not_oneself' => 'неличные операции можно игнорировать. ', - 'customer_name' => 'Уважаемый пользователь :name, привет! ', - 'искренне' => 'С уважением', - 'команда' => 'команда', - 'order_update_status' => 'Статус вашего заказа :number обновлен', - 'welcome_register' => 'добро пожаловать на регистрацию', - 'register_end' => 'Завершите регистрацию, нажмите кнопку ниже, чтобы вернуться в торговый центр. ', - 'btn_buy_now' => 'купить сейчас', + 'order_success' => 'заказ успешно отправлен', + 'order_update' => 'обновление статуса заказа', + 'order_success_info' => 'Ваш заказ успешно отправлен, ниже приведены детали заказа', + 'not_oneself' => 'неличные операции можно игнорировать. ', + 'customer_name' => 'Уважаемый пользователь :name, привет! ', + 'искренне' => 'С уважением', + 'команда' => 'команда', + 'order_update_status' => 'Статус вашего заказа :number обновлен', + 'welcome_register' => 'добро пожаловать на регистрацию', + 'register_end' => 'Завершите регистрацию, нажмите кнопку ниже, чтобы вернуться в торговый центр. ', + 'btn_buy_now' => 'купить сейчас', 'retrieve_password_title' => 'получить пароль', - 'retrieve_password_text' => 'Вы восстанавливаете свой пароль, нажмите кнопку ниже, чтобы завершить операцию. ', - 'retrieve_password_btn' => 'Нажмите здесь, чтобы подтвердить адрес электронной почты', + 'retrieve_password_text' => 'Вы восстанавливаете свой пароль, нажмите кнопку ниже, чтобы завершить операцию. ', + 'retrieve_password_btn' => 'Нажмите здесь, чтобы подтвердить адрес электронной почты', ]; diff --git a/resources/lang/ru/order.php b/resources/lang/ru/order.php index 723f50dd..da965c75 100644 --- a/resources/lang/ru/order.php +++ b/resources/lang/ru/order.php @@ -10,45 +10,45 @@ */ return [ - 'id' => 'ID', - 'number' => 'номер заказа', - 'customer_name' => 'имя клиента', - 'payment_method' => 'способ оплаты', - 'email' => 'Email', - 'telephone' => 'Контактный номер', - 'created_at' => 'время создания', - 'updated_at' => 'Время обновления', - 'status' => 'государство', - 'status_format' => 'государство', - 'total' => 'общий заказ', - 'express_number' => 'номер экспресс-заказа', - 'express_company' => 'экспресс-компания', - 'order_shipments' => 'информация об отправке', + 'id' => 'ID', + 'number' => 'номер заказа', + 'customer_name' => 'имя клиента', + 'payment_method' => 'способ оплаты', + 'email' => 'Email', + 'telephone' => 'Контактный номер', + 'created_at' => 'время создания', + 'updated_at' => 'Время обновления', + 'status' => 'государство', + 'status_format' => 'государство', + 'total' => 'общий заказ', + 'express_number' => 'номер экспресс-заказа', + 'express_company' => 'экспресс-компания', + 'order_shipments' => 'информация об отправке', - 'address_info' => 'информация об адресе', - 'shipping_address' => 'адрес доставки', - 'payment_address' => 'Адрес для выставления счета', - 'order_status' => 'Статус заказа', - 'current_status' => 'Текущее состояние', - 'change_to_status' => 'Изменить статус', - 'comment' => 'Примечания', - 'submit_status' => 'обновить состояние', + 'address_info' => 'информация об адресе', + 'shipping_address' => 'адрес доставки', + 'payment_address' => 'Адрес для выставления счета', + 'order_status' => 'Статус заказа', + 'current_status' => 'Текущее состояние', + 'change_to_status' => 'Изменить статус', + 'comment' => 'Примечания', + 'submit_status' => 'обновить состояние', - 'product_info' => 'Информация о товаре', - 'product_name' => 'имя', - 'product_price' => 'цена', - 'product_sub_price' => 'Промежуточный итог', - 'product_quantity' => 'количество', - 'product_sku' => 'SKU', + 'product_info' => 'Информация о товаре', + 'product_name' => 'имя', + 'product_price' => 'цена', + 'product_sub_price' => 'Промежуточный итог', + 'product_quantity' => 'количество', + 'product_sku' => 'SKU', - 'action_history' => 'Журнал операций', - 'history_status' => 'государство', - 'history_comment' => 'Примечание', + 'action_history' => 'Журнал операций', + 'history_status' => 'государство', + 'history_comment' => 'Примечание', 'history_created_at' => 'Обновлено', - 'unpaid' => 'Оплачивается', - 'paid' => 'Оплаченный', - 'shipped' => 'Отправленный', - 'completed' => 'завершенный', - 'cancelled' => 'Отменено', + 'unpaid' => 'Оплачивается', + 'paid' => 'Оплаченный', + 'shipped' => 'Отправленный', + 'completed' => 'завершенный', + 'cancelled' => 'Отменено', ]; diff --git a/resources/lang/ru/page.php b/resources/lang/ru/page.php index caaac775..42aed633 100644 --- a/resources/lang/ru/page.php +++ b/resources/lang/ru/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => 'название', + 'title' => 'название', 'content' => 'содержание', ]; diff --git a/resources/lang/ru/product.php b/resources/lang/ru/product.php index 6f015a6b..c091ca85 100644 --- a/resources/lang/ru/product.php +++ b/resources/lang/ru/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => 'имя', - 'sku' => 'SKU', - 'price' => 'цена', - 'origin_price' => 'первоначальная цена', - 'cost_price' => 'стоимость', - 'brand' => 'марка', - 'category' => 'Классификация', - 'model' => 'модель', - 'quantity' => 'в наличии', - 'image' => 'картина', + 'name' => 'имя', + 'sku' => 'SKU', + 'price' => 'цена', + 'origin_price' => 'первоначальная цена', + 'cost_price' => 'стоимость', + 'brand' => 'марка', + 'category' => 'Классификация', + 'model' => 'модель', + 'quantity' => 'в наличии', + 'image' => 'картина', - 'active' => 'на полке', - 'inactive' => 'снять', + 'active' => 'на полке', + 'inactive' => 'снять', 'has_been_inactive' => 'Этот пункт был прекращен', ]; diff --git a/resources/lang/ru/rma.php b/resources/lang/ru/rma.php index aad5a295..813d820b 100644 --- a/resources/lang/ru/rma.php +++ b/resources/lang/ru/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => 'Заказ', + 'order_id' => 'Заказ', 'order_product_id' => 'пункт заказа', - 'customer_id' => 'покупатель', - 'quantity' => 'количество', - 'opened' => 'распакованный', - 'rma_reason_id' => 'Причина возврата', - 'type' => 'Тип послепродажного обслуживания', + 'customer_id' => 'покупатель', + 'quantity' => 'количество', + 'opened' => 'распакованный', + 'rma_reason_id' => 'Причина возврата', + 'type' => 'Тип послепродажного обслуживания', - 'status_pending' => 'Для обработки', - 'status_rejected' => 'отклоненный', - 'status_approved' => 'Утверждено (возвращается заказчиком)', - 'status_shipped' => 'Отправлено (возврат товара)', + 'status_pending' => 'Для обработки', + 'status_rejected' => 'отклоненный', + 'status_approved' => 'Утверждено (возвращается заказчиком)', + 'status_shipped' => 'Отправлено (возврат товара)', 'status_completed' => 'завершенный', - 'type_return' => 'вернуть товар', - 'type_exchange' => 'обмен', - 'type_repair' => 'ремонт', - 'type_reissue' => 'переиздание продукта', - 'type_refund' => 'Только возврат' + 'type_return' => 'вернуть товар', + 'type_exchange' => 'обмен', + 'type_repair' => 'ремонт', + 'type_reissue' => 'переиздание продукта', + 'type_refund' => 'Только возврат', ]; diff --git a/resources/lang/ru/shop/account.php b/resources/lang/ru/shop/account.php index 813a73ce..602f7c23 100644 --- a/resources/lang/ru/shop/account.php +++ b/resources/lang/ru/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => 'персональный центр', - 'revise_info' => 'Изменить информацию', - 'collect' => 'собирать', - 'coupon' => 'купон', - 'my_order' => 'Мой заказ', - 'orders' => 'все заказы', - 'pending_payment' => 'Ожидающий платеж', - 'pending_send' => 'быть доставленным', - 'pending_receipt' => 'ожидающий получения', - 'after_sales' => 'После продажи', - 'no_order' => 'У вас еще нет заказа!', - 'to_buy' => 'установить порядок', - 'order_number' => 'порядковый номер', - 'order_time' => 'время заказа', - 'state' => 'государство', - 'amount' => 'количество', - 'check_details' => 'проверить детали', - 'all' => 'общий', - 'items' => 'Предметы', + 'index' => 'персональный центр', + 'revise_info' => 'Изменить информацию', + 'collect' => 'собирать', + 'coupon' => 'купон', + 'my_order' => 'Мой заказ', + 'orders' => 'все заказы', + 'pending_payment' => 'Ожидающий платеж', + 'pending_send' => 'быть доставленным', + 'pending_receipt' => 'ожидающий получения', + 'after_sales' => 'После продажи', + 'no_order' => 'У вас еще нет заказа!', + 'to_buy' => 'установить порядок', + 'order_number' => 'порядковый номер', + 'order_time' => 'время заказа', + 'state' => 'государство', + 'amount' => 'количество', + 'check_details' => 'проверить детали', + 'all' => 'общий', + 'items' => 'Предметы', 'verify_code_expired' => 'Срок действия вашего проверочного кода истек (10 минут), получите его еще раз.', - 'verify_code_error' => 'Ваш проверочный код неверен', - 'account_not_exist' => 'Пользователь не существует', + 'verify_code_error' => 'Ваш проверочный код неверен', + 'account_not_exist' => 'Пользователь не существует', - 'edit' => [ - 'index' => 'Изменить личную информацию', - 'modify_avatar' => 'Изменить аватар', - 'suggest' => 'Загрузите изображение в формате JPG или PNG. Рекомендуется 300 x 300.', - 'name' => 'имя', - 'email' => 'Почта', - 'crop' => 'обрезать', + 'edit' => [ + 'index' => 'Изменить личную информацию', + 'modify_avatar' => 'Изменить аватар', + 'suggest' => 'Загрузите изображение в формате JPG или PNG. Рекомендуется 300 x 300.', + 'name' => 'имя', + 'email' => 'Почта', + 'crop' => 'обрезать', 'password_edit_success' => 'Сброс пароля завершен', - 'origin_password_fail' => 'Оригинальный пароль неверный', + 'origin_password_fail' => 'Оригинальный пароль неверный', ], - 'wishlist' => [ - 'index' => 'Мое избранное', - 'product' => 'продукт', - 'price' => 'цена', + 'wishlist' => [ + 'index' => 'Мое избранное', + 'product' => 'продукт', + 'price' => 'цена', 'check_details' => 'проверить детали', ], - 'order' => [ - 'index' => 'Мой заказ', - 'completed' => 'Получение подтверждено', - 'cancelled' => 'Заказ отменен', + 'order' => [ + 'index' => 'Мой заказ', + 'completed' => 'Получение подтверждено', + 'cancelled' => 'Заказ отменен', 'order_details' => 'Информация для заказа', - 'amount' => 'количество', - 'state' => 'государство', - 'order_number' => 'порядковый номер', - 'check' => 'Проверять', + 'amount' => 'количество', + 'state' => 'государство', + 'order_number' => 'порядковый номер', + 'check' => 'Проверять', - 'order_info' => [ - 'index' => 'Информация для заказа', - 'order_details' => 'Информация для заказа', - 'to_pay' => 'платить', - 'cancel' => 'отменить заказ', - 'confirm_receipt' => 'подтвердить получение товара', - 'order_number' => 'порядковый номер', - 'order_date' => 'Дата заказа', - 'state' => 'государство', - 'order_amount' => 'сумма заказа', - 'order_items' => 'заказ товаров', + 'order_info' => [ + 'index' => 'Информация для заказа', + 'order_details' => 'Информация для заказа', + 'to_pay' => 'платить', + 'cancel' => 'отменить заказ', + 'confirm_receipt' => 'подтвердить получение товара', + 'order_number' => 'порядковый номер', + 'order_date' => 'Дата заказа', + 'state' => 'государство', + 'order_amount' => 'сумма заказа', + 'order_items' => 'заказ товаров', 'apply_after_sales' => 'Подать заявку на послепродажное обслуживание', - 'order_total' => 'общий заказ', - 'logistics_status' => 'Статус логистики', - 'order_status' => 'Статус заказа', - 'remark' => 'Примечание', - 'update_time' => 'Время обновления', + 'order_total' => 'общий заказ', + 'logistics_status' => 'Статус логистики', + 'order_status' => 'Статус заказа', + 'remark' => 'Примечание', + 'update_time' => 'Время обновления', ], 'order_success' => [ - 'order_success' => 'Поздравляем, заказ успешно сформирован!', - 'order_number' => 'порядковый номер', - 'amounts_payable' => 'Суммы к оплате ', - 'payment_method' => 'метод оплаты', - 'view_order' => 'Посмотреть детали заказа ', - 'pay_now' => 'платить немедленно ', - 'kind_tips' => 'Напоминание: Ваш заказ был успешно сгенерирован, пожалуйста, завершите оплату как можно скорее~ ', - 'also' => 'Вы также можете', - 'continue_purchase' => 'продолжать покупать', + 'order_success' => 'Поздравляем, заказ успешно сформирован!', + 'order_number' => 'порядковый номер', + 'amounts_payable' => 'Суммы к оплате ', + 'payment_method' => 'метод оплаты', + 'view_order' => 'Посмотреть детали заказа ', + 'pay_now' => 'платить немедленно ', + 'kind_tips' => 'Напоминание: Ваш заказ был успешно сгенерирован, пожалуйста, завершите оплату как можно скорее~ ', + 'also' => 'Вы также можете', + 'continue_purchase' => 'продолжать покупать', 'contact_customer_service' => 'Если у вас возникнут какие-либо вопросы в процессе заказа, вы можете связаться с нашим персоналом службы поддержки в любое время.', - 'emaill' => 'Почта', - 'service_hotline' => 'Сервисная горячая линия', + 'emaill' => 'Почта', + 'service_hotline' => 'Сервисная горячая линия', ], ], - 'addresses' => [ - 'index' => 'мой адресс', - 'add_address' => 'Добавить новый адрес', + 'addresses' => [ + 'index' => 'мой адресс', + 'add_address' => 'Добавить новый адрес', 'default_address' => 'адрес по умолчанию', - 'delete' => 'Удалить', - 'edit' => 'редактировать', - 'enter_name' => 'Пожалуйста, введите ваше имя', - 'enter_phone' => 'Пожалуйста, введите свой номер телефона', - 'enter_address' => 'Пожалуйста, введите подробный адрес 1', + 'delete' => 'Удалить', + 'edit' => 'редактировать', + 'enter_name' => 'Пожалуйста, введите ваше имя', + 'enter_phone' => 'Пожалуйста, введите свой номер телефона', + 'enter_address' => 'Пожалуйста, введите подробный адрес 1', 'select_province' => 'Выберите провинцию', - 'enter_city' => 'Пожалуйста, заполните город', - 'confirm_delete' => 'Вы уверены, что хотите удалить адрес?', - 'hint' => 'намекать', - 'check_form' => 'Пожалуйста, проверьте правильность заполнения формы', + 'enter_city' => 'Пожалуйста, заполните город', + 'confirm_delete' => 'Вы уверены, что хотите удалить адрес?', + 'hint' => 'намекать', + 'check_form' => 'Пожалуйста, проверьте правильность заполнения формы', ], - 'rma' => [ - 'index' => 'мой послепродажный', - 'commodity' => 'товар', - 'quantity' => 'количество', - 'service_type' => 'Тип Обслуживания', + 'rma' => [ + 'index' => 'мой послепродажный', + 'commodity' => 'товар', + 'quantity' => 'количество', + 'service_type' => 'Тип Обслуживания', 'return_reason' => 'Причина возврата', 'creation_time' => 'время создания', - 'check' => 'Проверять', + 'check' => 'Проверять', - 'rma_info' => [ + 'rma_info' => [ 'index' => 'Детали послепродажного обслуживания', ], - 'rma_form' => [ - 'index' => 'Отправить послепродажную информацию', - 'service_type' => 'Тип Обслуживания', + 'rma_form' => [ + 'index' => 'Отправить послепродажную информацию', + 'service_type' => 'Тип Обслуживания', 'return_quantity' => 'Количество возврата', - 'unpacked' => 'распакованный', - 'return_reason' => 'Причина возврата', - 'remark' => 'Примечание', - ] - ] + 'unpacked' => 'распакованный', + 'return_reason' => 'Причина возврата', + 'remark' => 'Примечание', + ], + ], ]; diff --git a/resources/lang/ru/shop/carts.php b/resources/lang/ru/shop/carts.php index 805adc75..941e3226 100644 --- a/resources/lang/ru/shop/carts.php +++ b/resources/lang/ru/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => 'корзина покупателя', - 'added_to_cart' => 'добавлено в корзину', - 'select_all' => 'выбрать все', - 'commodity' => 'товар', - 'quantity' => 'количество', - 'subtotal' => 'Промежуточный итог', - 'product_total' => 'Всего продукта', - 'order_total' => 'общая сумма к оплате', - 'shipping_fee' => 'груз', - 'all' => 'все', - 'selected' => 'выбран', - 'to_checkout' => 'перейти к оформлению заказа', - 'cart_empty' => 'Ваша корзина пуста', - 'go_buy' => 'Вы можете пойти и посмотреть, что вы хотите купить', - 'go_shopping' => 'ходить по магазинам', - 'must_select' => 'Пожалуйста, выберите хотя бы один продукт', - 'mini' => 'ваша корзина', - 'delete' => 'Удалить', - 'check_cart' => 'проверить корзину', + 'index' => 'корзина покупателя', + 'added_to_cart' => 'добавлено в корзину', + 'select_all' => 'выбрать все', + 'commodity' => 'товар', + 'quantity' => 'количество', + 'subtotal' => 'Промежуточный итог', + 'product_total' => 'Всего продукта', + 'order_total' => 'общая сумма к оплате', + 'shipping_fee' => 'груз', + 'all' => 'все', + 'selected' => 'выбран', + 'to_checkout' => 'перейти к оформлению заказа', + 'cart_empty' => 'Ваша корзина пуста', + 'go_buy' => 'Вы можете пойти и посмотреть, что вы хотите купить', + 'go_shopping' => 'ходить по магазинам', + 'must_select' => 'Пожалуйста, выберите хотя бы один продукт', + 'mini' => 'ваша корзина', + 'delete' => 'Удалить', + 'check_cart' => 'проверить корзину', - 'invalid_customer' => 'Недействительный клиент корзины', - 'empty_selected_products' => 'Выбранный товар в корзине пуст', + 'invalid_customer' => 'Недействительный клиент корзины', + 'empty_selected_products' => 'Выбранный товар в корзине пуст', 'invalid_shipping_address' => 'Неверный адрес доставки', - 'invalid_payment_address' => 'Неверный платежный адрес', - 'invalid_shipping_method' => 'Способ доставки недоступен', - 'invalid_payment_method' => 'Способ оплаты недоступен', + 'invalid_payment_address' => 'Неверный платежный адрес', + 'invalid_shipping_method' => 'Способ доставки недоступен', + 'invalid_payment_method' => 'Способ оплаты недоступен', ]; diff --git a/resources/lang/ru/shop/checkout.php b/resources/lang/ru/shop/checkout.php index fa504e6c..4756e00d 100644 --- a/resources/lang/ru/shop/checkout.php +++ b/resources/lang/ru/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => 'Счет, пожалуйста', - 'address' => 'адресс доставки', - 'payment_address' => 'Адрес для выставления счета', + 'index' => 'Счет, пожалуйста', + 'address' => 'адресс доставки', + 'payment_address' => 'Адрес для выставления счета', 'same_as_shipping_address' => 'Платежный адрес и адрес доставки', - 'chosen' => 'выбранный', - 'edit' => 'редактировать', - 'choose_another_address' => 'Выбрать другой адрес', - 'add_new_address' => 'Добавить новый адрес', - 'payment_method' => 'метод оплаты', - 'delivery_method' => 'способ доставки', - 'cart_totals' => 'Общее количество тележек', - 'submit_order' => 'Подтвердить заказ', - 'enter_name' => 'Пожалуйста, введите ваше имя', - 'enter_phone' => 'Пожалуйста, введите свой номер телефона', - 'enter_address' => 'Пожалуйста, введите подробный адрес 1', - 'select_province' => 'Выберите провинцию', - 'enter_city' => 'Пожалуйста, заполните город', - 'check_form' => 'Пожалуйста, проверьте правильность заполнения формы', - 'error_payment_address' => 'Пожалуйста, выберите платежный адрес', + 'chosen' => 'выбранный', + 'edit' => 'редактировать', + 'choose_another_address' => 'Выбрать другой адрес', + 'add_new_address' => 'Добавить новый адрес', + 'payment_method' => 'метод оплаты', + 'delivery_method' => 'способ доставки', + 'cart_totals' => 'Общее количество тележек', + 'submit_order' => 'Подтвердить заказ', + 'enter_name' => 'Пожалуйста, введите ваше имя', + 'enter_phone' => 'Пожалуйста, введите свой номер телефона', + 'enter_address' => 'Пожалуйста, введите подробный адрес 1', + 'select_province' => 'Выберите провинцию', + 'enter_city' => 'Пожалуйста, заполните город', + 'check_form' => 'Пожалуйста, проверьте правильность заполнения формы', + 'error_payment_address' => 'Пожалуйста, выберите платежный адрес', - 'payment' => [ - 'index' => 'пожалуйста оплатите', - 'please_pay' => 'Заказ отправлен успешно, пожалуйста, оплатите', - 'order_number' => 'порядковый номер', + 'payment' => [ + 'index' => 'пожалуйста оплатите', + 'please_pay' => 'Заказ отправлен успешно, пожалуйста, оплатите', + 'order_number' => 'порядковый номер', 'amounts_payable' => 'Суммы к оплате', - 'payment_method' => 'метод оплаты', - ] + 'payment_method' => 'метод оплаты', + ], ]; diff --git a/resources/lang/ru/shop/common.php b/resources/lang/ru/shop/common.php index 3e76153c..a524315b 100644 --- a/resources/lang/ru/shop/common.php +++ b/resources/lang/ru/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => 'титульная страница', - 'submit' => 'Разместить', - 'cancel' => 'Отмена', + 'home' => 'титульная страница', + 'submit' => 'Разместить', + 'cancel' => 'Отмена', 'confirm' => 'Конечно', - 'no' => 'нет', - 'yes' => 'Да', + 'no' => 'нет', + 'yes' => 'Да', ]; diff --git a/resources/lang/ru/shop/currency.php b/resources/lang/ru/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/ru/shop/currency.php +++ b/resources/lang/ru/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/ru/shop/forgotten.php b/resources/lang/ru/shop/forgotten.php index fe366854..89c3f3fa 100644 --- a/resources/lang/ru/shop/forgotten.php +++ b/resources/lang/ru/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => 'Забыл пароль', - 'follow_prompt' => 'Пожалуйста, следуйте инструкциям, чтобы восстановить пароль', - 'email_forCode' => 'Пожалуйста, введите свой адрес электронной почты, чтобы получить код подтверждения', - 'enter_password' => 'Пожалуйста, введите новый пароль', - 'email' => 'Почта', - 'email_address' => 'Адрес электронной почты', - 'verification_code' => 'код верификации', - 'password' => 'пароль', - 'confirm_password' => 'Подтвердить Пароль', - 'send_code' => 'Отправить код подтверждения', - 'to_back' => 'Назад к предыдущему шагу', - 'enter_password' => 'Пожалуйста введите пароль', - 'enter_email' => 'Пожалуйста, введите свой адрес электронной почты', - 'please_confirm' => 'Пожалуйста, подтвердите свой пароль', - 'password_err' => 'Введенные дважды пароли не совпадают!', - 'email_err' => 'Пожалуйста, введите действительный адрес электронной почты!', - 'enter_code' => 'пожалуйста, введите проверочный код', + 'index' => 'Забыл пароль', + 'follow_prompt' => 'Пожалуйста, следуйте инструкциям, чтобы восстановить пароль', + 'email_forCode' => 'Пожалуйста, введите свой адрес электронной почты, чтобы получить код подтверждения', + 'enter_password' => 'Пожалуйста, введите новый пароль', + 'email' => 'Почта', + 'email_address' => 'Адрес электронной почты', + 'verification_code' => 'код верификации', + 'password' => 'пароль', + 'confirm_password' => 'Подтвердить Пароль', + 'send_code' => 'Отправить код подтверждения', + 'to_back' => 'Назад к предыдущему шагу', + 'enter_password' => 'Пожалуйста введите пароль', + 'enter_email' => 'Пожалуйста, введите свой адрес электронной почты', + 'please_confirm' => 'Пожалуйста, подтвердите свой пароль', + 'password_err' => 'Введенные дважды пароли не совпадают!', + 'email_err' => 'Пожалуйста, введите действительный адрес электронной почты!', + 'enter_code' => 'пожалуйста, введите проверочный код', 'verification_code_sent' => 'Код подтверждения отправлен, пожалуйста, проверьте и введите код подтверждения', - 'password_updated' => 'пароль был изменен', + 'password_updated' => 'пароль был изменен', ]; diff --git a/resources/lang/ru/shop/login.php b/resources/lang/ru/shop/login.php index dd38e14f..10c97d14 100644 --- a/resources/lang/ru/shop/login.php +++ b/resources/lang/ru/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => 'Вход пользователя и регистрация', - 'login_and_sign' => 'войти Зарегистрироваться', - 'home' => 'титульная страница', - 'library' => 'персональный центр', - 'login' => 'Авторизоваться', - 'already' => 'Уже наш клиент?', - 'description' => 'Уже наш клиент?', - 'email' => 'почта', - 'email_address' => 'Адрес электронной почты', - 'password' => 'пароль', - 'forget_password' => 'Забыл пароль', - 'new' => 'новый аккаунт', - 'not_already' => 'Еще не наш зарегистрированный клиент?', - 'confirm_password' => 'Подтвердить Пароль', - 'register' => 'регистр', - 'enter_password' => 'Пожалуйста введите пароль', - 'enter_email' => 'Пожалуйста, введите свой адрес электронной почты', - 'please_confirm' => 'Пожалуйста, подтвердите свой пароль', - 'password_err' => 'Введенные дважды пароли не совпадают!', - 'email_err' => 'Пожалуйста, введите действительный адрес электронной почты!', - 'check_form' => 'Пожалуйста, проверьте правильность заполнения формы', + 'index' => 'Вход пользователя и регистрация', + 'login_and_sign' => 'войти Зарегистрироваться', + 'home' => 'титульная страница', + 'library' => 'персональный центр', + 'login' => 'Авторизоваться', + 'already' => 'Уже наш клиент?', + 'description' => 'Уже наш клиент?', + 'email' => 'почта', + 'email_address' => 'Адрес электронной почты', + 'password' => 'пароль', + 'forget_password' => 'Забыл пароль', + 'new' => 'новый аккаунт', + 'not_already' => 'Еще не наш зарегистрированный клиент?', + 'confirm_password' => 'Подтвердить Пароль', + 'register' => 'регистр', + 'enter_password' => 'Пожалуйста введите пароль', + 'enter_email' => 'Пожалуйста, введите свой адрес электронной почты', + 'please_confirm' => 'Пожалуйста, подтвердите свой пароль', + 'password_err' => 'Введенные дважды пароли не совпадают!', + 'email_err' => 'Пожалуйста, введите действительный адрес электронной почты!', + 'check_form' => 'Пожалуйста, проверьте правильность заполнения формы', 'email_or_password_error' => 'Ошибка электронной почты или пароля!', - 'customer_inactive' => 'Пользователь отключен', - 'login_successfully' => 'Успешный вход в систему', - 'register_success' => 'Вы успешно зарегистрировались', - 'third_party_logins' => 'Стоит отметить', + 'customer_inactive' => 'Пользователь отключен', + 'login_successfully' => 'Успешный вход в систему', + 'register_success' => 'Вы успешно зарегистрировались', + 'third_party_logins' => 'Стоит отметить', ]; diff --git a/resources/lang/ru/shop/order.php b/resources/lang/ru/shop/order.php index 078d177b..bac29c02 100644 --- a/resources/lang/ru/shop/order.php +++ b/resources/lang/ru/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => 'недействительный заказ', - 'confirm_order' => 'Пользователь подтверждает получение', - 'cancel_order' => 'Пользователь отменяет заказ', + 'invalid_order' => 'недействительный заказ', + 'confirm_order' => 'Пользователь подтверждает получение', + 'cancel_order' => 'Пользователь отменяет заказ', 'order_already_paid' => 'заказ оплачен', ]; diff --git a/resources/lang/ru/shop/products.php b/resources/lang/ru/shop/products.php index fd6640cc..1b897245 100644 --- a/resources/lang/ru/shop/products.php +++ b/resources/lang/ru/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => 'поиск', + 'search' => 'поиск', 'add_to_favorites' => 'добавить в избранное', - 'add_to_cart' => 'добавить в корзину', - 'buy_now' => 'Купи сейчас', - 'product_details' => 'информация о продукте', - 'in_stock' => 'В наличии', - 'out_stock' => 'распродано', - 'model' => 'модель', + 'add_to_cart' => 'добавить в корзину', + 'buy_now' => 'Купи сейчас', + 'product_details' => 'информация о продукте', + 'in_stock' => 'В наличии', + 'out_stock' => 'распродано', + 'model' => 'модель', ]; diff --git a/resources/lang/ru/shop/steps.php b/resources/lang/ru/shop/steps.php index 51b75057..95168ed3 100644 --- a/resources/lang/ru/shop/steps.php +++ b/resources/lang/ru/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => 'шаг', - 'cart' => 'корзина покупателя', - 'checkout' => 'Счет, пожалуйста', + 'index' => 'шаг', + 'cart' => 'корзина покупателя', + 'checkout' => 'Счет, пожалуйста', 'submitted_successfully' => 'Отправлено успешно', - 'payment' => 'Оплата', + 'payment' => 'Оплата', ]; diff --git a/resources/lang/ru/shop/wishlist.php b/resources/lang/ru/shop/wishlist.php index 72528359..f1d4db6a 100644 --- a/resources/lang/ru/shop/wishlist.php +++ b/resources/lang/ru/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => 'Добавить в избранное успешно', + 'add_wishlist_success' => 'Добавить в избранное успешно', 'remove_wishlist_success' => 'Удалить избранное успешно', ]; diff --git a/resources/lang/zh_cn/address.php b/resources/lang/zh_cn/address.php index d7c07655..7949666e 100644 --- a/resources/lang/zh_cn/address.php +++ b/resources/lang/zh_cn/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => '编辑地址', - 'name' => '姓名', - 'phone' => '电话号码', + 'index' => '编辑地址', + 'name' => '姓名', + 'phone' => '电话号码', 'country_id' => '国家ID', - 'zone' => '省份', - 'zone_id' => '省份ID', - 'address_1' => '地址1', - 'address_2' => '地址2', - 'address' => '地址', + 'zone' => '省份', + 'zone_id' => '省份ID', + 'address_1' => '地址1', + 'address_2' => '地址2', + 'address' => '地址', 'enter_city' => '输入地址', - 'post_code' => '邮编', - 'default' => '默认地址', + 'post_code' => '邮编', + 'default' => '默认地址', ]; diff --git a/resources/lang/zh_cn/admin/admin_roles.php b/resources/lang/zh_cn/admin/admin_roles.php index 9fc6b4ba..dbf6b3f8 100644 --- a/resources/lang/zh_cn/admin/admin_roles.php +++ b/resources/lang/zh_cn/admin/admin_roles.php @@ -10,11 +10,11 @@ */ return [ - 'select_all' => '选中所有', - 'unselect_all' => '取消选中', - 'role_name' => '角色名称', + 'select_all' => '选中所有', + 'unselect_all' => '取消选中', + 'role_name' => '角色名称', 'role_management' => '角色管理', - 'role' => '角色', - 'permission' => '权限', - 'error_roles' => '请至少选择一个角色', + 'role' => '角色', + 'permission' => '权限', + 'error_roles' => '请至少选择一个角色', ]; diff --git a/resources/lang/zh_cn/admin/attribute.php b/resources/lang/zh_cn/admin/attribute.php index 68487071..68336795 100644 --- a/resources/lang/zh_cn/admin/attribute.php +++ b/resources/lang/zh_cn/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => '属性', - 'attribute_info' => '属性信息', - 'create_at' => '创建属性', - 'attribute_value' => '属性值', - 'set_attribute' => '配置属性', - 'add_attribute' => '添加属性值', + 'index' => '属性', + 'attribute_info' => '属性信息', + 'create_at' => '创建属性', + 'attribute_value' => '属性值', + 'set_attribute' => '配置属性', + 'add_attribute' => '添加属性值', 'before_attribute' => '请先选择左边属性', - 'btn_at' => '立即前往', - 'btn_later' => '稍后再去', - 'to_info_values' => '请前往详情页编辑属性值', + 'btn_at' => '立即前往', + 'btn_later' => '稍后再去', + 'to_info_values' => '请前往详情页编辑属性值', ]; diff --git a/resources/lang/zh_cn/admin/attribute_groups.php b/resources/lang/zh_cn/admin/attribute_groups.php index a7d81c90..69d3a434 100644 --- a/resources/lang/zh_cn/admin/attribute_groups.php +++ b/resources/lang/zh_cn/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => '属性组', + 'index' => '属性组', 'create_at_groups' => '创建属性组', ]; diff --git a/resources/lang/zh_cn/admin/brand.php b/resources/lang/zh_cn/admin/brand.php index feb2a7aa..8a2e5fdd 100644 --- a/resources/lang/zh_cn/admin/brand.php +++ b/resources/lang/zh_cn/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => '品牌', + 'index' => '品牌', - 'brands_index' => '品牌列表', + 'brands_index' => '品牌列表', 'brands_create' => '创建品牌', - 'brands_show' => '品牌详情', + 'brands_show' => '品牌详情', 'brands_update' => '更新品牌', 'brands_delete' => '删除品牌', - 'error_upload' => '请上传图标' + 'error_upload' => '请上传图标', ]; diff --git a/resources/lang/zh_cn/admin/builder.php b/resources/lang/zh_cn/admin/builder.php index a6f0308c..180426ce 100644 --- a/resources/lang/zh_cn/admin/builder.php +++ b/resources/lang/zh_cn/admin/builder.php @@ -11,243 +11,242 @@ */ return [ - 'heading_title' => '页面编辑', - 'modules_instructions' => '可用模块，点击添加至页面', - 'text_floor_prompt' => '设置（楼层配置需要保存刷新页面才会更新）', - 'text_new_page' => '添加新页面', - 'text_quit' => '退出', - 'text_save' => '保存', - 'text_view_page' => '查看页面', - 'text_module' => '模块', - 'text_module_title' => '模块标题', - 'text_menu' => '导航', - 'text_drag_sort' => '拖动排序', - 'text_set_up' => '设置', - 'text_delete' => '删除', - 'text_floor' => '楼层', - 'text_add_module' => '添加模块', - 'text_to_menu' => '编辑导航菜单', - 'text_other' => '其他', - 'text_preparing' => '准备中...', - 'text_floor_setting' => '楼层设置', - 'text_background_color' => '背景色', - 'text_sure' => '确 定', - 'text_page_name' => '请输入新页面名称', - 'text_is_save' => '请确保当前页面数据已保存！', - 'text_pop_ads' => '弹窗广告', - 'text_style_setting' => '样式设置', - 'text_is_save_data' => '切换页面前，请确保当前页面数据已保存？', - 'text_hint' => '提示', - 'text_cancel' => '取消', - 'text_created_success' => '页面创建成功', - 'text_html_none' => '模块加载错误, HTML 数据为空！', - 'text_is_delete' => '确定要删除', - 'text_enable' => '启用', - 'text_set_title' => '配置标题', - 'text_set_subtitle' => '配置副标题', - 'text_suggested_size' => '建议尺寸(宽x高): ', - 'text_word' => '文字', - 'text_add_pictures' => '添加图片', - 'text_refresh_cookie' => '刷新 Cookie', - 'text_popup_hint' => '注：用户点击关闭将不再显示，直到浏览器关闭重新打开。本地测试可点击 "刷新 Cookie"，后刷新浏览器，弹窗可再次启动。 ', - 'text_cookie_refresh_success' => 'Cookie 刷新成功，刷新浏览器即可看到弹窗内容。', - 'text_add_hot_links' => '添加热搜链接', - 'text_add' => '添加', - 'text_margin_top' => '模块内边距 - 上', - 'text_margin_bottom' => '模块内边距 - 下', - 'text_file_manager' => '文件管理器', - 'modules_link' => '链接', - 'modules_choose_link' => '选择链接', - 'text_select_link' => '请选择跳转到的链接页面', - 'text_no' => '无', - 'text_search' => '搜索', - 'text_is_newpage' => '是否新窗口打开:', - 'text_manage' => '管理', - 'text_title_cover' => '标题（覆盖下方选择的链接名称）', - 'text_enter_link' => '请输入链接地址', - 'text_states' => '状态', - 'text_disable' => '禁用', - 'text_no_data' => '数据不存在或已被删除', - 'text_to_add' => '去添加', - 'text_category' => '分类', - 'text_information' => '信息页面', - 'text_manufacturer' => '品牌', - 'text_static' => '固定连接', - 'text_custom' => '自定义', - 'text_top_text' => '顶部文字', - 'text_edit_page_name' => '修改页面名称', - 'text_page_name_no' => '名称不能为空', - 'custom_name' => '自定义名称', + 'heading_title' => '页面编辑', + 'modules_instructions' => '可用模块，点击添加至页面', + 'text_floor_prompt' => '设置（楼层配置需要保存刷新页面才会更新）', + 'text_new_page' => '添加新页面', + 'text_quit' => '退出', + 'text_save' => '保存', + 'text_view_page' => '查看页面', + 'text_module' => '模块', + 'text_module_title' => '模块标题', + 'text_menu' => '导航', + 'text_drag_sort' => '拖动排序', + 'text_set_up' => '设置', + 'text_delete' => '删除', + 'text_floor' => '楼层', + 'text_add_module' => '添加模块', + 'text_to_menu' => '编辑导航菜单', + 'text_other' => '其他', + 'text_preparing' => '准备中...', + 'text_floor_setting' => '楼层设置', + 'text_background_color' => '背景色', + 'text_sure' => '确 定', + 'text_page_name' => '请输入新页面名称', + 'text_is_save' => '请确保当前页面数据已保存！', + 'text_pop_ads' => '弹窗广告', + 'text_style_setting' => '样式设置', + 'text_is_save_data' => '切换页面前，请确保当前页面数据已保存？', + 'text_hint' => '提示', + 'text_cancel' => '取消', + 'text_created_success' => '页面创建成功', + 'text_html_none' => '模块加载错误, HTML 数据为空！', + 'text_is_delete' => '确定要删除', + 'text_enable' => '启用', + 'text_set_title' => '配置标题', + 'text_set_subtitle' => '配置副标题', + 'text_suggested_size' => '建议尺寸(宽x高): ', + 'text_word' => '文字', + 'text_add_pictures' => '添加图片', + 'text_refresh_cookie' => '刷新 Cookie', + 'text_popup_hint' => '注：用户点击关闭将不再显示，直到浏览器关闭重新打开。本地测试可点击 "刷新 Cookie"，后刷新浏览器，弹窗可再次启动。 ', + 'text_cookie_refresh_success' => 'Cookie 刷新成功，刷新浏览器即可看到弹窗内容。', + 'text_add_hot_links' => '添加热搜链接', + 'text_add' => '添加', + 'text_margin_top' => '模块内边距 - 上', + 'text_margin_bottom' => '模块内边距 - 下', + 'text_file_manager' => '文件管理器', + 'modules_link' => '链接', + 'modules_choose_link' => '选择链接', + 'text_select_link' => '请选择跳转到的链接页面', + 'text_no' => '无', + 'text_search' => '搜索', + 'text_is_newpage' => '是否新窗口打开:', + 'text_manage' => '管理', + 'text_title_cover' => '标题（覆盖下方选择的链接名称）', + 'text_enter_link' => '请输入链接地址', + 'text_states' => '状态', + 'text_disable' => '禁用', + 'text_no_data' => '数据不存在或已被删除', + 'text_to_add' => '去添加', + 'text_category' => '分类', + 'text_information' => '信息页面', + 'text_manufacturer' => '品牌', + 'text_static' => '固定连接', + 'text_custom' => '自定义', + 'text_top_text' => '顶部文字', + 'text_edit_page_name' => '修改页面名称', + 'text_page_name_no' => '名称不能为空', + 'custom_name' => '自定义名称', // 固定连接 - 'text_static_product_latest' => '最新商品', - 'text_static_product_special' => '特价商品', + 'text_static_product_latest' => '最新商品', + 'text_static_product_special' => '特价商品', 'text_static_product_manufacturer' => '品牌专区', - 'text_static_account_account' => '会员中心', - 'text_static_account_order' => '历史订单', - 'text_static_account_wishlist' => '收藏列表', - 'text_static_affiliate_login' => '联盟会员', - 'text_static_account_newsletter' => '订阅咨询', - 'text_static_information_contact' => '联系我们', - 'text_static_information_sitemap' => '网站地图', - 'text_static_information_faq' => '常见问题', - 'text_static_account_voucher' => '礼品券', - 'text_static_account_login' => '登录', - 'text_static_account_register' => '注册', - 'text_static_checkout_cart' => '购物车', - 'text_static_blog_home' => '博客', + 'text_static_account_account' => '会员中心', + 'text_static_account_order' => '历史订单', + 'text_static_account_wishlist' => '收藏列表', + 'text_static_affiliate_login' => '联盟会员', + 'text_static_account_newsletter' => '订阅咨询', + 'text_static_information_contact' => '联系我们', + 'text_static_information_sitemap' => '网站地图', + 'text_static_information_faq' => '常见问题', + 'text_static_account_voucher' => '礼品券', + 'text_static_account_login' => '登录', + 'text_static_account_register' => '注册', + 'text_static_checkout_cart' => '购物车', + 'text_static_blog_home' => '博客', - 'text_edit_product' => '编辑商品详情', - 'text_edit_home' => '编辑首页', - 'text_edit_mb_home' => '编辑手机端首页', - 'text_footer_edit' => '编辑页脚', - 'text_header_edit' => '编辑页头', - 'text_save_refresh' => '保存并刷新', - 'text_save_refresh_header' => '保存（刷新页头）', - 'text_service_icon' => '服务图标', - 'text_describe' => '描述', - 'text_add_link' => '添加链接', - 'text_is_btn' => '是否显示按钮', - 'text_phone' => '电话', - 'text_address' => '地址', - 'text_email' => '邮箱', - 'text_copyright' => '版权/图片', - 'text_yq_link' => '友情链接', - 'text_link_bar' => '链接栏', - 'text_introduce' => '介绍', - 'text_up_logo' => '上传 logo', - 'text_hot_keywords' => '热搜关键词', - 'text_title' => '标题', - 'text_text_notific' => '文本通知', - 'text_only_home' => '仅在首页显示', - 'text_background_color' => '背景颜色', - 'text_font_color' => '字体颜色', - 'text_image' => '图片', - 'text_show' => '显示', - 'text_is_phone' => '显示联系电话', - 'text_half_angle' => '使用半角逗号分隔', - 'text_prompt_words' => '提示文字', - 'text_search_bar' => '搜索条', - 'text_btn_text' => '按钮文字', - 'text_banner_ad' => '横幅广告', - 'text_l_c' => '语言/货币栏', - 'text_top_color' => '上部分颜色', - 'text_title_color' => '标题颜色', - 'text_color' => '颜色', - 'text_left_text' => '左边文字', - 'text_right_icon' => '右边支付图标', - 'text_bgi' => '背景图', - 'text_btn' => '按钮', + 'text_edit_product' => '编辑商品详情', + 'text_edit_home' => '编辑首页', + 'text_edit_mb_home' => '编辑手机端首页', + 'text_footer_edit' => '编辑页脚', + 'text_header_edit' => '编辑页头', + 'text_save_refresh' => '保存并刷新', + 'text_save_refresh_header' => '保存（刷新页头）', + 'text_service_icon' => '服务图标', + 'text_describe' => '描述', + 'text_add_link' => '添加链接', + 'text_is_btn' => '是否显示按钮', + 'text_phone' => '电话', + 'text_address' => '地址', + 'text_email' => '邮箱', + 'text_copyright' => '版权/图片', + 'text_yq_link' => '友情链接', + 'text_link_bar' => '链接栏', + 'text_introduce' => '介绍', + 'text_up_logo' => '上传 logo', + 'text_hot_keywords' => '热搜关键词', + 'text_title' => '标题', + 'text_text_notific' => '文本通知', + 'text_only_home' => '仅在首页显示', + 'text_background_color' => '背景颜色', + 'text_font_color' => '字体颜色', + 'text_image' => '图片', + 'text_show' => '显示', + 'text_is_phone' => '显示联系电话', + 'text_half_angle' => '使用半角逗号分隔', + 'text_prompt_words' => '提示文字', + 'text_search_bar' => '搜索条', + 'text_btn_text' => '按钮文字', + 'text_banner_ad' => '横幅广告', + 'text_l_c' => '语言/货币栏', + 'text_top_color' => '上部分颜色', + 'text_title_color' => '标题颜色', + 'text_color' => '颜色', + 'text_left_text' => '左边文字', + 'text_right_icon' => '右边支付图标', + 'text_bgi' => '背景图', + 'text_btn' => '按钮', // page - 'page_product_title_size' => '商品标题字号', - 'page_product_title_color' => '商品标题颜色', - 'page_product_price_color' => '商品价格颜色', - 'page_product_thumb_position' => '缩略图位置', - 'page_product_image' => '商品图片', - 'page_product_bottom' => '底部', - 'page_product_left' => '左侧', - 'page_product_magnifying_style' => '放大镜样式', - 'page_product_magnifying_window' => '外部窗口', - 'page_product_magnifying_inner' => '内部悬浮', - 'page_product_magnifying_lens' => '内部放大镜', - 'page_product_share' => '分享', - 'page_product_share_code' => '分享代码', - 'page_product_general_settings' => '常规设置', - 'page_product_font_size' => '字号大小', + 'page_product_title_size' => '商品标题字号', + 'page_product_title_color' => '商品标题颜色', + 'page_product_price_color' => '商品价格颜色', + 'page_product_thumb_position' => '缩略图位置', + 'page_product_image' => '商品图片', + 'page_product_bottom' => '底部', + 'page_product_left' => '左侧', + 'page_product_magnifying_style' => '放大镜样式', + 'page_product_magnifying_window' => '外部窗口', + 'page_product_magnifying_inner' => '内部悬浮', + 'page_product_magnifying_lens' => '内部放大镜', + 'page_product_share' => '分享', + 'page_product_share_code' => '分享代码', + 'page_product_general_settings' => '常规设置', + 'page_product_font_size' => '字号大小', // ModuleS List - 'modules_photo_text' => '图文混排', - 'modules_video_module' => '视频模块', - 'modules_customer_reviews' => '客户评价', - 'modules_images_link' => '多图链接', - 'modules_background_icon_text' => '背景图标文字', - 'modules_slideshow_category' => '幻灯片分类', - 'modules_bargain' => '砍价', - 'modules_bestseller' => '热卖商品', - 'modules_blog' => '博客', - 'modules_carousel' => '抡博图标', - 'modules_category' => '分类模块', - 'modules_coupon' => '优惠券', - 'modules_flash_sale' => '商品秒杀', - 'modules_group_buying' => '拼团', - 'modules_html' => '富文本', - 'modules_icon_text' => '图标文字', - 'modules_image_100' => '单图模块', - 'modules_image_200' => '一行两图', - 'modules_image_300' => '一行三图', - 'modules_image_301' => '一行三图-pro', - 'modules_image_400' => '一行四图', - 'modules_image_401' => '一行四图-pro', - 'modules_latest' => '最新商品', - 'modules_manufacturer' => '品牌列表', - 'modules_product' => '商品', - 'modules_product_tab' => '选项卡商品', - 'modules_slideshow' => '幻灯片', - 'modules_quantity' => '显示数量限制', - 'modules_manage_bargain' => '管理砍价商品', - 'modules_manage_blog' => '管理博客', - 'modules_no_blog' => '没有文章，请先到 【内容管理 -> 博客管理】 配置文章。', - 'modules_slides_per_view' => '一屏显示数量', - 'modules_enter_content' => '请输入内容', - 'modules_full_screen' => '是否全屏', - 'modules_content' => '内容', - 'modules_edit_content' => '编辑内容', - 'modules_select_image' => '选择图片', - 'modules_quantity_line' => '一行显示几个', - 'modules_please_choose' => '请选择', - 'modules_choose' => '选择', - 'modules_add_category' => '添加分类', - 'modules_choose_category' => '选择分类', - 'modules_set_coupon' => '优惠券配置', - 'modules_no_coupon' => '没有优惠券数据', - 'modules_manage_flash' => '管理秒杀商品', - 'modules_manage_group' => '管理拼团商品', - 'modules_no_state' => '当前模块没有开启或没有配置，请先到后台【模块管理】中配置此模块。', - 'modules_grid_mode' => '网格模式', - 'modules_more_link' => '更多链接', - 'modules_choose_brand' => '选择品牌', - 'modules_set_product' => '配置商品', - 'modules_keywords_search' => '请输入关键字搜索', - 'modules_test_name' => '测试名称', - 'modules_please_products' => '请添加商品', - 'modules_image_size' => '图片尺寸', - 'modules_height' => '高', - 'modules_width' => '宽', - 'modules_category_style' => '分类显示样式', - 'modules_down' => '下面', - 'modules_left' => '左边', - 'modules_category_no' => '不要分类', - 'modules_review_name' => '名称', - 'modules_profession' => '职业', - 'modules_video_cover' => '视频封面', - 'modules_video' => '视频', - + 'modules_photo_text' => '图文混排', + 'modules_video_module' => '视频模块', + 'modules_customer_reviews' => '客户评价', + 'modules_images_link' => '多图链接', + 'modules_background_icon_text' => '背景图标文字', + 'modules_slideshow_category' => '幻灯片分类', + 'modules_bargain' => '砍价', + 'modules_bestseller' => '热卖商品', + 'modules_blog' => '博客', + 'modules_carousel' => '抡博图标', + 'modules_category' => '分类模块', + 'modules_coupon' => '优惠券', + 'modules_flash_sale' => '商品秒杀', + 'modules_group_buying' => '拼团', + 'modules_html' => '富文本', + 'modules_icon_text' => '图标文字', + 'modules_image_100' => '单图模块', + 'modules_image_200' => '一行两图', + 'modules_image_300' => '一行三图', + 'modules_image_301' => '一行三图-pro', + 'modules_image_400' => '一行四图', + 'modules_image_401' => '一行四图-pro', + 'modules_latest' => '最新商品', + 'modules_manufacturer' => '品牌列表', + 'modules_product' => '商品', + 'modules_product_tab' => '选项卡商品', + 'modules_slideshow' => '幻灯片', + 'modules_quantity' => '显示数量限制', + 'modules_manage_bargain' => '管理砍价商品', + 'modules_manage_blog' => '管理博客', + 'modules_no_blog' => '没有文章，请先到 【内容管理 -> 博客管理】 配置文章。', + 'modules_slides_per_view' => '一屏显示数量', + 'modules_enter_content' => '请输入内容', + 'modules_full_screen' => '是否全屏', + 'modules_content' => '内容', + 'modules_edit_content' => '编辑内容', + 'modules_select_image' => '选择图片', + 'modules_quantity_line' => '一行显示几个', + 'modules_please_choose' => '请选择', + 'modules_choose' => '选择', + 'modules_add_category' => '添加分类', + 'modules_choose_category' => '选择分类', + 'modules_set_coupon' => '优惠券配置', + 'modules_no_coupon' => '没有优惠券数据', + 'modules_manage_flash' => '管理秒杀商品', + 'modules_manage_group' => '管理拼团商品', + 'modules_no_state' => '当前模块没有开启或没有配置，请先到后台【模块管理】中配置此模块。', + 'modules_grid_mode' => '网格模式', + 'modules_more_link' => '更多链接', + 'modules_choose_brand' => '选择品牌', + 'modules_set_product' => '配置商品', + 'modules_keywords_search' => '请输入关键字搜索', + 'modules_test_name' => '测试名称', + 'modules_please_products' => '请添加商品', + 'modules_image_size' => '图片尺寸', + 'modules_height' => '高', + 'modules_width' => '宽', + 'modules_category_style' => '分类显示样式', + 'modules_down' => '下面', + 'modules_left' => '左边', + 'modules_category_no' => '不要分类', + 'modules_review_name' => '名称', + 'modules_profession' => '职业', + 'modules_video_cover' => '视频封面', + 'modules_video' => '视频', // mobile - 'mobile_search' => '搜索条', - 'mobile_search_normal' => '不固定在屏幕顶部', - 'mobile_search_hide' => '不显示顶部搜索条', - 'mobile_search_fixed' => '固定在屏幕顶部 (默认)', + 'mobile_search' => '搜索条', + 'mobile_search_normal' => '不固定在屏幕顶部', + 'mobile_search_hide' => '不显示顶部搜索条', + 'mobile_search_fixed' => '固定在屏幕顶部 (默认)', // Menu - 'main_menu' => '主菜单', - 'please_add_data' => '请添加数据', - 'add_main_menu' => '添加主菜单', - 'main_menu_name_link' => '主菜单名称/链接', - 'main_menu_label' => '主菜单标签', - 'label_background_color' => '标签背景色', - 'label_text_color' => '标签文字色', - 'submenu_group' => '子菜单(组)', - 'add_menu_group' => '添加菜单组', - 'full_screen' => '是否全屏', - 'menu' => '菜单', - 'add_submenu_link' => '添加子菜单链接', - 'type' => '类型', + 'main_menu' => '主菜单', + 'please_add_data' => '请添加数据', + 'add_main_menu' => '添加主菜单', + 'main_menu_name_link' => '主菜单名称/链接', + 'main_menu_label' => '主菜单标签', + 'label_background_color' => '标签背景色', + 'label_text_color' => '标签文字色', + 'submenu_group' => '子菜单(组)', + 'add_menu_group' => '添加菜单组', + 'full_screen' => '是否全屏', + 'menu' => '菜单', + 'add_submenu_link' => '添加子菜单链接', + 'type' => '类型', // footer - 'footer_edit' => '页尾编辑器', - 'sub_title' => '副标题', - 'introduction' => '简介', - 'copyright_settings' => '版权设置', + 'footer_edit' => '页尾编辑器', + 'sub_title' => '副标题', + 'introduction' => '简介', + 'copyright_settings' => '版权设置', ]; diff --git a/resources/lang/zh_cn/admin/category.php b/resources/lang/zh_cn/admin/category.php index db0e7ed3..dcc36ca9 100644 --- a/resources/lang/zh_cn/admin/category.php +++ b/resources/lang/zh_cn/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '分类', - 'edit_category' => '编辑分类', - 'upper_category' => '上级分类', + 'index' => '分类', + 'edit_category' => '编辑分类', + 'upper_category' => '上级分类', - 'categories_index' => '分类列表', + 'categories_index' => '分类列表', 'categories_create' => '创建分类', - 'categories_show' => '分类详情', + 'categories_show' => '分类详情', 'categories_update' => '更新分类', 'categories_delete' => '删除分类', ]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index 7d8eefda..f837c51e 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -10,69 +10,69 @@ */ return [ - 'admin_panel' => '后台管理', - 'edit' => '编辑', - 'status' => '状态', - 'action' => '操作', - 'install' => '安装', - 'uninstall' => '卸载', + 'admin_panel' => '后台管理', + 'edit' => '编辑', + 'status' => '状态', + 'action' => '操作', + 'install' => '安装', + 'uninstall' => '卸载', // errors - 'forbidden' => '禁止访问', - 'has_no_permission' => '您没有权限访问该页面, 请联系系统管理员。', + 'forbidden' => '禁止访问', + 'has_no_permission' => '您没有权限访问该页面, 请联系系统管理员。', // header - 'home' => '管理首页', - 'order' => '订单管理', - 'rma' => '售后服务管理', - 'rma_reason' => '退换货原因管理', - 'product' => '商品管理', - 'brand' => '品牌管理', - 'category' => '分类管理', - 'customer_group' => '客户组管理', - 'customer' => '客户管理', - 'content' => '内容管理', - 'setting' => '系统设置', - 'plugin' => '插件管理', - 'marketing' => '插件市场', - 'admin_user' => '后台用户', - 'admin_role' => '用户角色', - 'region' => '区域分组', - 'tax_rate' => '税率管理', - 'tax_class' => '税类管理', - 'currency' => '货币管理', - 'language' => '语言管理', - 'zone' => '省份管理', - 'country' => '国家管理', - 'file_manager' => '文件管理器', - 'access_frontend' => '访问前台', + 'home' => '管理首页', + 'order' => '订单管理', + 'rma' => '售后服务管理', + 'rma_reason' => '退换货原因管理', + 'product' => '商品管理', + 'brand' => '品牌管理', + 'category' => '分类管理', + 'customer_group' => '客户组管理', + 'customer' => '客户管理', + 'content' => '内容管理', + 'setting' => '系统设置', + 'plugin' => '插件管理', + 'marketing' => '插件市场', + 'admin_user' => '后台用户', + 'admin_role' => '用户角色', + 'region' => '区域分组', + 'tax_rate' => '税率管理', + 'tax_class' => '税类管理', + 'currency' => '货币管理', + 'language' => '语言管理', + 'zone' => '省份管理', + 'country' => '国家管理', + 'file_manager' => '文件管理器', + 'access_frontend' => '访问前台', // sidebar 'attribute_groups_index' => '属性组', - 'attributes_index' => '属性', - 'settings_index' => '系统设置', - 'admin_users_index' => '后台用户', - 'plugins_index' => '插件列表', - 'marketing_index' => '插件市场', - 'regions_index' => '区域分组', - 'tax_rates_index' => '税率设置', - 'tax_classes_index' => '税费类别', - 'currencies_index' => '货币管理', - 'languages_index' => '语言管理', - 'design_index' => '首页装修', - 'pages_index' => '信息页面', - 'design_footer_index' => '页尾装修', - 'design_menu_index' => '导航配置', - 'categories_index' => '商品分类', - 'products_index' => '商品管理', - 'products_trashed' => '回收站', - 'customers_trashed' => '回收站', - 'brands_index' => '商品品牌', - 'orders_index' => '订单列表', - 'rmas_index' => '售后管理', - 'rma_reasons_index' => '售后原因', - 'customers_index' => '客户列表', - 'customer_groups_index' => '客户组', - 'countries_index' => '国家管理', - 'zones_index' => '省份管理', + 'attributes_index' => '属性', + 'settings_index' => '系统设置', + 'admin_users_index' => '后台用户', + 'plugins_index' => '插件列表', + 'marketing_index' => '插件市场', + 'regions_index' => '区域分组', + 'tax_rates_index' => '税率设置', + 'tax_classes_index' => '税费类别', + 'currencies_index' => '货币管理', + 'languages_index' => '语言管理', + 'design_index' => '首页装修', + 'pages_index' => '信息页面', + 'design_footer_index' => '页尾装修', + 'design_menu_index' => '导航配置', + 'categories_index' => '商品分类', + 'products_index' => '商品管理', + 'products_trashed' => '回收站', + 'customers_trashed' => '回收站', + 'brands_index' => '商品品牌', + 'orders_index' => '订单列表', + 'rmas_index' => '售后管理', + 'rma_reasons_index' => '售后原因', + 'customers_index' => '客户列表', + 'customer_groups_index' => '客户组', + 'countries_index' => '国家管理', + 'zones_index' => '省份管理', ]; diff --git a/resources/lang/zh_cn/admin/country.php b/resources/lang/zh_cn/admin/country.php index e0480dae..15485d16 100644 --- a/resources/lang/zh_cn/admin/country.php +++ b/resources/lang/zh_cn/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => '国家名称', + 'country_name' => '国家名称', - 'countries_index' => '国家列表', + 'countries_index' => '国家列表', 'countries_create' => '创建国家', 'countries_update' => '更新国家', ]; diff --git a/resources/lang/zh_cn/admin/currency.php b/resources/lang/zh_cn/admin/currency.php index 9c40755a..8e84e5b1 100644 --- a/resources/lang/zh_cn/admin/currency.php +++ b/resources/lang/zh_cn/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => '货币列表', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => '货币列表', 'currencies_create' => '创建货币', - 'currencies_show' => '货币详情', + 'currencies_show' => '货币详情', 'currencies_update' => '更新货币', 'currencies_delete' => '删除货币', ]; diff --git a/resources/lang/zh_cn/admin/customer.php b/resources/lang/zh_cn/admin/customer.php index 9afc6dd9..34f4962e 100644 --- a/resources/lang/zh_cn/admin/customer.php +++ b/resources/lang/zh_cn/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => '客户列表', - 'customers_create' => '创建客户', - 'customers_show' => '客户详情', - 'customers_update' => '更新客户', - 'customers_delete' => '删除客户', + 'customers_index' => '客户列表', + 'customers_create' => '创建客户', + 'customers_show' => '客户详情', + 'customers_update' => '更新客户', + 'customers_delete' => '删除客户', - 'user_info' => '用户信息', - 'address_management' => '地址管理', - 'user_name' => '用户名', - 'password_info' => '留空则保持原密码不变', - 'add_address' => '新增地址', - 'no_address' => '当前账号无地址', - 'edit_address' => '编辑地址', - 'address' => '地址', - 'choose_country' => '选择国家', - 'zones' => '省份', - 'choose_zones' => '选择省份', - 'enter_city' => '输入城市', - 'city' => '城市', - 'zipcode' => '邮编', - 'address_1' => '详细地址 1', - 'address_2' => '详细地址 2', + 'user_info' => '用户信息', + 'address_management' => '地址管理', + 'user_name' => '用户名', + 'password_info' => '留空则保持原密码不变', + 'add_address' => '新增地址', + 'no_address' => '当前账号无地址', + 'edit_address' => '编辑地址', + 'address' => '地址', + 'choose_country' => '选择国家', + 'zones' => '省份', + 'choose_zones' => '选择省份', + 'enter_city' => '输入城市', + 'city' => '城市', + 'zipcode' => '邮编', + 'address_1' => '详细地址 1', + 'address_2' => '详细地址 2', - 'cannot_delete_root' => '不能删除Root账户', - 'error_email' => '请输入正确邮箱格式', + 'cannot_delete_root' => '不能删除Root账户', + 'error_email' => '请输入正确邮箱格式', 'confirm_delete_address' => '确定要删除地址吗？', ]; diff --git a/resources/lang/zh_cn/admin/customer_group.php b/resources/lang/zh_cn/admin/customer_group.php index a060fcaa..5805bc6f 100644 --- a/resources/lang/zh_cn/admin/customer_group.php +++ b/resources/lang/zh_cn/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => '客户组', - 'consumption_limit' => '消费额度', - 'discount_rate' => '折扣率', - 'reward_points_factor' => '奖励积分系数', - 'integral_factor' => '使用积分系数', + 'index' => '客户组', + 'consumption_limit' => '消费额度', + 'discount_rate' => '折扣率', + 'reward_points_factor' => '奖励积分系数', + 'integral_factor' => '使用积分系数', - 'customer_groups_index' => '客户组列表', + 'customer_groups_index' => '客户组列表', 'customer_groups_create' => '创建客户组', - 'customer_groups_show' => '客户组详情', + 'customer_groups_show' => '客户组详情', 'customer_groups_update' => '更新客户组', 'customer_groups_delete' => '删除客户组', - 'default_cannot_delete' => '默认客户组不能删除', + 'default_cannot_delete' => '默认客户组不能删除', ]; diff --git a/resources/lang/zh_cn/admin/dashboard.php b/resources/lang/zh_cn/admin/dashboard.php index e44f5d57..df39070f 100644 --- a/resources/lang/zh_cn/admin/dashboard.php +++ b/resources/lang/zh_cn/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => '用户访问量', - 'order_total' => '订单量', - 'customer_new' => '新增用户', - 'order_amount' => '销售额', - 'yesterday' => '昨日', - 'day_before' => '较前一日', + 'order_total' => '订单量', + 'customer_new' => '新增用户', + 'order_amount' => '销售额', + 'yesterday' => '昨日', + 'day_before' => '较前一日', - 'order_report' => '订单统计', - 'latest_month' => '一个月', - 'latest_week' => '一周', - 'latest_year' => '一年', + 'order_report' => '订单统计', + 'latest_month' => '一个月', + 'latest_week' => '一周', + 'latest_year' => '一年', ]; diff --git a/resources/lang/zh_cn/admin/design_builder.php b/resources/lang/zh_cn/admin/design_builder.php index cf263abc..bce18d2b 100644 --- a/resources/lang/zh_cn/admin/design_builder.php +++ b/resources/lang/zh_cn/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => '品牌模块', - 'module_banner' => '横幅模块', + 'module_brand' => '品牌模块', + 'module_banner' => '横幅模块', 'module_four_image_pro' => '一行四图 PRO', - 'module_slideshow' => '幻灯片模块', - 'module_tab_products' => '选项卡商品', + 'module_slideshow' => '幻灯片模块', + 'module_tab_products' => '选项卡商品', ]; diff --git a/resources/lang/zh_cn/admin/file_manager.php b/resources/lang/zh_cn/admin/file_manager.php index 7b7a3f2a..43b71768 100644 --- a/resources/lang/zh_cn/admin/file_manager.php +++ b/resources/lang/zh_cn/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => '创建目录/文件', - 'file_manager_show' => '查看目录/文件', - 'file_manager_update' => '重命名', - 'file_manager_delete' => '删除目录/文件', + 'file_manager_create' => '创建目录/文件', + 'file_manager_show' => '查看目录/文件', + 'file_manager_update' => '重命名', + 'file_manager_delete' => '删除目录/文件', 'directory_already_exist' => '目录已存在', - 'directory_not_empty' => '该目录不为空', - 'target_not_exist' => '原始文件或者文件夹不存在', - 'create_folder' => '创建文件夹', - 'rename' => '重命名', - 'download' => '下载', - 'upload_files' => '上传文件', - 'click_upload' => '点击上传，或将图片拖到此处', - 'image_uploading' => '图片上传中', - 'no_file' => '没有文件', - 'picture_space' => '图片空间', - 'show_pc' => '请到PC端操作', + 'directory_not_empty' => '该目录不为空', + 'target_not_exist' => '原始文件或者文件夹不存在', + 'create_folder' => '创建文件夹', + 'rename' => '重命名', + 'download' => '下载', + 'upload_files' => '上传文件', + 'click_upload' => '点击上传，或将图片拖到此处', + 'image_uploading' => '图片上传中', + 'no_file' => '没有文件', + 'picture_space' => '图片空间', + 'show_pc' => '请到PC端操作', - 'confirm_delete_file' => '是否要删除选中文件', - 'confirm_delete_folder' => '正在进行删除文件夹操作，文件夹内所有文件都将被删除，是否确认？', - 'new_folder' => '新建文件夹', - 'can_empty' => '不能为空', - 'finish' => '完成', - 'uploading' => '上传中', - 'file_manager' => '图片管理器', + 'confirm_delete_file' => '是否要删除选中文件', + 'confirm_delete_folder' => '正在进行删除文件夹操作，文件夹内所有文件都将被删除，是否确认？', + 'new_folder' => '新建文件夹', + 'can_empty' => '不能为空', + 'finish' => '完成', + 'uploading' => '上传中', + 'file_manager' => '图片管理器', ]; diff --git a/resources/lang/zh_cn/admin/language.php b/resources/lang/zh_cn/admin/language.php index d30ce2fb..180cc5f4 100644 --- a/resources/lang/zh_cn/admin/language.php +++ b/resources/lang/zh_cn/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => '语言列表', - 'languages_create' => '创建语言', - 'languages_show' => '语言详情', - 'languages_update' => '更新语言', - 'languages_delete' => '删除语言', + 'languages_index' => '语言列表', + 'languages_create' => '创建语言', + 'languages_show' => '语言详情', + 'languages_update' => '更新语言', + 'languages_delete' => '删除语言', 'error_default_language_cannot_delete' => '默认语言不能删除！', - 'help_install' => '注意：安装新语言需要配置对应语言的商品、分类、导航、首页模块、页尾等内容，否则会出现页面显示异常', + 'help_install' => '注意：安装新语言需要配置对应语言的商品、分类、导航、首页模块、页尾等内容，否则会出现页面显示异常', ]; diff --git a/resources/lang/zh_cn/admin/login.php b/resources/lang/zh_cn/admin/login.php index 8805b3df..dab915e6 100644 --- a/resources/lang/zh_cn/admin/login.php +++ b/resources/lang/zh_cn/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => '登录到 BeikeShop 后台', - 'log_in' => '登录', + 'log_in' => '登录', ]; diff --git a/resources/lang/zh_cn/admin/marketing.php b/resources/lang/zh_cn/admin/marketing.php index 5ce68e5b..55f3120d 100644 --- a/resources/lang/zh_cn/admin/marketing.php +++ b/resources/lang/zh_cn/admin/marketing.php @@ -10,25 +10,25 @@ */ return [ - 'marketing_list' => '插件市场', - 'marketing_show' => '插件详情', - 'set_token' => '设置 Token', - 'get_token_text' => '登录 BeikeShop 官网个人中心-绑定域名，添加当前域名', - 'get_token' => '点击获取 Token', - 'download_count' => '下载次数', - 'last_update' => '最后更新', - 'text_version' => '版本', - 'text_compatibility' => '兼容性', - 'text_author' => '插件作者', - 'download_plugin' => '下载插件', + 'marketing_list' => '插件市场', + 'marketing_show' => '插件详情', + 'set_token' => '设置 Token', + 'get_token_text' => '登录 BeikeShop 官网个人中心-绑定域名，添加当前域名', + 'get_token' => '点击获取 Token', + 'download_count' => '下载次数', + 'last_update' => '最后更新', + 'text_version' => '版本', + 'text_compatibility' => '兼容性', + 'text_author' => '插件作者', + 'download_plugin' => '下载插件', 'download_description' => '插件描述', - 'text_free' => '免费', - 'btn_buy' => '购买', - 'text_pay' => '支付金额', - 'select_pay' => '选择支付方式', - 'wxpay' => '微信扫码支付!', - 'pay_success_title' => '支付成功!', - 'pay_success_text' => '插件购买成功，点击确定刷新页面', - 'ali_pay_success' => '已完成支付？', - 'ali_pay_text' => '已完成支付，请刷新页面', + 'text_free' => '免费', + 'btn_buy' => '购买', + 'text_pay' => '支付金额', + 'select_pay' => '选择支付方式', + 'wxpay' => '微信扫码支付!', + 'pay_success_title' => '支付成功!', + 'pay_success_text' => '插件购买成功，点击确定刷新页面', + 'ali_pay_success' => '已完成支付？', + 'ali_pay_text' => '已完成支付，请刷新页面', ]; diff --git a/resources/lang/zh_cn/admin/order.php b/resources/lang/zh_cn/admin/order.php index 5ea33f46..a69142de 100644 --- a/resources/lang/zh_cn/admin/order.php +++ b/resources/lang/zh_cn/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => '订单列表', + 'list' => '订单列表', - 'order_quantity' => '订单数量', - 'order_amount' => '订单金额', - 'orders_index' => '订单列表', - 'orders_create' => '创建订单', - 'orders_show' => '订单详情', - 'orders_export' => '导出订单', - 'orders_update' => '更新订单', - 'orders_delete' => '删除订单', - 'notify' => '是否提醒', + 'order_quantity' => '订单数量', + 'order_amount' => '订单金额', + 'orders_index' => '订单列表', + 'orders_create' => '创建订单', + 'orders_show' => '订单详情', + 'orders_export' => '导出订单', + 'orders_update' => '更新订单', + 'orders_delete' => '删除订单', + 'notify' => '是否提醒', 'orders_update_status' => '更新状态', - 'error_status' => '请选择状态', + 'error_status' => '请选择状态', ]; diff --git a/resources/lang/zh_cn/admin/page.php b/resources/lang/zh_cn/admin/page.php index bac2876c..ee85775f 100644 --- a/resources/lang/zh_cn/admin/page.php +++ b/resources/lang/zh_cn/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '信息页面', - 'info_title' => '信息标题', + 'index' => '信息页面', + 'info_title' => '信息标题', 'info_content' => '内容', - 'pages_index' => '单页列表', + 'pages_index' => '单页列表', 'pages_create' => '创建单页', - 'pages_show' => '单页详情', + 'pages_show' => '单页详情', 'pages_update' => '单页编辑', - 'pages_delete' => '删除单页' + 'pages_delete' => '删除单页', ]; diff --git a/resources/lang/zh_cn/admin/plugin.php b/resources/lang/zh_cn/admin/plugin.php index 2dc45fbe..cdfee754 100644 --- a/resources/lang/zh_cn/admin/plugin.php +++ b/resources/lang/zh_cn/admin/plugin.php @@ -10,24 +10,24 @@ */ return [ - 'plugins_index' => '插件列表', - 'plugins_import' => '上传插件', - 'plugins_show' => '插件详情', - 'plugins_update' => '插件更新', + 'plugins_index' => '插件列表', + 'plugins_import' => '上传插件', + 'plugins_show' => '插件详情', + 'plugins_update' => '插件更新', 'plugins_update_status' => '更新状态', - 'plugins_install' => '安装', - 'plugins_uninstall' => '卸载', + 'plugins_install' => '安装', + 'plugins_uninstall' => '卸载', - 'plugin_list' => '插件列表', - 'plugin_code' => '插件代码', - 'plugin_type' => '插件类型', - 'plugin_description' => '插件描述', - 'plugin_upload' => '上传插件(仅支持 zip 文件)', + 'plugin_list' => '插件列表', + 'plugin_code' => '插件代码', + 'plugin_type' => '插件类型', + 'plugin_description' => '插件描述', + 'plugin_upload' => '上传插件(仅支持 zip 文件)', - 'shipping' => '配送方式', - 'payment' => '支付方式', - 'social' => '社交网络', - 'total' => '订单计算', - 'view' => '页面修改', - 'social' => '第三方登录', + 'shipping' => '配送方式', + 'payment' => '支付方式', + 'social' => '社交网络', + 'total' => '订单计算', + 'view' => '页面修改', + 'social' => '第三方登录', ]; diff --git a/resources/lang/zh_cn/admin/product.php b/resources/lang/zh_cn/admin/product.php index 9136fecf..ee5a4af8 100644 --- a/resources/lang/zh_cn/admin/product.php +++ b/resources/lang/zh_cn/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => '商品列表', - 'products_create' => '创建商品', - 'products_show' => '商品详情', - 'products_update' => '更新商品', - 'products_delete' => '删除商品', - 'products_trashed' => '回收站', - 'products_restore' => '恢复回收站', - 'clear_restore' => '清空回收站', + 'products_index' => '商品列表', + 'products_create' => '创建商品', + 'products_show' => '商品详情', + 'products_update' => '更新商品', + 'products_delete' => '删除商品', + 'products_trashed' => '回收站', + 'products_restore' => '恢复回收站', + 'clear_restore' => '清空回收站', + 'batch_delete' => '批量删除', + 'batch_active' => '批量上架', + 'batch_inactive' => '批量下架', - 'batch_delete' => '批量删除', - 'batch_active' => '批量上架', - 'batch_inactive' => '批量下架', + 'basic_information' => '基础信息', + 'product_details' => '商品详情', + 'product_relations' => '相关商品', + 'stocks' => '商品库存', + 'model' => '型号', + 'price' => '价格', + 'origin_price' => '原价', + 'cost_price' => '成本价', + 'quantity' => '数量', + 'enable_multi_spec' => '启用多规格', + 'image_help' => '第一张图片将作为商品主图,支持同时上传多张图片,多张图片之间可随意调整位置', + 'add_variable' => '添加规格', + 'add_variable_value' => '添加规格值', + 'add_variable_image' => '添加规格图片', + 'default_main_product' => '默认主商品', + 'modify_order' => '双击修改、拖动调整顺序', - 'basic_information' => '基础信息', - 'product_details' => '商品详情', - 'product_relations' => '相关商品', - 'stocks' => '商品库存', - 'model' => '型号', - 'price' => '价格', - 'origin_price' => '原价', - 'cost_price' => '成本价', - 'quantity' => '数量', - 'enable_multi_spec' => '启用多规格', - 'image_help' => '第一张图片将作为商品主图,支持同时上传多张图片,多张图片之间可随意调整位置', - 'add_variable' => '添加规格', - 'add_variable_value' => '添加规格值', - 'add_variable_image' => '添加规格图片', - 'default_main_product' => '默认主商品', - 'modify_order' => '双击修改、拖动调整顺序', - - 'confirm_batch_product' => '确认要批量删除选中的商品吗？', - 'confirm_batch_status' => '确认要批量修改选中的商品的状态吗？', - 'confirm_batch_restore' => '确认要恢复选中的商品吗？', + 'confirm_batch_product' => '确认要批量删除选中的商品吗？', + 'confirm_batch_status' => '确认要批量修改选中的商品的状态吗？', + 'confirm_batch_restore' => '确认要恢复选中的商品吗？', 'confirm_delete_restore' => '确认要清空回收站吗？', ]; diff --git a/resources/lang/zh_cn/admin/region.php b/resources/lang/zh_cn/admin/region.php index 6fc24312..10d0acc4 100644 --- a/resources/lang/zh_cn/admin/region.php +++ b/resources/lang/zh_cn/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => '区域组', - 'regions_index' => '区域组列表', + 'index' => '区域组', + 'regions_index' => '区域组列表', 'regions_create' => '创建区域组', - 'regions_show' => '区域组详情', + 'regions_show' => '区域组详情', 'regions_update' => '更新区域组', 'regions_delete' => '删除区域组', - 'name' => '名称', - 'describe' => '描述', - 'country' => '国家', - 'zone' => '省份', + 'name' => '名称', + 'describe' => '描述', + 'country' => '国家', + 'zone' => '省份', ]; diff --git a/resources/lang/zh_cn/admin/rma.php b/resources/lang/zh_cn/admin/rma.php index ddc9b3d1..f060f3b9 100644 --- a/resources/lang/zh_cn/admin/rma.php +++ b/resources/lang/zh_cn/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => '售后申请', + 'index' => '售后申请', - 'rmas_index' => '售后服务列表', - 'rmas_show' => '售后服务详情', - 'rmas_update' => '更新售后服务', - 'rmas_delete' => '删除售后服务', + 'rmas_index' => '售后服务列表', + 'rmas_show' => '售后服务详情', + 'rmas_update' => '更新售后服务', + 'rmas_delete' => '删除售后服务', - 'customers_name' => '客户姓名', - 'quantity' => '数量', - 'service_type' => '服务类型', - 'rma_details' => '售后申请详情', - 'reasons_return' => '退货原因', - 'current_state' => '当前状态', - 'modify_status' => '修改状态', - 'remarks' => '备注信息', - 'update_status' => '更新状态', + 'customers_name' => '客户姓名', + 'quantity' => '数量', + 'service_type' => '服务类型', + 'rma_details' => '售后申请详情', + 'reasons_return' => '退货原因', + 'current_state' => '当前状态', + 'modify_status' => '修改状态', + 'remarks' => '备注信息', + 'update_status' => '更新状态', 'operation_history' => '操作历史', ]; diff --git a/resources/lang/zh_cn/admin/rma_reason.php b/resources/lang/zh_cn/admin/rma_reason.php index 50beb5d7..a8da1fd9 100644 --- a/resources/lang/zh_cn/admin/rma_reason.php +++ b/resources/lang/zh_cn/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => '原因列表', + 'rma_reasons_index' => '原因列表', 'rma_reasons_create' => '创建原因', 'rma_reasons_update' => '更新原因', - 'rma_reasons_delete' => '删除原因' + 'rma_reasons_delete' => '删除原因', ]; diff --git a/resources/lang/zh_cn/admin/role.php b/resources/lang/zh_cn/admin/role.php index e61aad24..37334618 100644 --- a/resources/lang/zh_cn/admin/role.php +++ b/resources/lang/zh_cn/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => '角色列表', - 'admin_roles_create' => '创建角色', - 'admin_roles_show' => '角色详情', - 'admin_roles_update' => '更新角色', - 'admin_roles_delete' => '删除角色', - 'select_one_at_least' => '权限不能为空,请选择至少一项' + 'admin_roles_index' => '角色列表', + 'admin_roles_create' => '创建角色', + 'admin_roles_show' => '角色详情', + 'admin_roles_update' => '更新角色', + 'admin_roles_delete' => '删除角色', + 'select_one_at_least' => '权限不能为空,请选择至少一项', ]; diff --git a/resources/lang/zh_cn/admin/setting.php b/resources/lang/zh_cn/admin/setting.php index b9ed8019..5f2a368c 100644 --- a/resources/lang/zh_cn/admin/setting.php +++ b/resources/lang/zh_cn/admin/setting.php @@ -10,60 +10,60 @@ */ return [ - 'index' => '系统设置', - 'settings_index' => '查看系统设置', - 'settings_update' => '修改系统设置', - 'design_index' => '首页编辑器', - 'design_footer_index' => '页尾编辑器', - 'design_menu_index' => '导航编辑器', - 'product_per_page' => '每页显示数量', + 'index' => '系统设置', + 'settings_index' => '查看系统设置', + 'settings_update' => '修改系统设置', + 'design_index' => '首页编辑器', + 'design_footer_index' => '页尾编辑器', + 'design_menu_index' => '导航编辑器', + 'product_per_page' => '每页显示数量', - '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`', + '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' => '发货地址', - 'payment_address' => '账单地址', - 'meta_title' => 'Meta 标题', - 'meta_description' => 'Meta 描述', - 'meta_keywords' => 'Meta 关键词', - 'telephone' => '联系电话', - 'email' => '邮箱', - 'default_address' => '默认地址', - 'default_country_set' => '默认国家设置', - 'default_zone_set' => '默认省份设置', - 'default_language' => '默认语言', - 'default_currency' => '默认货币', + 'guest_checkout' => '游客结账', + 'theme_default' => '默认主题', + 'theme_black' => '黑色主题', + 'shipping_address' => '发货地址', + 'payment_address' => '账单地址', + 'meta_title' => 'Meta 标题', + 'meta_description' => 'Meta 描述', + 'meta_keywords' => 'Meta 关键词', + 'telephone' => '联系电话', + 'email' => '邮箱', + 'default_address' => '默认地址', + 'default_country_set' => '默认国家设置', + 'default_zone_set' => '默认省份设置', + 'default_language' => '默认语言', + 'default_currency' => '默认货币', 'default_customer_group' => '默认客户组', - 'admin_name' => '后台目录', - 'admin_name_info' => '管理后台目录,默认为admin', - 'enable_tax' => '启用税费', - 'enable_tax_info' => '是否启用税费计算', - 'tax_address' => '税费地址', - 'tax_address_info' => '按什么地址计算税费', - 'logo' => '网站 Logo', - 'favicon' => 'favicon', - 'favicon_info' => '显示在浏览器选项卡上的小图标，必须为PNG格式大小为：32*32', - 'placeholder_image' => '占位图', - 'head_code' => '插入代码', - 'head_code_info' => '会将输入框中的代码插入到前端页面 head 中，可用于统计代码或者添加特殊插件等', + 'admin_name' => '后台目录', + 'admin_name_info' => '管理后台目录,默认为admin', + 'enable_tax' => '启用税费', + 'enable_tax_info' => '是否启用税费计算', + 'tax_address' => '税费地址', + 'tax_address_info' => '按什么地址计算税费', + 'logo' => '网站 Logo', + 'favicon' => 'favicon', + 'favicon_info' => '显示在浏览器选项卡上的小图标，必须为PNG格式大小为：32*32', + 'placeholder_image' => '占位图', + 'head_code' => '插入代码', + 'head_code_info' => '会将输入框中的代码插入到前端页面 head 中，可用于统计代码或者添加特殊插件等', ]; diff --git a/resources/lang/zh_cn/admin/tax_class.php b/resources/lang/zh_cn/admin/tax_class.php index 68713da0..a36baa90 100644 --- a/resources/lang/zh_cn/admin/tax_class.php +++ b/resources/lang/zh_cn/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '税类', - 'rule' => '规则', - 'based_on' => '基于', - 'priority' => '优先级', - 'tax_classes_index' => '税类列表', + 'index' => '税类', + 'rule' => '规则', + 'based_on' => '基于', + 'priority' => '优先级', + 'tax_classes_index' => '税类列表', 'tax_classes_create' => '创建税类', - 'tax_classes_show' => '税类详情', + 'tax_classes_show' => '税类详情', 'tax_classes_update' => '更新税类', 'tax_classes_delete' => '删除税类', ]; diff --git a/resources/lang/zh_cn/admin/tax_rate.php b/resources/lang/zh_cn/admin/tax_rate.php index 18f28b1c..73fefd54 100644 --- a/resources/lang/zh_cn/admin/tax_rate.php +++ b/resources/lang/zh_cn/admin/tax_rate.php @@ -10,17 +10,17 @@ */ return [ - 'index' => '税率设置', + 'index' => '税率设置', 'tax_classes_index' => '税类设置', - 'tax' => '税种', - 'tax_rate' => '税率', - 'type' => '类型', - 'area' => '区域', - 'percentage' => '百分比', - 'fixed_tax_rate' => '固定税率', - 'tax_rates_index' => '税率列表', - 'tax_rates_create' => '创建税率', - 'tax_rates_show' => '税率详情', - 'tax_rates_update' => '更新税率', - 'tax_rates_delete' => '删除税率', + 'tax' => '税种', + 'tax_rate' => '税率', + 'type' => '类型', + 'area' => '区域', + 'percentage' => '百分比', + 'fixed_tax_rate' => '固定税率', + 'tax_rates_index' => '税率列表', + 'tax_rates_create' => '创建税率', + 'tax_rates_show' => '税率详情', + 'tax_rates_update' => '更新税率', + 'tax_rates_delete' => '删除税率', ]; diff --git a/resources/lang/zh_cn/admin/user.php b/resources/lang/zh_cn/admin/user.php index 7f344aef..d24ee7da 100644 --- a/resources/lang/zh_cn/admin/user.php +++ b/resources/lang/zh_cn/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => '用户列表', - 'admin_users_create' => '创建用户', - 'admin_users_show' => '用户详情', - 'admin_users_update' => '更新用户', - 'admin_users_delete' => '删除用户', + 'admin_users_index' => '用户列表', + 'admin_users_create' => '创建用户', + 'admin_users_show' => '用户详情', + 'admin_users_update' => '更新用户', + 'admin_users_delete' => '删除用户', 'verify_code_expired' => '您的验证码已过期（10分钟），请重新获取', - 'verify_code_error' => '您的验证码错误', - 'account_not_exist' => '账号不存在', + 'verify_code_error' => '您的验证码错误', + 'account_not_exist' => '账号不存在', ]; diff --git a/resources/lang/zh_cn/admin/zone.php b/resources/lang/zh_cn/admin/zone.php index 91c7dd35..d47c8f06 100644 --- a/resources/lang/zh_cn/admin/zone.php +++ b/resources/lang/zh_cn/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => '省份名称', + 'zone_name' => '省份名称', 'country_of_origin' => '所属国家', - 'zones_index' => '省份列表', - 'zones_create' => '创建省份', - 'zones_update' => '更新省份', - 'zones_delete' => '删除省份', + 'zones_index' => '省份列表', + 'zones_create' => '创建省份', + 'zones_update' => '更新省份', + 'zones_delete' => '删除省份', - 'error_country' => '请选择国家', + 'error_country' => '请选择国家', ]; diff --git a/resources/lang/zh_cn/auth.php b/resources/lang/zh_cn/auth.php index 827e48d4..bed1d48f 100644 --- a/resources/lang/zh_cn/auth.php +++ b/resources/lang/zh_cn/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => '账号密码不匹配', + 'failed' => '账号密码不匹配', 'password' => '密码不正确', 'throttle' => '失败次数太多. 请 :seconds 分钟后重试.', diff --git a/resources/lang/zh_cn/brand.php b/resources/lang/zh_cn/brand.php index 7ca3612d..6aa22514 100644 --- a/resources/lang/zh_cn/brand.php +++ b/resources/lang/zh_cn/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => '品牌名称', - 'icon' => '图标', + 'name' => '品牌名称', + 'icon' => '图标', 'first_letter' => '首字母', ]; diff --git a/resources/lang/zh_cn/cart.php b/resources/lang/zh_cn/cart.php index f01e4704..846a3ec1 100644 --- a/resources/lang/zh_cn/cart.php +++ b/resources/lang/zh_cn/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => '购买数量', + 'sku_id' => 'SKU ID', + 'quantity' => '购买数量', 'stock_out' => '库存不足', ]; diff --git a/resources/lang/zh_cn/common.php b/resources/lang/zh_cn/common.php index fc37f279..3c003c6b 100644 --- a/resources/lang/zh_cn/common.php +++ b/resources/lang/zh_cn/common.php @@ -9,79 +9,77 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => '请填写 :name', // 这个有用别删了，:name 是一个变量 + 'error_required' => '请填写 :name', // 这个有用别删了，:name 是一个变量 'error_input_required' => '输入框不能为空', - 'error_form' => '请检查表单是否填写正确', - 'email' => '邮箱', - 'unauthenticated' => '请先登录', - 'success' => '成功', - 'no_data' => '暂无数据～', - 'empty_items' => '没有数据', - 'created_success' => '创建成功!', - 'deleted_success' => '删除成功!', - 'restored_success' => '恢复成功!', - 'updated_success' => '更新成功!', - 'edit_success' => '修改成功!', - 'get_success' => '获取成功!', - 'all' => '全部', - 'status' => '状态', - 'enable' => '启用', - 'disable' => '禁用', - 'enabled' => '启用', - 'disabled' => '禁用', - 'home' => '首页', - 'submit' => '提交', - 'title' => '标题', - 'save' => '保存', - 'cancel' => '取消', - 'confirm' => '确定', - 'no' => '否', - 'yes' => '是', - 'delete' => '删除', - 'sign_out' => '退出登录', - 'contact_us' => '联系我们', - 'input' => '在此处输入您的搜索', - 'filter' => '筛选', - 'reset' => '重置', - 'export' => '导出', - 'edit' => '编辑', - 'action' => '操作', - 'add' => '添加', - 'please_choose' => '请选择', - 'recommend_size' => '建议尺寸', - 'pick_datetime' => '选择时间', - 'confirm_delete' => '确定要删除吗?', - 'text_hint' => '提示', - 'restore' => '恢复', - 'name' => '名称', - 'image' => '图片', - 'data' => '数据', - 'view' => '查看', - 'phone' => '电话', - 'exit' => '退出', - 'return' => '返回', - 'language' => '语言', - 'select_all' => '全选', - 'sign_out' => '退出登录', - 'menu' => '菜单', - 'whether_open' => '是否开启', - 'default' => '默认', - 'to_setting' => '去配置', + 'error_form' => '请检查表单是否填写正确', + 'email' => '邮箱', + 'unauthenticated' => '请先登录', + 'success' => '成功', + 'no_data' => '暂无数据～', + 'empty_items' => '没有数据', + 'created_success' => '创建成功!', + 'deleted_success' => '删除成功!', + 'restored_success' => '恢复成功!', + 'updated_success' => '更新成功!', + 'edit_success' => '修改成功!', + 'get_success' => '获取成功!', + 'all' => '全部', + 'status' => '状态', + 'enable' => '启用', + 'disable' => '禁用', + 'enabled' => '启用', + 'disabled' => '禁用', + 'home' => '首页', + 'submit' => '提交', + 'title' => '标题', + 'save' => '保存', + 'cancel' => '取消', + 'confirm' => '确定', + 'no' => '否', + 'yes' => '是', + 'delete' => '删除', + 'sign_out' => '退出登录', + 'contact_us' => '联系我们', + 'input' => '在此处输入您的搜索', + 'filter' => '筛选', + 'reset' => '重置', + 'export' => '导出', + 'edit' => '编辑', + 'action' => '操作', + 'add' => '添加', + 'please_choose' => '请选择', + 'recommend_size' => '建议尺寸', + 'pick_datetime' => '选择时间', + 'confirm_delete' => '确定要删除吗?', + 'text_hint' => '提示', + 'restore' => '恢复', + 'name' => '名称', + 'image' => '图片', + 'data' => '数据', + 'view' => '查看', + 'phone' => '电话', + 'exit' => '退出', + 'return' => '返回', + 'language' => '语言', + 'select_all' => '全选', + 'sign_out' => '退出登录', + 'menu' => '菜单', + 'whether_open' => '是否开启', + 'default' => '默认', + 'to_setting' => '去配置', - 'id' => 'ID', - 'created_at' => '创建时间', - 'updated_at' => '修改时间', - 'sort_order' => '排序', - 'error_page' => '您访问的数据不存在或已被删除~', - 'error_page_btn' => '返回上一页', + 'id' => 'ID', + 'created_at' => '创建时间', + 'updated_at' => '修改时间', + 'sort_order' => '排序', + 'error_page' => '您访问的数据不存在或已被删除~', + 'error_page_btn' => '返回上一页', - 'order' => [ - 'unpaid' => '待支付', - 'paid' => '已支付', - 'shipped' => '已发货', + 'order' => [ + 'unpaid' => '待支付', + 'paid' => '已支付', + 'shipped' => '已发货', 'completed' => '已完成', 'cancelled' => '已取消', - ] + ], ]; - - diff --git a/resources/lang/zh_cn/currency.php b/resources/lang/zh_cn/currency.php index 8ed42caa..a66a6025 100644 --- a/resources/lang/zh_cn/currency.php +++ b/resources/lang/zh_cn/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => '名称', - 'code' => '编码', - 'icon' => '图标', - 'symbol_left' => '左符号', - 'symbol_right' => '右符号', - 'value' => '汇率值', - 'decimal_place' => '小数位数', + 'name' => '名称', + 'code' => '编码', + 'icon' => '图标', + 'symbol_left' => '左符号', + 'symbol_right' => '右符号', + 'value' => '汇率值', + 'decimal_place' => '小数位数', ]; diff --git a/resources/lang/zh_cn/customer.php b/resources/lang/zh_cn/customer.php index 75309727..0ab1f81d 100644 --- a/resources/lang/zh_cn/customer.php +++ b/resources/lang/zh_cn/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => '姓名', - 'email' => 'Email', - 'from' => '注册来源', + 'name' => '姓名', + 'email' => 'Email', + 'from' => '注册来源', 'customer_group' => '用户组', ]; diff --git a/resources/lang/zh_cn/customer_group.php b/resources/lang/zh_cn/customer_group.php index 5773bca7..efba1648 100644 --- a/resources/lang/zh_cn/customer_group.php +++ b/resources/lang/zh_cn/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => '等级', - 'name' => '客户组名称', + 'name' => '客户组名称', ]; diff --git a/resources/lang/zh_cn/mail.php b/resources/lang/zh_cn/mail.php index ffd98fb8..156829fe 100644 --- a/resources/lang/zh_cn/mail.php +++ b/resources/lang/zh_cn/mail.php @@ -10,18 +10,18 @@ */ return [ - 'order_success' => '订单提交成功', - 'order_update' => '订单状态更新', - 'order_success_info' => '您的订单已提交成功，下面是订单明细', - 'not_oneself' => '非本人操作可忽略。', - 'customer_name' => '尊敬的 :name 用户，您好！', - 'sincerely' => '此致', - 'team' => '团队', - 'order_update_status' => '您的订单 :number 状态更新为', - 'welcome_register' => '欢迎注册', - 'register_end' => '完成注册，请点击下面按钮回到商城。', - 'btn_buy_now' => '立即购买', + 'order_success' => '订单提交成功', + 'order_update' => '订单状态更新', + 'order_success_info' => '您的订单已提交成功，下面是订单明细', + 'not_oneself' => '非本人操作可忽略。', + 'customer_name' => '尊敬的 :name 用户，您好！', + 'sincerely' => '此致', + 'team' => '团队', + 'order_update_status' => '您的订单 :number 状态更新为', + 'welcome_register' => '欢迎注册', + 'register_end' => '完成注册，请点击下面按钮回到商城。', + 'btn_buy_now' => '立即购买', 'retrieve_password_title' => '找回密码', - 'retrieve_password_text' => '您正在找回密码，请点击下面按钮完成操作。', - 'retrieve_password_btn' => '点击此处重置密码', + 'retrieve_password_text' => '您正在找回密码，请点击下面按钮完成操作。', + 'retrieve_password_btn' => '点击此处重置密码', ]; diff --git a/resources/lang/zh_cn/order.php b/resources/lang/zh_cn/order.php index 02c0dba4..6db1d3ec 100644 --- a/resources/lang/zh_cn/order.php +++ b/resources/lang/zh_cn/order.php @@ -10,46 +10,46 @@ */ return [ - 'id' => 'ID', - 'number' => '订单号', - 'customer_name' => '客户姓名', - 'payment_method' => '支付方式', - 'email' => 'Email', - 'telephone' => '联系电话', - 'created_at' => '创建时间', - 'updated_at' => '更新时间', - 'status' => '状态', - 'status_format' => '状态', - 'total' => '订单总额', - 'express_number' => '快递单号', - 'express_company' => '快递公司', + 'id' => 'ID', + 'number' => '订单号', + 'customer_name' => '客户姓名', + 'payment_method' => '支付方式', + 'email' => 'Email', + 'telephone' => '联系电话', + 'created_at' => '创建时间', + 'updated_at' => '更新时间', + 'status' => '状态', + 'status_format' => '状态', + 'total' => '订单总额', + 'express_number' => '快递单号', + 'express_company' => '快递公司', - 'order_shipments' => '发货信息', + 'order_shipments' => '发货信息', - 'address_info' => '地址信息', - 'shipping_address' => '配送地址', - 'payment_address' => '账单地址', - 'order_status' => '订单状态', - 'current_status' => '当前状态', - 'change_to_status' => '修改状态', - 'comment' => '备注信息', - 'submit_status' => '更新状态', + 'address_info' => '地址信息', + 'shipping_address' => '配送地址', + 'payment_address' => '账单地址', + 'order_status' => '订单状态', + 'current_status' => '当前状态', + 'change_to_status' => '修改状态', + 'comment' => '备注信息', + 'submit_status' => '更新状态', - 'product_info' => '商品信息', - 'product_name' => '名称', - 'product_price' => '价格', - 'product_sub_price' => '小计', - 'product_quantity' => '数量', - 'product_sku' => 'SKU', + 'product_info' => '商品信息', + 'product_name' => '名称', + 'product_price' => '价格', + 'product_sub_price' => '小计', + 'product_quantity' => '数量', + 'product_sku' => 'SKU', - 'action_history' => '操作日志', - 'history_status' => '状态', - 'history_comment' => '备注', + 'action_history' => '操作日志', + 'history_status' => '状态', + 'history_comment' => '备注', 'history_created_at' => '更新日期', - 'unpaid' => '待支付', - 'paid' => '已支付', - 'shipped' => '已发货', - 'completed' => '已完成', - 'cancelled' => '已取消', + 'unpaid' => '待支付', + 'paid' => '已支付', + 'shipped' => '已发货', + 'completed' => '已完成', + 'cancelled' => '已取消', ]; diff --git a/resources/lang/zh_cn/page.php b/resources/lang/zh_cn/page.php index ea053237..11db2d15 100644 --- a/resources/lang/zh_cn/page.php +++ b/resources/lang/zh_cn/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => '标题', + 'title' => '标题', 'content' => '内容', ]; diff --git a/resources/lang/zh_cn/pagination.php b/resources/lang/zh_cn/pagination.php index 4e8dea7c..f1fc4b5a 100644 --- a/resources/lang/zh_cn/pagination.php +++ b/resources/lang/zh_cn/pagination.php @@ -14,6 +14,6 @@ return [ */ 'previous' => '« 上一页', - 'next' => '下一页 »', + 'next' => '下一页 »', ]; diff --git a/resources/lang/zh_cn/passwords.php b/resources/lang/zh_cn/passwords.php index 2345a56b..526795fb 100644 --- a/resources/lang/zh_cn/passwords.php +++ b/resources/lang/zh_cn/passwords.php @@ -13,10 +13,10 @@ return [ | */ - 'reset' => 'Your password has been reset!', - 'sent' => 'We have emailed your password reset link!', + 'reset' => 'Your password has been reset!', + 'sent' => 'We have emailed your password reset link!', 'throttled' => 'Please wait before retrying.', - 'token' => 'This password reset token is invalid.', - 'user' => "We can't find a user with that email address.", + 'token' => 'This password reset token is invalid.', + 'user' => "We can't find a user with that email address.", ]; diff --git a/resources/lang/zh_cn/product.php b/resources/lang/zh_cn/product.php index b0179183..db6dee1a 100644 --- a/resources/lang/zh_cn/product.php +++ b/resources/lang/zh_cn/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => '名称', - 'sku' => 'SKU', - 'price' => '价格', - 'origin_price' => '原价', - 'cost_price' => '成本价', - 'brand' => '品牌', - 'category' => '分类', - 'model' => '型号', - 'quantity' => '库存', - 'image' => '图片', + 'name' => '名称', + 'sku' => 'SKU', + 'price' => '价格', + 'origin_price' => '原价', + 'cost_price' => '成本价', + 'brand' => '品牌', + 'category' => '分类', + 'model' => '型号', + 'quantity' => '库存', + 'image' => '图片', - 'active' => '上架', - 'inactive' => '下架', + 'active' => '上架', + 'inactive' => '下架', 'has_been_inactive' => '该商品已下架', ]; diff --git a/resources/lang/zh_cn/rma.php b/resources/lang/zh_cn/rma.php index 38bbe144..3b50639a 100644 --- a/resources/lang/zh_cn/rma.php +++ b/resources/lang/zh_cn/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => '订单', + 'order_id' => '订单', 'order_product_id' => '订单商品', - 'customer_id' => '顾客', - 'quantity' => '数量', - 'opened' => '已拆包装', - 'rma_reason_id' => '退换货原因', - 'type' => '售后服务类型', + 'customer_id' => '顾客', + 'quantity' => '数量', + 'opened' => '已拆包装', + 'rma_reason_id' => '退换货原因', + 'type' => '售后服务类型', - 'status_pending' => '待处理', - 'status_rejected' => '已拒绝', - 'status_approved' => '已批准（待顾客寄回商品）', - 'status_shipped' => '已发货（寄回商品）', + 'status_pending' => '待处理', + 'status_rejected' => '已拒绝', + 'status_approved' => '已批准（待顾客寄回商品）', + 'status_shipped' => '已发货（寄回商品）', 'status_completed' => '已完成', - 'type_return' => '退货', - 'type_exchange' => '换货', - 'type_repair' => '维修', - 'type_reissue' => '补发商品', - 'type_refund' => '仅退款' + 'type_return' => '退货', + 'type_exchange' => '换货', + 'type_repair' => '维修', + 'type_reissue' => '补发商品', + 'type_refund' => '仅退款', ]; diff --git a/resources/lang/zh_cn/shop/account.php b/resources/lang/zh_cn/shop/account.php index ede08b28..b3518e3a 100644 --- a/resources/lang/zh_cn/shop/account.php +++ b/resources/lang/zh_cn/shop/account.php @@ -10,129 +10,129 @@ */ return [ - 'index' => '个人中心', - 'revise_info' => '修改信息', - 'collect' => '收藏', - 'coupon' => '优惠券', - 'my_order' => '我的订单', - 'orders' => '全部订单', - 'pending_payment' => '待付款', - 'pending_send' => '待发货', - 'pending_receipt' => '待收货', - 'after_sales' => '售后', - 'no_order' => '您还没有订单！', - 'to_buy' => '去下单', - 'order_number' => '订单号', - 'order_time' => '下单时间', - 'state' => '状态', - 'amount' => '金额', - 'check_details' => '查看详情', - 'all' => '共', - 'items' => '件商品', + 'index' => '个人中心', + 'revise_info' => '修改信息', + 'collect' => '收藏', + 'coupon' => '优惠券', + 'my_order' => '我的订单', + 'orders' => '全部订单', + 'pending_payment' => '待付款', + 'pending_send' => '待发货', + 'pending_receipt' => '待收货', + 'after_sales' => '售后', + 'no_order' => '您还没有订单！', + 'to_buy' => '去下单', + 'order_number' => '订单号', + 'order_time' => '下单时间', + 'state' => '状态', + 'amount' => '金额', + 'check_details' => '查看详情', + 'all' => '共', + 'items' => '件商品', 'verify_code_expired' => '您的验证码已过期（10分钟），请重新获取', - 'verify_code_error' => '您的验证码错误', - 'account_not_exist' => '账号不存在', + 'verify_code_error' => '您的验证码错误', + 'account_not_exist' => '账号不存在', - 'edit' => [ - 'index' => '修改个人信息', - 'modify_avatar' => '修改头像', - 'suggest' => '上传JPG或PNG图片。建议300 x 300。', - 'name' => '名称', - 'email' => '邮箱', - 'crop' => '裁剪', + 'edit' => [ + 'index' => '修改个人信息', + 'modify_avatar' => '修改头像', + 'suggest' => '上传JPG或PNG图片。建议300 x 300。', + 'name' => '名称', + 'email' => '邮箱', + 'crop' => '裁剪', 'password_edit_success' => '密码修改成功', - 'origin_password_fail' => '原密码错误', + 'origin_password_fail' => '原密码错误', ], - 'wishlist' => [ - 'index' => '我的收藏', - 'product' => '商品', - 'price' => '价格', + 'wishlist' => [ + 'index' => '我的收藏', + 'product' => '商品', + 'price' => '价格', 'check_details' => '查看详情', ], - 'order' => [ - 'index' => '我的订单', - 'completed' => '已确认收货', - 'cancelled' => '订单已取消', + 'order' => [ + 'index' => '我的订单', + 'completed' => '已确认收货', + 'cancelled' => '订单已取消', 'order_details' => '订单详情', - 'amount' => '金额', - 'state' => '状态', - 'order_number' => '订单号', - 'check' => '查看', + 'amount' => '金额', + 'state' => '状态', + 'order_number' => '订单号', + 'check' => '查看', - 'order_info' => [ - 'index' => '订单详情', - 'order_details' => '订单详情', - 'to_pay' => '去支付', - 'cancel' => '取消订单', - 'confirm_receipt' => '确认收货', - 'order_number' => '订单号', - 'order_date' => '下单日期', - 'state' => '状态', - 'order_amount' => '订单金额', - 'order_items' => '订购商品', + 'order_info' => [ + 'index' => '订单详情', + 'order_details' => '订单详情', + 'to_pay' => '去支付', + 'cancel' => '取消订单', + 'confirm_receipt' => '确认收货', + 'order_number' => '订单号', + 'order_date' => '下单日期', + 'state' => '状态', + 'order_amount' => '订单金额', + 'order_items' => '订购商品', 'apply_after_sales' => '申请售后', - 'order_total' => '合计订单', - 'logistics_status' => '物流状态', - 'order_status' => '订单状态', - 'remark' => '备注', - 'update_time' => '更新时间', + 'order_total' => '合计订单', + 'logistics_status' => '物流状态', + 'order_status' => '订单状态', + 'remark' => '备注', + 'update_time' => '更新时间', ], 'order_success' => [ - 'order_success' => '恭喜您，订单生成成功！', - 'order_number' => '订单编号', - 'amounts_payable' => '应付金额 ', - 'payment_method' => '支付方式 ', - 'view_order' => '查看订单详情 ', - 'pay_now' => '立即支付 ', - 'kind_tips' => '温馨提示：您的订单已生成成功，请尽快完成支付哦～ ', - 'also' => '您还可以', - 'continue_purchase' => '继续采购', + 'order_success' => '恭喜您，订单生成成功！', + 'order_number' => '订单编号', + 'amounts_payable' => '应付金额 ', + 'payment_method' => '支付方式 ', + 'view_order' => '查看订单详情 ', + 'pay_now' => '立即支付 ', + 'kind_tips' => '温馨提示：您的订单已生成成功，请尽快完成支付哦～ ', + 'also' => '您还可以', + 'continue_purchase' => '继续采购', 'contact_customer_service' => '如果您在订单过程中有任何问题，可以随时联系我们客服人员', - 'emaill' => '邮箱', - 'service_hotline' => '服务热线', + 'emaill' => '邮箱', + 'service_hotline' => '服务热线', ], ], - 'addresses' => [ - 'index' => '我的地址', - 'add_address' => '添加新地址', + 'addresses' => [ + 'index' => '我的地址', + 'add_address' => '添加新地址', 'default_address' => '默认地址', - 'delete' => '删除', - 'edit' => '编辑', - 'enter_name' => '请输入姓名', - 'enter_phone' => '请输入联系电话', - 'enter_address' => '请输入详细地址 1', + 'delete' => '删除', + 'edit' => '编辑', + 'enter_name' => '请输入姓名', + 'enter_phone' => '请输入联系电话', + 'enter_address' => '请输入详细地址 1', 'select_province' => '请选择省份', - 'enter_city' => '请填写城市', - 'confirm_delete' => '确定要删除地址吗？', - 'hint' => '提示', - 'check_form' => '请检查表单是否填写正确', + 'enter_city' => '请填写城市', + 'confirm_delete' => '确定要删除地址吗？', + 'hint' => '提示', + 'check_form' => '请检查表单是否填写正确', ], - 'rma' => [ - 'index' => '我的售后', - 'commodity' => '商品', - 'quantity' => '数量', - 'service_type' => '服务类型', + 'rma' => [ + 'index' => '我的售后', + 'commodity' => '商品', + 'quantity' => '数量', + 'service_type' => '服务类型', 'return_reason' => '退换原因', 'creation_time' => '创建时间', - 'check' => '查看', + 'check' => '查看', - 'rma_info' => [ + 'rma_info' => [ 'index' => '售后详情', ], - 'rma_form' => [ - 'index' => '提交售后信息', - 'service_type' => '服务类型', + 'rma_form' => [ + 'index' => '提交售后信息', + 'service_type' => '服务类型', 'return_quantity' => '退换数量', - 'unpacked' => '已打开包装', - 'return_reason' => '退换原因', - 'remark' => '备注', - ] - ] + 'unpacked' => '已打开包装', + 'return_reason' => '退换原因', + 'remark' => '备注', + ], + ], ]; diff --git a/resources/lang/zh_cn/shop/carts.php b/resources/lang/zh_cn/shop/carts.php index 61445eee..6d6b8afa 100644 --- a/resources/lang/zh_cn/shop/carts.php +++ b/resources/lang/zh_cn/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => '购物车', - 'added_to_cart' => '已加入购物车', - 'select_all' => '全选', - 'commodity' => '商品', - 'quantity' => '数量', - 'subtotal' => '小计', - 'product_total' => '商品总计', - 'order_total' => '应付总金额', - 'shipping_fee' => '运费', - 'all' => '全部', - 'selected' => '已选', - 'to_checkout' => '去结账', - 'cart_empty' => '您的购物车是空的', - 'go_buy' => '您可以去看看有哪些想买的', - 'go_shopping' => '去逛逛', - 'must_select' => '请选择至少一个商品', - 'mini' => '您的购物车', - 'delete' => '删除', - 'check_cart' => '查看购物车', + 'index' => '购物车', + 'added_to_cart' => '已加入购物车', + 'select_all' => '全选', + 'commodity' => '商品', + 'quantity' => '数量', + 'subtotal' => '小计', + 'product_total' => '商品总计', + 'order_total' => '应付总金额', + 'shipping_fee' => '运费', + 'all' => '全部', + 'selected' => '已选', + 'to_checkout' => '去结账', + 'cart_empty' => '您的购物车是空的', + 'go_buy' => '您可以去看看有哪些想买的', + 'go_shopping' => '去逛逛', + 'must_select' => '请选择至少一个商品', + 'mini' => '您的购物车', + 'delete' => '删除', + 'check_cart' => '查看购物车', - 'invalid_customer' => '购物车客户无效', - 'empty_selected_products' => '购物车选中商品为空', + 'invalid_customer' => '购物车客户无效', + 'empty_selected_products' => '购物车选中商品为空', 'invalid_shipping_address' => '配送地址无效', - 'invalid_payment_address' => '账单地址无效', - 'invalid_shipping_method' => '配送方式不可用', - 'invalid_payment_method' => '支付方式不可用', + 'invalid_payment_address' => '账单地址无效', + 'invalid_shipping_method' => '配送方式不可用', + 'invalid_payment_method' => '支付方式不可用', ]; diff --git a/resources/lang/zh_cn/shop/checkout.php b/resources/lang/zh_cn/shop/checkout.php index 55f4b9c2..d5359aaf 100644 --- a/resources/lang/zh_cn/shop/checkout.php +++ b/resources/lang/zh_cn/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => '结账', - 'address' => '配送地址', - 'payment_address' => '账单地址', + 'index' => '结账', + 'address' => '配送地址', + 'payment_address' => '账单地址', 'same_as_shipping_address' => '账单地址同收货地址', - 'chosen' => '已选择', - 'edit' => '编辑', - 'choose_another_address' => '选择其他地址', - 'add_new_address' => '添加新地址', - 'payment_method' => '支付方式', - 'delivery_method' => '配送方式', - 'cart_totals' => '购物车总数', - 'submit_order' => '提交订单', - 'enter_name' => '请输入姓名', - 'enter_phone' => '请输入联系电话', - 'enter_address' => '请输入详细地址 1', - 'select_province' => '请选择省份', - 'enter_city' => '请填写城市', - 'check_form' => '请检查表单是否填写正确', - 'error_payment_address' => '请选择账单地址', + 'chosen' => '已选择', + 'edit' => '编辑', + 'choose_another_address' => '选择其他地址', + 'add_new_address' => '添加新地址', + 'payment_method' => '支付方式', + 'delivery_method' => '配送方式', + 'cart_totals' => '购物车总数', + 'submit_order' => '提交订单', + 'enter_name' => '请输入姓名', + 'enter_phone' => '请输入联系电话', + 'enter_address' => '请输入详细地址 1', + 'select_province' => '请选择省份', + 'enter_city' => '请填写城市', + 'check_form' => '请检查表单是否填写正确', + 'error_payment_address' => '请选择账单地址', - 'payment' => [ - 'index' => '请付款', - 'please_pay' => '订单提交成功，请付款', - 'order_number' => '订单编号', + 'payment' => [ + 'index' => '请付款', + 'please_pay' => '订单提交成功，请付款', + 'order_number' => '订单编号', 'amounts_payable' => '应付金额', - 'payment_method' => '支付方式', - ] + 'payment_method' => '支付方式', + ], ]; diff --git a/resources/lang/zh_cn/shop/common.php b/resources/lang/zh_cn/shop/common.php index dd4bcb97..a4b63bfa 100644 --- a/resources/lang/zh_cn/shop/common.php +++ b/resources/lang/zh_cn/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => '首页', - 'submit' => '提交', - 'cancel' => '取消', + 'home' => '首页', + 'submit' => '提交', + 'cancel' => '取消', 'confirm' => '确定', - 'no' => '否', - 'yes' => '是', + 'no' => '否', + 'yes' => '是', ]; diff --git a/resources/lang/zh_cn/shop/currency.php b/resources/lang/zh_cn/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/zh_cn/shop/currency.php +++ b/resources/lang/zh_cn/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/zh_cn/shop/forgotten.php b/resources/lang/zh_cn/shop/forgotten.php index acf395a7..55987b08 100644 --- a/resources/lang/zh_cn/shop/forgotten.php +++ b/resources/lang/zh_cn/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => '忘记密码', - 'follow_prompt' => '请根据提示找回您的密码', - 'email_forCode' => '请输入邮箱地址获取验证码', - 'enter_password' => '请输入新密码', - 'email' => '邮箱', - 'email_address' => '邮箱地址', - 'verification_code' => '验证码', - 'password' => '密码', - 'confirm_password' => '确认密码', - 'send_code' => '发送验证码', - 'to_back' => '返回上一步', - 'enter_password' => '请输入密码', - 'enter_email' => '请输入邮箱', - 'please_confirm' => '请确认密码', - 'password_err' => '两次输入密码不一致!', - 'email_err' => '请输入正确邮箱地址!', - 'enter_code' => '请输入验证码', + 'index' => '忘记密码', + 'follow_prompt' => '请根据提示找回您的密码', + 'email_forCode' => '请输入邮箱地址获取验证码', + 'enter_password' => '请输入新密码', + 'email' => '邮箱', + 'email_address' => '邮箱地址', + 'verification_code' => '验证码', + 'password' => '密码', + 'confirm_password' => '确认密码', + 'send_code' => '发送验证码', + 'to_back' => '返回上一步', + 'enter_password' => '请输入密码', + 'enter_email' => '请输入邮箱', + 'please_confirm' => '请确认密码', + 'password_err' => '两次输入密码不一致!', + 'email_err' => '请输入正确邮箱地址!', + 'enter_code' => '请输入验证码', 'verification_code_sent' => '验证码已发送，请查看并输入验证码', - 'password_updated' => '密码已修改', + 'password_updated' => '密码已修改', ]; diff --git a/resources/lang/zh_cn/shop/login.php b/resources/lang/zh_cn/shop/login.php index 54410617..2a00cabd 100644 --- a/resources/lang/zh_cn/shop/login.php +++ b/resources/lang/zh_cn/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => '用户登录与注册', - 'login_and_sign' => '登录/注册', - 'home' => '首页', - 'library' => '个人中心', - 'login' => '登录', - 'already' => '已经是我们的客户了？', - 'description' => '已经是我们的客户了？', - 'email' => '邮件', - 'email_address' => '邮件地址', - 'password' => '密码', - 'forget_password' => '忘记密码', - 'new' => '新账号', - 'not_already' => '还不是我们的注册客户？', - 'confirm_password' => '确认密码', - 'register' => '注册', - 'enter_password' => '请输入密码', - 'enter_email' => '请输入邮箱', - 'please_confirm' => '请确认密码', - 'password_err' => '两次输入密码不一致!', - 'email_err' => '请输入正确邮箱地址!', - 'check_form' => '请检查表单是否填写正确', + 'index' => '用户登录与注册', + 'login_and_sign' => '登录/注册', + 'home' => '首页', + 'library' => '个人中心', + 'login' => '登录', + 'already' => '已经是我们的客户了？', + 'description' => '已经是我们的客户了？', + 'email' => '邮件', + 'email_address' => '邮件地址', + 'password' => '密码', + 'forget_password' => '忘记密码', + 'new' => '新账号', + 'not_already' => '还不是我们的注册客户？', + 'confirm_password' => '确认密码', + 'register' => '注册', + 'enter_password' => '请输入密码', + 'enter_email' => '请输入邮箱', + 'please_confirm' => '请确认密码', + 'password_err' => '两次输入密码不一致!', + 'email_err' => '请输入正确邮箱地址!', + 'check_form' => '请检查表单是否填写正确', 'email_or_password_error' => '邮件或密码错误!', - 'customer_inactive' => '用户已被禁用', - 'login_successfully' => '登录成功', - 'register_success' => '注册成功', - 'third_party_logins' => '第三方登录', + 'customer_inactive' => '用户已被禁用', + 'login_successfully' => '登录成功', + 'register_success' => '注册成功', + 'third_party_logins' => '第三方登录', ]; diff --git a/resources/lang/zh_cn/shop/order.php b/resources/lang/zh_cn/shop/order.php index 2668b364..c4c44f68 100644 --- a/resources/lang/zh_cn/shop/order.php +++ b/resources/lang/zh_cn/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => '无效的订单', - 'confirm_order' => '用户确认收货', - 'cancel_order' => '用户取消订单', + 'invalid_order' => '无效的订单', + 'confirm_order' => '用户确认收货', + 'cancel_order' => '用户取消订单', 'order_already_paid' => '订单已支付', ]; diff --git a/resources/lang/zh_cn/shop/products.php b/resources/lang/zh_cn/shop/products.php index 6f9c656c..180e9a66 100644 --- a/resources/lang/zh_cn/shop/products.php +++ b/resources/lang/zh_cn/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => '搜索', + 'search' => '搜索', 'add_to_favorites' => '加入收藏夹', - 'add_to_cart' => '加入购物车', - 'buy_now' => '立即购买', - 'product_details' => '商品详情', - 'in_stock' => '有货', - 'out_stock' => '缺货', - 'model' => '型号', + 'add_to_cart' => '加入购物车', + 'buy_now' => '立即购买', + 'product_details' => '商品详情', + 'in_stock' => '有货', + 'out_stock' => '缺货', + 'model' => '型号', ]; diff --git a/resources/lang/zh_cn/shop/steps.php b/resources/lang/zh_cn/shop/steps.php index 73e7c5cf..7e11fb80 100644 --- a/resources/lang/zh_cn/shop/steps.php +++ b/resources/lang/zh_cn/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => '步骤', - 'cart' => '购物车', - 'checkout' => '结账', + 'index' => '步骤', + 'cart' => '购物车', + 'checkout' => '结账', 'submitted_successfully' => '提交成功', - 'payment' => '付款', + 'payment' => '付款', ]; diff --git a/resources/lang/zh_cn/shop/wishlist.php b/resources/lang/zh_cn/shop/wishlist.php index 245f4d8a..e1a94496 100644 --- a/resources/lang/zh_cn/shop/wishlist.php +++ b/resources/lang/zh_cn/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => '加入收藏成功', + 'add_wishlist_success' => '加入收藏成功', 'remove_wishlist_success' => '移除收藏成功', ]; diff --git a/resources/lang/zh_cn/validation.php b/resources/lang/zh_cn/validation.php index 49f55417..d9bd7379 100644 --- a/resources/lang/zh_cn/validation.php +++ b/resources/lang/zh_cn/validation.php @@ -13,119 +13,119 @@ return [ | */ - 'accepted' => ':attribute 必须接受。', - 'accepted_if' => '当:other为:value时，:attribute 必须接受。', - 'active_url' => ':attribute 必须是一个有效的 URL。', - 'after' => ':attribute 必须是 :date 之后的一个日期。', - 'after_or_equal' => ':attribute 必须是 :date 之后或相同的一个日期。', - 'alpha' => ':attribute 只能包含字母。', - 'alpha_dash' => ':attribute 只能包含字母、数字、中划线或下划线。', - 'alpha_num' => ':attribute 只能包含字母和数字。', - 'array' => ':attribute 必须是一个数组。', - 'before' => ':attribute 必须是 :date 之前的一个日期。', - 'before_or_equal' => ':attribute 必须是 :date 之前或相同的一个日期。', - 'between' => [ + 'accepted' => ':attribute 必须接受。', + 'accepted_if' => '当:other为:value时，:attribute 必须接受。', + 'active_url' => ':attribute 必须是一个有效的 URL。', + 'after' => ':attribute 必须是 :date 之后的一个日期。', + 'after_or_equal' => ':attribute 必须是 :date 之后或相同的一个日期。', + 'alpha' => ':attribute 只能包含字母。', + 'alpha_dash' => ':attribute 只能包含字母、数字、中划线或下划线。', + 'alpha_num' => ':attribute 只能包含字母和数字。', + 'array' => ':attribute 必须是一个数组。', + 'before' => ':attribute 必须是 :date 之前的一个日期。', + 'before_or_equal' => ':attribute 必须是 :date 之前或相同的一个日期。', + 'between' => [ 'numeric' => ':attribute 必须在 :min 到 :max 之间。', - 'file' => ':attribute 必须在 :min 到 :max KB 之间。', - 'string' => ':attribute 必须在 :min 到 :max 个字符之间。', - 'array' => ':attribute 必须在 :min 到 :max 项之间。', + 'file' => ':attribute 必须在 :min 到 :max KB 之间。', + 'string' => ':attribute 必须在 :min 到 :max 个字符之间。', + 'array' => ':attribute 必须在 :min 到 :max 项之间。', ], - 'boolean' => ':attribute 字符必须是 true 或 false。', - 'confirmed' => ':attribute 二次确认不匹配。', - 'current_password' => '密码不不正确。', - 'date' => ':attribute 必须是一个有效的日期。', - 'date_equals' => ':attribute 必须相同于 :date。', - 'date_format' => ':attribute 与给定的格式 :format 不符合。', - 'declined' => ':attribute 必须被拒绝。', - 'declined_if' => '当:other为:value.时，:attribute 必须被拒绝。', - 'different' => ':attribute 必须不同于 :other。', - 'digits' => ':attribute 必须是 :digits 位数。', - 'digits_between' => ':attribute 必须在 :min 和 :max 位之间。', - 'dimensions' => ':attribute 具有无效的图片尺寸。', - 'distinct' => ':attribute 字段具有重复值。', - 'email' => ':attribute 必须是一个有效的电子邮件地址。', - 'ends_with' => ':attribute 必须以 :values 结束。', - 'exists' => '选定的 :attribute 是无效的。', - 'file' => ':attribute 必须是一个文件。', - 'filled' => ':attribute 的字段是必填的。', - 'gt' => [ + 'boolean' => ':attribute 字符必须是 true 或 false。', + 'confirmed' => ':attribute 二次确认不匹配。', + 'current_password' => '密码不不正确。', + 'date' => ':attribute 必须是一个有效的日期。', + 'date_equals' => ':attribute 必须相同于 :date。', + 'date_format' => ':attribute 与给定的格式 :format 不符合。', + 'declined' => ':attribute 必须被拒绝。', + 'declined_if' => '当:other为:value.时，:attribute 必须被拒绝。', + 'different' => ':attribute 必须不同于 :other。', + 'digits' => ':attribute 必须是 :digits 位数。', + 'digits_between' => ':attribute 必须在 :min 和 :max 位之间。', + 'dimensions' => ':attribute 具有无效的图片尺寸。', + 'distinct' => ':attribute 字段具有重复值。', + 'email' => ':attribute 必须是一个有效的电子邮件地址。', + 'ends_with' => ':attribute 必须以 :values 结束。', + 'exists' => '选定的 :attribute 是无效的。', + 'file' => ':attribute 必须是一个文件。', + 'filled' => ':attribute 的字段是必填的。', + 'gt' => [ 'numeric' => ':attribute 必须大于 :value。', - 'file' => ':attribute 必须大于 :value KB。', - 'string' => ':attribute 必须超过 :value 个字符。', - 'array' => ':attribute 必须超过 :value 项。', + 'file' => ':attribute 必须大于 :value KB。', + 'string' => ':attribute 必须超过 :value 个字符。', + 'array' => ':attribute 必须超过 :value 项。', ], - 'gte' => [ + 'gte' => [ 'numeric' => ':attribute 必须大于或相同于 :value。', - 'file' => ':attribute 必须大于或相同于 :value KB。', - 'string' => ':attribute 必须超过或相同于 :value 个字符。', - 'array' => ':attribute 必须超过或相同于 :value 项。', + 'file' => ':attribute 必须大于或相同于 :value KB。', + 'string' => ':attribute 必须超过或相同于 :value 个字符。', + 'array' => ':attribute 必须超过或相同于 :value 项。', ], - 'image' => ':attribute 必须是图片格式。', - 'in' => '选定的 :attribute 是无效的。', - 'in_array' => ':attribute 字段不存在于 :other。', - 'integer' => ':attribute 必须是个整数。', - 'ip' => ':attribute 必须是一个有效的 IP 地址。', - 'ipv4' => ':attribute 必须是个有效的 IPv4 地址。', - 'ipv6' => ':attribute 必须是个有效的 IPv6 地址。', - 'json' => ':attribute 必须是个有效的 JSON 字符串。', - 'lt' => [ + 'image' => ':attribute 必须是图片格式。', + 'in' => '选定的 :attribute 是无效的。', + 'in_array' => ':attribute 字段不存在于 :other。', + 'integer' => ':attribute 必须是个整数。', + 'ip' => ':attribute 必须是一个有效的 IP 地址。', + 'ipv4' => ':attribute 必须是个有效的 IPv4 地址。', + 'ipv6' => ':attribute 必须是个有效的 IPv6 地址。', + 'json' => ':attribute 必须是个有效的 JSON 字符串。', + 'lt' => [ 'numeric' => ':attribute 必须少于 :value。', - 'file' => ':attribute 必须少于 :value KB。', - 'string' => ':attribute 必须少于 :value 个字符。', - 'array' => ':attribute 必须少于 :value 项。', + 'file' => ':attribute 必须少于 :value KB。', + 'string' => ':attribute 必须少于 :value 个字符。', + 'array' => ':attribute 必须少于 :value 项。', ], - 'lte' => [ + 'lte' => [ 'numeric' => ':attribute 必须少于或等于 :value。', - 'file' => ':attribute 必须少于或等于 :value KB。', - 'string' => ':attribute 必须少于或等于 :value 个字符。', - 'array' => ':attribute 必须少于或等于 :value 项。', + 'file' => ':attribute 必须少于或等于 :value KB。', + 'string' => ':attribute 必须少于或等于 :value 个字符。', + 'array' => ':attribute 必须少于或等于 :value 项。', ], - 'max' => [ + 'max' => [ 'numeric' => ':attribute 的最大长度为 :max 位数。', - 'file' => ':attribute 的大小最多为 :max KB。', - 'string' => ':attribute 的最大长度为 :max 字符。', - 'array' => ':attribute 最多为 :max 项。', + 'file' => ':attribute 的大小最多为 :max KB。', + 'string' => ':attribute 的最大长度为 :max 字符。', + 'array' => ':attribute 最多为 :max 项。', ], - 'mimes' => ':attribute 的文件类型必须是 :values。', - 'mimetypes' => ':attribute 的文件类型必须是 :values。', - 'min' => [ + 'mimes' => ':attribute 的文件类型必须是 :values。', + 'mimetypes' => ':attribute 的文件类型必须是 :values。', + 'min' => [ 'numeric' => ':attribute 的最小长度为 :min 位数。', - 'file' => ':attribute 的大小至少为 :min KB。', - 'string' => ':attribute 的最小长度为 :min 字符。', - 'array' => ':attribute 至少有 :min 项。', + 'file' => ':attribute 的大小至少为 :min KB。', + 'string' => ':attribute 的最小长度为 :min 字符。', + 'array' => ':attribute 至少有 :min 项。', ], - 'multiple_of' => ':attribute 必须是 :value 的倍数。', - 'not_in' => '选定的 :attribute 是无效的。', - 'not_regex' => ':attribute 的格式是无效的。', - 'numeric' => ':attribute 必须是数字。', - 'password' => '密码错误。', - 'present' => ':attribute 字段必须存在。', - 'prohibited' => ':attribute 字段是被禁止的。', - 'prohibited_if' => ':attribute 字段是被禁止的当:other为:value。', - 'prohibited_unless' => ':attribute 字段是被禁止的除非 :other 属于 :values。', - 'prohibits' => ':attribute 字段是被禁止的 :other。', - 'regex' => ':attribute 格式是无效的。', - 'required' => ':attribute 字段是必须的。', - 'required_if' => ':attribute 字段是必须的当 :other 是 :value。', - 'required_unless' => ':attribute 字段是必须的，除非 :other 是在 :values 中。', - 'required_with' => ':attribute 字段是必须的当 :values 是存在的。', - 'required_with_all' => ':attribute 字段是必须的当 :values 是存在的。', - 'required_without' => ':attribute 字段是必须的当 :values 是不存在的。', + 'multiple_of' => ':attribute 必须是 :value 的倍数。', + 'not_in' => '选定的 :attribute 是无效的。', + 'not_regex' => ':attribute 的格式是无效的。', + 'numeric' => ':attribute 必须是数字。', + 'password' => '密码错误。', + 'present' => ':attribute 字段必须存在。', + 'prohibited' => ':attribute 字段是被禁止的。', + 'prohibited_if' => ':attribute 字段是被禁止的当:other为:value。', + 'prohibited_unless' => ':attribute 字段是被禁止的除非 :other 属于 :values。', + 'prohibits' => ':attribute 字段是被禁止的 :other。', + 'regex' => ':attribute 格式是无效的。', + 'required' => ':attribute 字段是必须的。', + 'required_if' => ':attribute 字段是必须的当 :other 是 :value。', + 'required_unless' => ':attribute 字段是必须的，除非 :other 是在 :values 中。', + 'required_with' => ':attribute 字段是必须的当 :values 是存在的。', + 'required_with_all' => ':attribute 字段是必须的当 :values 是存在的。', + 'required_without' => ':attribute 字段是必须的当 :values 是不存在的。', 'required_without_all' => ':attribute 字段是必须的当 没有一个 :values 是存在的。', - 'same' => ':attribute和:other必须匹配。', - 'size' => [ + 'same' => ':attribute和:other必须匹配。', + 'size' => [ 'numeric' => ':attribute 必须是 :size 位数。', - 'file' => ':attribute 必须是 :size KB。', - 'string' => ':attribute 必须是 :size 个字符。', - 'array' => ':attribute 必须包括 :size 项。', + 'file' => ':attribute 必须是 :size KB。', + 'string' => ':attribute 必须是 :size 个字符。', + 'array' => ':attribute 必须包括 :size 项。', ], - 'starts_with' => ':attribute 必须以 :values 开始。', - 'string' => ':attribute 必须是一个字符串。', - 'timezone' => ':attribute 必须是个有效的时区。', - 'unique' => ':attribute 已存在。', - 'uploaded' => ':attribute 上传失败。', - 'url' => ':attribute 无效的格式。', - 'uuid' => ':attribute 必须是个有效的 UUID。', + 'starts_with' => ':attribute 必须以 :values 开始。', + 'string' => ':attribute 必须是一个字符串。', + 'timezone' => ':attribute 必须是个有效的时区。', + 'unique' => ':attribute 已存在。', + 'uploaded' => ':attribute 上传失败。', + 'url' => ':attribute 无效的格式。', + 'uuid' => ':attribute 必须是个有效的 UUID。', /* |-------------------------------------------------------------------------- @@ -138,7 +138,7 @@ return [ | */ - 'custom' => [ + 'custom' => [ 'attribute-name' => [ 'rule-name' => 'custom-message', ], @@ -155,15 +155,15 @@ return [ | */ - 'attributes' => [ - 'descriptions.en.title' => '英文标题', + 'attributes' => [ + 'descriptions.en.title' => '英文标题', 'descriptions.zh_cn.title' => '中文标题', - 'tax_rate' => [ + 'tax_rate' => [ 'name' => '税种名称', 'type' => '类型', 'rate' => '税率', - ] + ], ], ]; diff --git a/resources/lang/zh_hk/address.php b/resources/lang/zh_hk/address.php index 68c2bd7d..da3352d2 100644 --- a/resources/lang/zh_hk/address.php +++ b/resources/lang/zh_hk/address.php @@ -10,16 +10,16 @@ */ return [ - 'index' => '編輯地址', - 'name' => '姓名', - 'phone' => '電話號碼', + 'index' => '編輯地址', + 'name' => '姓名', + 'phone' => '電話號碼', 'country_id' => '國家ID', - 'zone' => '省份', - 'zone_id' => '省份ID', - 'address_1' => '地址1', - 'address_2' => '地址2', - 'address' => '地址', + 'zone' => '省份', + 'zone_id' => '省份ID', + 'address_1' => '地址1', + 'address_2' => '地址2', + 'address' => '地址', 'enter_city' => '輸入地址', - 'post_code' => '郵編', - 'default' => '默認地址', + 'post_code' => '郵編', + 'default' => '默認地址', ]; diff --git a/resources/lang/zh_hk/admin/admin_roles.php b/resources/lang/zh_hk/admin/admin_roles.php index 52d75ad0..806eb9b2 100644 --- a/resources/lang/zh_hk/admin/admin_roles.php +++ b/resources/lang/zh_hk/admin/admin_roles.php @@ -10,10 +10,10 @@ */ return [ - 'select_all' => '選中所有', - 'unselect_all' => '取消選中', - 'role_name' => '角色名稱', + 'select_all' => '選中所有', + 'unselect_all' => '取消選中', + 'role_name' => '角色名稱', 'role_management' => '角色管理', - 'permission' => '權限', - 'error_roles' => '請至少選擇一個角色', + 'permission' => '權限', + 'error_roles' => '請至少選擇一個角色', ]; diff --git a/resources/lang/zh_hk/admin/attribute.php b/resources/lang/zh_hk/admin/attribute.php index 61528bc8..3bc8bacd 100644 --- a/resources/lang/zh_hk/admin/attribute.php +++ b/resources/lang/zh_hk/admin/attribute.php @@ -10,14 +10,14 @@ */ return [ - 'index' => '屬性', - 'attribute_info' => '屬性信息', - 'create_at' => '創建屬性', - 'attribute_value' => '屬性值', - 'set_attribute' => '配置屬性', - 'add_attribute' => '添加屬性值', + 'index' => '屬性', + 'attribute_info' => '屬性信息', + 'create_at' => '創建屬性', + 'attribute_value' => '屬性值', + 'set_attribute' => '配置屬性', + 'add_attribute' => '添加屬性值', 'before_attribute' => '請先選擇左邊屬性', - 'btn_at' => '立即前往', - 'btn_later' => '稍後', - 'to_info_values' => '請前往詳情頁編輯屬性值', + 'btn_at' => '立即前往', + 'btn_later' => '稍後', + 'to_info_values' => '請前往詳情頁編輯屬性值', ]; diff --git a/resources/lang/zh_hk/admin/attribute_groups.php b/resources/lang/zh_hk/admin/attribute_groups.php index 94e4dd42..31e44287 100644 --- a/resources/lang/zh_hk/admin/attribute_groups.php +++ b/resources/lang/zh_hk/admin/attribute_groups.php @@ -10,6 +10,6 @@ */ return [ - 'index' => '屬性組', + 'index' => '屬性組', 'create_at_groups' => '創建屬性組', ]; diff --git a/resources/lang/zh_hk/admin/brand.php b/resources/lang/zh_hk/admin/brand.php index ab1dbb44..6dd13f39 100644 --- a/resources/lang/zh_hk/admin/brand.php +++ b/resources/lang/zh_hk/admin/brand.php @@ -10,12 +10,12 @@ */ return [ - 'index' => '品牌', + 'index' => '品牌', - 'brands_index' => '品牌列表', + 'brands_index' => '品牌列表', 'brands_create' => '創建品牌', - 'brands_show' => '品牌詳情', + 'brands_show' => '品牌詳情', 'brands_update' => '更新品牌', 'brands_delete' => '刪除品牌', - 'error_upload' => '請上傳圖標' + 'error_upload' => '請上傳圖標', ]; diff --git a/resources/lang/zh_hk/admin/builder.php b/resources/lang/zh_hk/admin/builder.php index ad365375..03ad79dd 100644 --- a/resources/lang/zh_hk/admin/builder.php +++ b/resources/lang/zh_hk/admin/builder.php @@ -11,243 +11,242 @@ */ return [ - 'heading_title' => '頁面編輯', - 'modules_instructions' => '可用模塊，點擊添加至頁面', - 'text_floor_prompt' => '設置（樓層配置需要保存刷新頁面才會更新）', - 'text_new_page' => '添加新頁面', - 'text_quit' => '退出', - 'text_save' => '保存', - 'text_view_page' => '查看頁面', - 'text_module' => '模塊', - 'text_module_title' => '模塊標題', - 'text_menu' => '導航', - 'text_drag_sort' => '拖動排序', - 'text_set_up' => '設置', - 'text_delete' => '刪除', - 'text_floor' => '樓層', - 'text_add_module' => '添加模塊', - 'text_to_menu' => '編輯導航菜單', - 'text_other' => '其他', - 'text_preparing' => '準備中...', - 'text_floor_setting' => '樓層設置', - 'text_background_color' => '背景色', - 'text_sure' => '確 定', - 'text_page_name' => '請輸入新頁面名稱', - 'text_is_save' => '請確保當前頁面數據已保存！ ', - 'text_pop_ads' => '彈窗廣告', - 'text_style_setting' => '樣式設置', - 'text_is_save_data' => '切換頁面前，請確保當前頁面數據已保存？ ', - 'text_hint' => '提示', - 'text_cancel' => '取消', - 'text_created_success' => '頁面創建成功', - 'text_html_none' => '模塊加載錯誤, HTML 數據為空！ ', - 'text_is_delete' => '確定要刪除', - 'text_enable' => '啟用', - 'text_set_title' => '配置標題', - 'text_set_subtitle' => '配置副標題', - 'text_suggested_size' => '建議尺寸(寬x高): ', - 'text_word' => '文字', - 'text_add_pictures' => '添加圖片', - 'text_refresh_cookie' => '刷新 Cookie', - 'text_popup_hint' => '注：用戶點擊關閉將不再顯示，直到瀏覽器關閉重新打開。本地測試可點擊 "刷新 Cookie"，後刷新瀏覽器，彈窗可再次啟動。 ', - 'text_cookie_refresh_success' => 'Cookie 刷新成功，刷新瀏覽器即可看到彈窗內容。 ', - 'text_add_hot_links' => '添加熱搜鏈接', - 'text_add' => '添加', - 'text_margin_top' => '模塊內邊距 - 上', - 'text_margin_bottom' => '模塊內邊距 - 下', - 'text_file_manager' => '文件管理器', - 'modules_link' => '鏈接', - 'modules_choose_link' => '選擇鏈接', - 'text_select_link' => '請選擇跳轉到的鏈接頁面', - 'text_select_link' => '請選擇跳轉到的鏈接頁面', - 'text_no' => '無', - 'text_search' => '搜索', - 'text_is_newpage' => '是否新窗口打開:', - 'text_manage' => '管理', - 'text_title_cover' => '標題（覆蓋下方選擇的鏈接名稱）', - 'text_enter_link' => '請輸入鏈接地址', - 'text_states' => '狀態', - 'text_disable' => '禁用', - 'text_no_data' => '數據不存在或已被刪除', - 'text_to_add' => '去添加', - 'text_category' => '分類', - 'text_information' => '信息頁面', - 'text_manufacturer' => '品牌', - 'text_static' => '固定連接', - 'text_custom' => '自定義', - 'text_top_text' => '頂部文字', - 'text_edit_page_name' => '修改頁面名稱', - 'text_page_name_no' => '名稱不能為空', - 'custom_name' => '自定義名稱', + 'heading_title' => '頁面編輯', + 'modules_instructions' => '可用模塊，點擊添加至頁面', + 'text_floor_prompt' => '設置（樓層配置需要保存刷新頁面才會更新）', + 'text_new_page' => '添加新頁面', + 'text_quit' => '退出', + 'text_save' => '保存', + 'text_view_page' => '查看頁面', + 'text_module' => '模塊', + 'text_module_title' => '模塊標題', + 'text_menu' => '導航', + 'text_drag_sort' => '拖動排序', + 'text_set_up' => '設置', + 'text_delete' => '刪除', + 'text_floor' => '樓層', + 'text_add_module' => '添加模塊', + 'text_to_menu' => '編輯導航菜單', + 'text_other' => '其他', + 'text_preparing' => '準備中...', + 'text_floor_setting' => '樓層設置', + 'text_background_color' => '背景色', + 'text_sure' => '確 定', + 'text_page_name' => '請輸入新頁面名稱', + 'text_is_save' => '請確保當前頁面數據已保存！ ', + 'text_pop_ads' => '彈窗廣告', + 'text_style_setting' => '樣式設置', + 'text_is_save_data' => '切換頁面前，請確保當前頁面數據已保存？ ', + 'text_hint' => '提示', + 'text_cancel' => '取消', + 'text_created_success' => '頁面創建成功', + 'text_html_none' => '模塊加載錯誤, HTML 數據為空！ ', + 'text_is_delete' => '確定要刪除', + 'text_enable' => '啟用', + 'text_set_title' => '配置標題', + 'text_set_subtitle' => '配置副標題', + 'text_suggested_size' => '建議尺寸(寬x高): ', + 'text_word' => '文字', + 'text_add_pictures' => '添加圖片', + 'text_refresh_cookie' => '刷新 Cookie', + 'text_popup_hint' => '注：用戶點擊關閉將不再顯示，直到瀏覽器關閉重新打開。本地測試可點擊 "刷新 Cookie"，後刷新瀏覽器，彈窗可再次啟動。 ', + 'text_cookie_refresh_success' => 'Cookie 刷新成功，刷新瀏覽器即可看到彈窗內容。 ', + 'text_add_hot_links' => '添加熱搜鏈接', + 'text_add' => '添加', + 'text_margin_top' => '模塊內邊距 - 上', + 'text_margin_bottom' => '模塊內邊距 - 下', + 'text_file_manager' => '文件管理器', + 'modules_link' => '鏈接', + 'modules_choose_link' => '選擇鏈接', + 'text_select_link' => '請選擇跳轉到的鏈接頁面', + 'text_select_link' => '請選擇跳轉到的鏈接頁面', + 'text_no' => '無', + 'text_search' => '搜索', + 'text_is_newpage' => '是否新窗口打開:', + 'text_manage' => '管理', + 'text_title_cover' => '標題（覆蓋下方選擇的鏈接名稱）', + 'text_enter_link' => '請輸入鏈接地址', + 'text_states' => '狀態', + 'text_disable' => '禁用', + 'text_no_data' => '數據不存在或已被刪除', + 'text_to_add' => '去添加', + 'text_category' => '分類', + 'text_information' => '信息頁面', + 'text_manufacturer' => '品牌', + 'text_static' => '固定連接', + 'text_custom' => '自定義', + 'text_top_text' => '頂部文字', + 'text_edit_page_name' => '修改頁面名稱', + 'text_page_name_no' => '名稱不能為空', + 'custom_name' => '自定義名稱', // 固定连接 - 'text_static_product_latest' => '最新商品', - 'text_static_product_special' => '特價商品', + 'text_static_product_latest' => '最新商品', + 'text_static_product_special' => '特價商品', 'text_static_product_manufacturer' => '品牌專區', - 'text_static_account_account' => '會員中心', - 'text_static_account_order' => '歷史訂單', - 'text_static_account_wishlist' => '收藏列表', - 'text_static_affiliate_login' => '聯盟會員', - 'text_static_account_newsletter' => '訂閱諮詢', - 'text_static_information_contact' => '聯繫我們', - 'text_static_information_sitemap' => '網站地圖', - 'text_static_information_faq' => '常見問題', - 'text_static_account_voucher' => '禮品券', - 'text_static_account_login' => '登錄', - 'text_static_account_register' => '註冊', - 'text_static_checkout_cart' => '購物車', - 'text_static_blog_home' => '博客', + 'text_static_account_account' => '會員中心', + 'text_static_account_order' => '歷史訂單', + 'text_static_account_wishlist' => '收藏列表', + 'text_static_affiliate_login' => '聯盟會員', + 'text_static_account_newsletter' => '訂閱諮詢', + 'text_static_information_contact' => '聯繫我們', + 'text_static_information_sitemap' => '網站地圖', + 'text_static_information_faq' => '常見問題', + 'text_static_account_voucher' => '禮品券', + 'text_static_account_login' => '登錄', + 'text_static_account_register' => '註冊', + 'text_static_checkout_cart' => '購物車', + 'text_static_blog_home' => '博客', - 'text_edit_product' => '編輯商品詳情', - 'text_edit_home' => '編輯首頁', - 'text_edit_mb_home' => '編輯手機端首頁', - 'text_footer_edit' => '編輯頁腳', - 'text_header_edit' => '編輯頁頭', - 'text_save_refresh' => '保存並刷新', - 'text_save_refresh_header' => '保存（刷新頁頭）', - 'text_service_icon' => '服務圖標', - 'text_describe' => '描述', - 'text_add_link' => '添加鏈接', - 'text_is_btn' => '是否顯示按鈕', - 'text_phone' => '電話', - 'text_address' => '地址', - 'text_email' => '郵箱', - 'text_copyright' => '版權/圖片', - 'text_yq_link' => '友情鏈接', - 'text_link_bar' => '鏈接欄', - 'text_introduce' => '介紹', - 'text_up_logo' => '上傳 logo', - 'text_hot_keywords' => '熱搜關鍵詞', - 'text_title' => '標題', - 'text_text_notific' => '文本通知', - 'text_only_home' => '僅在首頁顯示', - 'text_background_color' => '背景顏色', - 'text_font_color' => '字體顏色', - 'text_image' => '圖片', - 'text_show' => '顯示', - 'text_is_phone' => '顯示聯繫電話', - 'text_half_angle' => '使用半角逗號分隔', - 'text_search_bar' => '搜索條', - 'text_btn_text' => '按鈕文字', - 'text_banner_ad' => '橫幅廣告', - 'text_l_c' => '語言/貨幣欄', - 'text_top_color' => '上部分顏色', - 'text_title_color' => '標題顏色', - 'text_color' => '顏色', - 'text_left_text' => '左邊文字', - 'text_right_icon' => '右邊支付圖標', - 'text_bgi' => '背景圖', - 'text_btn' => '按鈕', + 'text_edit_product' => '編輯商品詳情', + 'text_edit_home' => '編輯首頁', + 'text_edit_mb_home' => '編輯手機端首頁', + 'text_footer_edit' => '編輯頁腳', + 'text_header_edit' => '編輯頁頭', + 'text_save_refresh' => '保存並刷新', + 'text_save_refresh_header' => '保存（刷新頁頭）', + 'text_service_icon' => '服務圖標', + 'text_describe' => '描述', + 'text_add_link' => '添加鏈接', + 'text_is_btn' => '是否顯示按鈕', + 'text_phone' => '電話', + 'text_address' => '地址', + 'text_email' => '郵箱', + 'text_copyright' => '版權/圖片', + 'text_yq_link' => '友情鏈接', + 'text_link_bar' => '鏈接欄', + 'text_introduce' => '介紹', + 'text_up_logo' => '上傳 logo', + 'text_hot_keywords' => '熱搜關鍵詞', + 'text_title' => '標題', + 'text_text_notific' => '文本通知', + 'text_only_home' => '僅在首頁顯示', + 'text_background_color' => '背景顏色', + 'text_font_color' => '字體顏色', + 'text_image' => '圖片', + 'text_show' => '顯示', + 'text_is_phone' => '顯示聯繫電話', + 'text_half_angle' => '使用半角逗號分隔', + 'text_search_bar' => '搜索條', + 'text_btn_text' => '按鈕文字', + 'text_banner_ad' => '橫幅廣告', + 'text_l_c' => '語言/貨幣欄', + 'text_top_color' => '上部分顏色', + 'text_title_color' => '標題顏色', + 'text_color' => '顏色', + 'text_left_text' => '左邊文字', + 'text_right_icon' => '右邊支付圖標', + 'text_bgi' => '背景圖', + 'text_btn' => '按鈕', // page - 'page_product_title_size' => '商品標題字號', - 'page_product_title_color' => '商品標題顏色', - 'page_product_price_color' => '商品價格顏色', - 'page_product_thumb_position' => '縮略圖位置', - 'page_product_image' => '商品圖片', - 'page_product_bottom' => '底部', - 'page_product_left' => '左側', - 'page_product_magnifying_style' => '放大鏡樣式', - 'page_product_magnifying_window' => '外部窗口', - 'page_product_magnifying_inner' => '內部懸浮', - 'page_product_magnifying_lens' => '內部放大鏡', - 'page_product_share' => '分享', - 'page_product_share_code' => '分享代碼', - 'page_product_general_settings' => '常規設置', - 'page_product_font_size' => '字號大小', + 'page_product_title_size' => '商品標題字號', + 'page_product_title_color' => '商品標題顏色', + 'page_product_price_color' => '商品價格顏色', + 'page_product_thumb_position' => '縮略圖位置', + 'page_product_image' => '商品圖片', + 'page_product_bottom' => '底部', + 'page_product_left' => '左側', + 'page_product_magnifying_style' => '放大鏡樣式', + 'page_product_magnifying_window' => '外部窗口', + 'page_product_magnifying_inner' => '內部懸浮', + 'page_product_magnifying_lens' => '內部放大鏡', + 'page_product_share' => '分享', + 'page_product_share_code' => '分享代碼', + 'page_product_general_settings' => '常規設置', + 'page_product_font_size' => '字號大小', // ModuleS List - 'modules_photo_text' => '圖文混排', - 'modules_video_module' => '視頻模塊', - 'modules_customer_reviews' => '客戶評價', - 'modules_images_link' => '多圖鏈接', - 'modules_background_icon_text' => '背景圖標文字', - 'modules_slideshow_category' => '幻燈片分類', - 'modules_bargain' => '砍價', - 'modules_bestseller' => '熱賣商品', - 'modules_blog' => '博客', - 'modules_carousel' => '掄博圖標', - 'modules_category' => '分類模塊', - 'modules_coupon' => '優惠券', - 'modules_flash_sale' => '商品秒殺', - 'modules_group_buying' => '拼團', - 'modules_html' => '富文本', - 'modules_icon_text' => '圖標文字', - 'modules_image_100' => '單圖模塊', - 'modules_image_200' => '一行兩圖', - 'modules_image_300' => '一行三圖', - 'modules_image_301' => '一行三圖-pro', - 'modules_image_400' => '一行四圖', - 'modules_image_401' => '一行四圖-pro', - 'modules_latest' => '最新商品', - 'modules_manufacturer' => '品牌列表', - 'modules_product' => '商品', - 'modules_product_tab' => '選項卡商品', - 'modules_slideshow' => '幻燈片', - 'modules_quantity' => '顯示數量限制', - 'modules_manage_bargain' => '管理砍價商品', - 'modules_manage_blog' => '管理博客', - 'modules_no_blog' => '沒有文章，請先到 【內容管理 -> 博客管理】 配置文章。 ', - 'modules_slides_per_view' => '一屏顯示數量', - 'modules_enter_content' => '請輸入內容', - 'modules_full_screen' => '是否全屏', - 'modules_content' => '內容', - 'modules_edit_content' => '編輯內容', - 'modules_select_image' => '選擇圖片', - 'modules_quantity_line' => '一行顯示幾個', - 'modules_please_choose' => '請選擇', - 'modules_choose' => '選擇', - 'modules_add_category' => '添加分類', - 'modules_choose_category' => '選擇分類', - 'modules_set_coupon' => '優惠券配置', - 'modules_no_coupon' => '沒有優惠券數據', - 'modules_manage_flash' => '管理秒殺商品', - 'modules_manage_group' => '管理拼團商品', - 'modules_no_state' => '當前模塊沒有開啟或沒有配置，請先到後台【模塊管理】中配置此模塊。 ', - 'modules_grid_mode' => '網格模式', - 'modules_more_link' => '更多鏈接', - 'modules_choose_brand' => '選擇品牌', - 'modules_set_product' => '配置商品', - 'modules_keywords_search' => '請輸入關鍵字搜索', - 'modules_test_name' => '測試名稱', - 'modules_please_products' => '請添加商品', - 'modules_image_size' => '圖片尺寸', - 'modules_height' => '高', - 'modules_width' => '寬', - 'modules_category_style' => '分類顯示樣式', - 'modules_down' => '下面', - 'modules_left' => '左邊', - 'modules_category_no' => '不要分類', - 'modules_review_name' => '名稱', - 'modules_profession' => '職業', - 'modules_video_cover' => '視頻封面', - 'modules_video' => '視頻', - + 'modules_photo_text' => '圖文混排', + 'modules_video_module' => '視頻模塊', + 'modules_customer_reviews' => '客戶評價', + 'modules_images_link' => '多圖鏈接', + 'modules_background_icon_text' => '背景圖標文字', + 'modules_slideshow_category' => '幻燈片分類', + 'modules_bargain' => '砍價', + 'modules_bestseller' => '熱賣商品', + 'modules_blog' => '博客', + 'modules_carousel' => '掄博圖標', + 'modules_category' => '分類模塊', + 'modules_coupon' => '優惠券', + 'modules_flash_sale' => '商品秒殺', + 'modules_group_buying' => '拼團', + 'modules_html' => '富文本', + 'modules_icon_text' => '圖標文字', + 'modules_image_100' => '單圖模塊', + 'modules_image_200' => '一行兩圖', + 'modules_image_300' => '一行三圖', + 'modules_image_301' => '一行三圖-pro', + 'modules_image_400' => '一行四圖', + 'modules_image_401' => '一行四圖-pro', + 'modules_latest' => '最新商品', + 'modules_manufacturer' => '品牌列表', + 'modules_product' => '商品', + 'modules_product_tab' => '選項卡商品', + 'modules_slideshow' => '幻燈片', + 'modules_quantity' => '顯示數量限制', + 'modules_manage_bargain' => '管理砍價商品', + 'modules_manage_blog' => '管理博客', + 'modules_no_blog' => '沒有文章，請先到 【內容管理 -> 博客管理】 配置文章。 ', + 'modules_slides_per_view' => '一屏顯示數量', + 'modules_enter_content' => '請輸入內容', + 'modules_full_screen' => '是否全屏', + 'modules_content' => '內容', + 'modules_edit_content' => '編輯內容', + 'modules_select_image' => '選擇圖片', + 'modules_quantity_line' => '一行顯示幾個', + 'modules_please_choose' => '請選擇', + 'modules_choose' => '選擇', + 'modules_add_category' => '添加分類', + 'modules_choose_category' => '選擇分類', + 'modules_set_coupon' => '優惠券配置', + 'modules_no_coupon' => '沒有優惠券數據', + 'modules_manage_flash' => '管理秒殺商品', + 'modules_manage_group' => '管理拼團商品', + 'modules_no_state' => '當前模塊沒有開啟或沒有配置，請先到後台【模塊管理】中配置此模塊。 ', + 'modules_grid_mode' => '網格模式', + 'modules_more_link' => '更多鏈接', + 'modules_choose_brand' => '選擇品牌', + 'modules_set_product' => '配置商品', + 'modules_keywords_search' => '請輸入關鍵字搜索', + 'modules_test_name' => '測試名稱', + 'modules_please_products' => '請添加商品', + 'modules_image_size' => '圖片尺寸', + 'modules_height' => '高', + 'modules_width' => '寬', + 'modules_category_style' => '分類顯示樣式', + 'modules_down' => '下面', + 'modules_left' => '左邊', + 'modules_category_no' => '不要分類', + 'modules_review_name' => '名稱', + 'modules_profession' => '職業', + 'modules_video_cover' => '視頻封面', + 'modules_video' => '視頻', // mobile - 'mobile_search' => '搜索條', - 'mobile_search_normal' => '不固定在屏幕頂部', - 'mobile_search_hide' => '不顯示頂部搜索條', - 'mobile_search_fixed' => '固定在屏幕頂部 (默認)', + 'mobile_search' => '搜索條', + 'mobile_search_normal' => '不固定在屏幕頂部', + 'mobile_search_hide' => '不顯示頂部搜索條', + 'mobile_search_fixed' => '固定在屏幕頂部 (默認)', // Menu - 'main_menu' => '主菜單', - 'please_add_data' => '請添加數據', - 'add_main_menu' => '添加主菜單', - 'main_menu_name_link' => '主菜單名稱/鏈接', - 'main_menu_label' => '主菜單標籤', - 'label_background_color' => '標籤背景色', - 'label_text_color' => '標籤文字色', - 'submenu_group' => '子菜單(組)', - 'add_menu_group' => '添加菜單組', - 'full_screen' => '是否全屏', - 'menu' => '菜單', - 'add_submenu_link' => '添加子菜單鏈接', - 'type' => '類型', + 'main_menu' => '主菜單', + 'please_add_data' => '請添加數據', + 'add_main_menu' => '添加主菜單', + 'main_menu_name_link' => '主菜單名稱/鏈接', + 'main_menu_label' => '主菜單標籤', + 'label_background_color' => '標籤背景色', + 'label_text_color' => '標籤文字色', + 'submenu_group' => '子菜單(組)', + 'add_menu_group' => '添加菜單組', + 'full_screen' => '是否全屏', + 'menu' => '菜單', + 'add_submenu_link' => '添加子菜單鏈接', + 'type' => '類型', // footer - 'footer_edit' => '頁尾編輯器', - 'sub_title' => '副標題', - 'introduction' => '簡介', - 'copyright_settings' => '版權設置', + 'footer_edit' => '頁尾編輯器', + 'sub_title' => '副標題', + 'introduction' => '簡介', + 'copyright_settings' => '版權設置', ]; diff --git a/resources/lang/zh_hk/admin/category.php b/resources/lang/zh_hk/admin/category.php index 7e912de5..023094b5 100644 --- a/resources/lang/zh_hk/admin/category.php +++ b/resources/lang/zh_hk/admin/category.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '分類', - 'edit_category' => '編輯分類', - 'upper_category' => '上級分類', + 'index' => '分類', + 'edit_category' => '編輯分類', + 'upper_category' => '上級分類', - 'categories_index' => '分類列表', + 'categories_index' => '分類列表', 'categories_create' => '創建分類', - 'categories_show' => '分類詳情', + 'categories_show' => '分類詳情', 'categories_update' => '更新分類', 'categories_delete' => '刪除分類', ]; diff --git a/resources/lang/zh_hk/admin/common.php b/resources/lang/zh_hk/admin/common.php index 9bcfe62f..60d31963 100644 --- a/resources/lang/zh_hk/admin/common.php +++ b/resources/lang/zh_hk/admin/common.php @@ -10,67 +10,67 @@ */ return [ - 'admin_panel' => '後台管理', - 'edit' => '編輯', - 'status' => '狀態', - 'action' => '操作', - 'install' => '安裝', - 'uninstall' => '卸載', + 'admin_panel' => '後台管理', + 'edit' => '編輯', + 'status' => '狀態', + 'action' => '操作', + 'install' => '安裝', + 'uninstall' => '卸載', // errors - 'forbidden' => '禁止訪問', - 'has_no_permission' => '您沒有權限訪問該頁面, 請聯繫系統管理員。 ', + 'forbidden' => '禁止訪問', + 'has_no_permission' => '您沒有權限訪問該頁面, 請聯繫系統管理員。 ', // header - 'home' => '管理首頁', - 'order' => '訂單管理', - 'rma' => '售後服務管理', - 'rma_reason' => '退換貨原因管理', - 'product' => '商品管理', - 'brand' => '品牌管理', - 'category' => '分類管理', - 'customer_group' => '客戶組管理', - 'customer' => '客戶管理', - 'content' => '內容管理', - 'setting' => '系統設置', - 'plugin' => '插件管理', - 'admin_user' => '後台用戶', - 'admin_role' => '用戶角色', - 'region' => '區域分組', - 'tax_rate' => '稅率管理', - 'tax_class' => '稅類管理', - 'currency' => '貨幣管理', - 'language' => '語言管理', - 'zone' => '省份管理', - 'country' => '國家管理', - 'file_manager' => '文件管理器', - 'access_frontend' => '訪問前台', + 'home' => '管理首頁', + 'order' => '訂單管理', + 'rma' => '售後服務管理', + 'rma_reason' => '退換貨原因管理', + 'product' => '商品管理', + 'brand' => '品牌管理', + 'category' => '分類管理', + 'customer_group' => '客戶組管理', + 'customer' => '客戶管理', + 'content' => '內容管理', + 'setting' => '系統設置', + 'plugin' => '插件管理', + 'admin_user' => '後台用戶', + 'admin_role' => '用戶角色', + 'region' => '區域分組', + 'tax_rate' => '稅率管理', + 'tax_class' => '稅類管理', + 'currency' => '貨幣管理', + 'language' => '語言管理', + 'zone' => '省份管理', + 'country' => '國家管理', + 'file_manager' => '文件管理器', + 'access_frontend' => '訪問前台', // sidebar 'attribute_groups_index' => '屬性組', - 'attributes_index' => '屬性', - 'settings_index' => '系統設置', - 'admin_users_index' => '後台用戶', - 'plugins_index' => '插件列表', - 'regions_index' => '區域分組', - 'tax_rates_index' => '稅率設置', - 'tax_classes_index' => '稅費類別', - 'currencies_index' => '貨幣管理', - 'languages_index' => '語言管理', - 'design_index' => '首頁裝修', - 'pages_index' => '信息頁面', - 'design_footer_index' => '頁尾裝修', - 'design_menu_index' => '導航配置', - 'categories_index' => '商品分類', - 'products_index' => '商品管理', - 'products_trashed' => '回收站', - 'customers_trashed' => '回收站', - 'brands_index' => '商品品牌', - 'orders_index' => '訂單列表', - 'rmas_index' => '售後管理', - 'rma_reasons_index' => '售後原因', - 'customers_index' => '客戶列表', - 'customer_groups_index' => '客戶組', - 'countries_index' => '國家管理', - 'zones_index' => '省份管理', + 'attributes_index' => '屬性', + 'settings_index' => '系統設置', + 'admin_users_index' => '後台用戶', + 'plugins_index' => '插件列表', + 'regions_index' => '區域分組', + 'tax_rates_index' => '稅率設置', + 'tax_classes_index' => '稅費類別', + 'currencies_index' => '貨幣管理', + 'languages_index' => '語言管理', + 'design_index' => '首頁裝修', + 'pages_index' => '信息頁面', + 'design_footer_index' => '頁尾裝修', + 'design_menu_index' => '導航配置', + 'categories_index' => '商品分類', + 'products_index' => '商品管理', + 'products_trashed' => '回收站', + 'customers_trashed' => '回收站', + 'brands_index' => '商品品牌', + 'orders_index' => '訂單列表', + 'rmas_index' => '售後管理', + 'rma_reasons_index' => '售後原因', + 'customers_index' => '客戶列表', + 'customer_groups_index' => '客戶組', + 'countries_index' => '國家管理', + 'zones_index' => '省份管理', ]; diff --git a/resources/lang/zh_hk/admin/country.php b/resources/lang/zh_hk/admin/country.php index d9e02538..b89c207d 100644 --- a/resources/lang/zh_hk/admin/country.php +++ b/resources/lang/zh_hk/admin/country.php @@ -9,9 +9,9 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'country_name' => '國家名稱', + 'country_name' => '國家名稱', - 'countries_index' => '國家列表', + 'countries_index' => '國家列表', 'countries_create' => '創建國家', 'countries_update' => '更新國家', ]; diff --git a/resources/lang/zh_hk/admin/currency.php b/resources/lang/zh_hk/admin/currency.php index a3164ae1..d78d62f5 100644 --- a/resources/lang/zh_hk/admin/currency.php +++ b/resources/lang/zh_hk/admin/currency.php @@ -9,11 +9,11 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', - 'thousand_point' => ',', - 'currencies_index' => '貨幣列表', + 'decimal_point' => '.', + 'thousand_point' => ',', + 'currencies_index' => '貨幣列表', 'currencies_create' => '創建貨幣', - 'currencies_show' => '貨幣詳情', + 'currencies_show' => '貨幣詳情', 'currencies_update' => '更新貨幣', 'currencies_delete' => '刪除貨幣', ]; diff --git a/resources/lang/zh_hk/admin/customer.php b/resources/lang/zh_hk/admin/customer.php index 1902ab4b..fe485033 100644 --- a/resources/lang/zh_hk/admin/customer.php +++ b/resources/lang/zh_hk/admin/customer.php @@ -10,30 +10,30 @@ */ return [ - 'customers_index' => '客戶列表', - 'customers_create' => '創建客戶', - 'customers_show' => '客戶詳情', - 'customers_update' => '更新客戶', - 'customers_delete' => '刪除客戶', + 'customers_index' => '客戶列表', + 'customers_create' => '創建客戶', + 'customers_show' => '客戶詳情', + 'customers_update' => '更新客戶', + 'customers_delete' => '刪除客戶', - 'user_info' => '用戶信息', - 'address_management' => '地址管理', - 'user_name' => '用戶名', - 'password_info' => '留空則保持原密碼不變', - 'add_address' => '新增地址', - 'no_address' => '當前賬號無地址', - 'edit_address' => '編輯地址', - 'address' => '地址', - 'choose_country' => '選擇國家', - 'zones' => '省份', - 'choose_zones' => '選擇省份', - 'enter_city' => '輸入城市', - 'city' => '城市', - 'zipcode' => '郵編', - 'address_1' => '詳細地址 1', - 'address_2' => '詳細地址 2', + 'user_info' => '用戶信息', + 'address_management' => '地址管理', + 'user_name' => '用戶名', + 'password_info' => '留空則保持原密碼不變', + 'add_address' => '新增地址', + 'no_address' => '當前賬號無地址', + 'edit_address' => '編輯地址', + 'address' => '地址', + 'choose_country' => '選擇國家', + 'zones' => '省份', + 'choose_zones' => '選擇省份', + 'enter_city' => '輸入城市', + 'city' => '城市', + 'zipcode' => '郵編', + 'address_1' => '詳細地址 1', + 'address_2' => '詳細地址 2', - 'cannot_delete_root' => '不能刪除Root賬戶', - 'error_email' => '請輸入正確郵箱格式', + 'cannot_delete_root' => '不能刪除Root賬戶', + 'error_email' => '請輸入正確郵箱格式', 'confirm_delete_address' => '確定要刪除地址嗎？ ', ]; diff --git a/resources/lang/zh_hk/admin/customer_group.php b/resources/lang/zh_hk/admin/customer_group.php index 1d2cb01e..11c0df7f 100644 --- a/resources/lang/zh_hk/admin/customer_group.php +++ b/resources/lang/zh_hk/admin/customer_group.php @@ -10,16 +10,16 @@ */ return [ - 'index' => '客戶組', - 'consumption_limit' => '消費額度', - 'discount_rate' => '折扣率', - 'reward_points_factor' => '獎勵積分係數', - 'integral_factor' => '使用積分係數', + 'index' => '客戶組', + 'consumption_limit' => '消費額度', + 'discount_rate' => '折扣率', + 'reward_points_factor' => '獎勵積分係數', + 'integral_factor' => '使用積分係數', - 'customer_groups_index' => '客戶組列表', + 'customer_groups_index' => '客戶組列表', 'customer_groups_create' => '創建客戶組', - 'customer_groups_show' => '客戶組詳情', + 'customer_groups_show' => '客戶組詳情', 'customer_groups_update' => '更新客戶組', 'customer_groups_delete' => '刪除客戶組', - 'default_cannot_delete' => '默認客戶組不能刪除', + 'default_cannot_delete' => '默認客戶組不能刪除', ]; diff --git a/resources/lang/zh_hk/admin/dashboard.php b/resources/lang/zh_hk/admin/dashboard.php index bf4e8320..fa40a6e8 100644 --- a/resources/lang/zh_hk/admin/dashboard.php +++ b/resources/lang/zh_hk/admin/dashboard.php @@ -11,14 +11,14 @@ return [ 'customer_view' => '用戶訪問量', - 'order_total' => '訂單量', - 'customer_new' => '新增用戶', - 'order_amount' => '銷售額', - 'yesterday' => '昨日', - 'day_before' => '較前一日', + 'order_total' => '訂單量', + 'customer_new' => '新增用戶', + 'order_amount' => '銷售額', + 'yesterday' => '昨日', + 'day_before' => '較前一日', - 'order_report' => '訂單統計', - 'latest_month' => '一個月', - 'latest_week' => '一周', - 'latest_year' => '一年', + 'order_report' => '訂單統計', + 'latest_month' => '一個月', + 'latest_week' => '一周', + 'latest_year' => '一年', ]; diff --git a/resources/lang/zh_hk/admin/design_builder.php b/resources/lang/zh_hk/admin/design_builder.php index a4281b53..62198813 100644 --- a/resources/lang/zh_hk/admin/design_builder.php +++ b/resources/lang/zh_hk/admin/design_builder.php @@ -10,9 +10,9 @@ */ return [ - 'module_brand' => '品牌模塊', - 'module_banner' => '橫幅模塊', + 'module_brand' => '品牌模塊', + 'module_banner' => '橫幅模塊', 'module_four_image_pro' => '一行四圖 PRO', - 'module_slideshow' => '幻燈片模塊', - 'module_tab_products' => '選項卡商品', + 'module_slideshow' => '幻燈片模塊', + 'module_tab_products' => '選項卡商品', ]; diff --git a/resources/lang/zh_hk/admin/file_manager.php b/resources/lang/zh_hk/admin/file_manager.php index 51a3dba7..8d7cd9d0 100644 --- a/resources/lang/zh_hk/admin/file_manager.php +++ b/resources/lang/zh_hk/admin/file_manager.php @@ -10,28 +10,28 @@ */ return [ - 'file_manager_create' => '創建目錄/文件', - 'file_manager_show' => '查看目錄/文件', - 'file_manager_update' => '重命名', - 'file_manager_delete' => '刪除目錄/文件', + 'file_manager_create' => '創建目錄/文件', + 'file_manager_show' => '查看目錄/文件', + 'file_manager_update' => '重命名', + 'file_manager_delete' => '刪除目錄/文件', 'directory_already_exist' => '目錄已存在', - 'directory_not_empty' => '該目錄不為空', - 'target_not_exist' => '原始文件或者文件夾不存在', - 'create_folder' => '創建文件夾', - 'rename' => '重命名', - 'download' => '下載', - 'upload_files' => '上傳文件', - 'click_upload' => '點擊上傳，或將圖片拖到此處', - 'image_uploading' => '圖片上傳中', - 'no_file' => '沒有文件', - 'picture_space' => '圖片空間', - 'show_pc' => '請到PC端操作', + 'directory_not_empty' => '該目錄不為空', + 'target_not_exist' => '原始文件或者文件夾不存在', + 'create_folder' => '創建文件夾', + 'rename' => '重命名', + 'download' => '下載', + 'upload_files' => '上傳文件', + 'click_upload' => '點擊上傳，或將圖片拖到此處', + 'image_uploading' => '圖片上傳中', + 'no_file' => '沒有文件', + 'picture_space' => '圖片空間', + 'show_pc' => '請到PC端操作', - 'confirm_delete_file' => '是否要刪除選中文件', - 'confirm_delete_folder' => '正在進行刪除文件夾操作，文件夾內所有文件都將被刪除，是否確認？ ', - 'new_folder' => '新建文件夾', - 'can_empty' => '不能為空', - 'finish' => '完成', - 'uploading' => '上傳中', - 'file_manager' => '圖片管理器', + 'confirm_delete_file' => '是否要刪除選中文件', + 'confirm_delete_folder' => '正在進行刪除文件夾操作，文件夾內所有文件都將被刪除，是否確認？ ', + 'new_folder' => '新建文件夾', + 'can_empty' => '不能為空', + 'finish' => '完成', + 'uploading' => '上傳中', + 'file_manager' => '圖片管理器', ]; diff --git a/resources/lang/zh_hk/admin/language.php b/resources/lang/zh_hk/admin/language.php index 30759358..008e208f 100644 --- a/resources/lang/zh_hk/admin/language.php +++ b/resources/lang/zh_hk/admin/language.php @@ -10,11 +10,11 @@ */ return [ - 'languages_index' => '語言列表', - 'languages_create' => '創建語言', - 'languages_show' => '語言詳情', - 'languages_update' => '更新語言', - 'languages_delete' => '刪除語言', + 'languages_index' => '語言列表', + 'languages_create' => '創建語言', + 'languages_show' => '語言詳情', + 'languages_update' => '更新語言', + 'languages_delete' => '刪除語言', 'error_default_language_cannot_delete' => '默認語言不能刪除！ ', - 'help_install' => '注意：安裝新語言需要配置對應語言的商品、分類、導航、首頁模塊、頁尾等內容，否則會出現頁面顯示異常', + 'help_install' => '注意：安裝新語言需要配置對應語言的商品、分類、導航、首頁模塊、頁尾等內容，否則會出現頁面顯示異常', ]; diff --git a/resources/lang/zh_hk/admin/login.php b/resources/lang/zh_hk/admin/login.php index 9e3c776e..1ae20e7c 100644 --- a/resources/lang/zh_hk/admin/login.php +++ b/resources/lang/zh_hk/admin/login.php @@ -11,5 +11,5 @@ return [ 'plugins_index' => '登錄到 BeikeShop 後台', - 'log_in' => '登錄', + 'log_in' => '登錄', ]; diff --git a/resources/lang/zh_hk/admin/marketing.php b/resources/lang/zh_hk/admin/marketing.php index 5408fb1b..f3651470 100644 --- a/resources/lang/zh_hk/admin/marketing.php +++ b/resources/lang/zh_hk/admin/marketing.php @@ -10,25 +10,25 @@ */ return [ - 'marketing_list' => '插件市場', - 'marketing_show' => '插件詳情', - 'set_token' => '設置 Token', - 'get_token_text' => '登錄 BeikeShop 官網個人中心-綁定域名，添加當前域名', - 'get_token' => '點擊獲取 Token', - 'download_count' => '下載次數', - 'last_update' => '最後更新', - 'text_version' => '版本', - 'text_compatibility' => '兼容性', - 'text_author' => '插件作者', - 'download_plugin' => '下載插件', + 'marketing_list' => '插件市場', + 'marketing_show' => '插件詳情', + 'set_token' => '設置 Token', + 'get_token_text' => '登錄 BeikeShop 官網個人中心-綁定域名，添加當前域名', + 'get_token' => '點擊獲取 Token', + 'download_count' => '下載次數', + 'last_update' => '最後更新', + 'text_version' => '版本', + 'text_compatibility' => '兼容性', + 'text_author' => '插件作者', + 'download_plugin' => '下載插件', 'download_description' => '插件描述', - 'text_free' => '免費', - 'btn_buy' => '購買', - 'text_pay' => '支付金額', - 'select_pay' => '選擇支付方式', - 'wxpay' => '微信掃碼支付!', - 'pay_success_title' => '支付成功!', - 'pay_success_text' => '插件購買成功，點擊確定刷新頁面', - 'ali_pay_success' => '已完成支付？ ', - 'ali_pay_text' => '已完成支付，請刷新頁面', + 'text_free' => '免費', + 'btn_buy' => '購買', + 'text_pay' => '支付金額', + 'select_pay' => '選擇支付方式', + 'wxpay' => '微信掃碼支付!', + 'pay_success_title' => '支付成功!', + 'pay_success_text' => '插件購買成功，點擊確定刷新頁面', + 'ali_pay_success' => '已完成支付？ ', + 'ali_pay_text' => '已完成支付，請刷新頁面', ]; diff --git a/resources/lang/zh_hk/admin/order.php b/resources/lang/zh_hk/admin/order.php index 7ab83146..f2a7e2c4 100644 --- a/resources/lang/zh_hk/admin/order.php +++ b/resources/lang/zh_hk/admin/order.php @@ -10,17 +10,17 @@ */ return [ - 'list' => '訂單列表', + 'list' => '訂單列表', - 'order_quantity' => '訂單數量', - 'order_amount' => '訂單金額', - 'orders_index' => '訂單列表', - 'orders_create' => '創建訂單', - 'orders_show' => '訂單詳情', - 'orders_export' => '導出訂單', - 'orders_update' => '更新訂單', - 'orders_delete' => '刪除訂單', - 'notify' => '是否提醒', + 'order_quantity' => '訂單數量', + 'order_amount' => '訂單金額', + 'orders_index' => '訂單列表', + 'orders_create' => '創建訂單', + 'orders_show' => '訂單詳情', + 'orders_export' => '導出訂單', + 'orders_update' => '更新訂單', + 'orders_delete' => '刪除訂單', + 'notify' => '是否提醒', 'orders_update_status' => '更新狀態', - 'error_status' => '請選擇狀態', + 'error_status' => '請選擇狀態', ]; diff --git a/resources/lang/zh_hk/admin/page.php b/resources/lang/zh_hk/admin/page.php index 49841af1..94536e8b 100644 --- a/resources/lang/zh_hk/admin/page.php +++ b/resources/lang/zh_hk/admin/page.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '信息頁面', - 'info_title' => '信息標題', + 'index' => '信息頁面', + 'info_title' => '信息標題', 'info_content' => '內容', - 'pages_index' => '單頁列表', + 'pages_index' => '單頁列表', 'pages_create' => '創建單頁', - 'pages_show' => '單頁詳情', + 'pages_show' => '單頁詳情', 'pages_update' => '單頁編輯', - 'pages_delete' => '刪除單頁' + 'pages_delete' => '刪除單頁', ]; diff --git a/resources/lang/zh_hk/admin/plugin.php b/resources/lang/zh_hk/admin/plugin.php index 1c09e13a..4aceb2e2 100644 --- a/resources/lang/zh_hk/admin/plugin.php +++ b/resources/lang/zh_hk/admin/plugin.php @@ -10,22 +10,22 @@ */ return [ - 'plugins_index' => '插件列表', - 'plugins_import' => '上傳插件', - 'plugins_show' => '插件詳情', - 'plugins_update' => '插件更新', + 'plugins_index' => '插件列表', + 'plugins_import' => '上傳插件', + 'plugins_show' => '插件詳情', + 'plugins_update' => '插件更新', 'plugins_update_status' => '更新狀態', - 'plugins_install' => '安裝', - 'plugins_uninstall' => '卸載', + 'plugins_install' => '安裝', + 'plugins_uninstall' => '卸載', - 'plugin_list' => '插件列表', - 'plugin_code' => '插件代碼', - 'plugin_type' => '插件類型', - 'plugin_description' => '插件描述', - 'plugin_upload' => '上傳插件(僅支持 zip 文件)', + 'plugin_list' => '插件列表', + 'plugin_code' => '插件代碼', + 'plugin_type' => '插件類型', + 'plugin_description' => '插件描述', + 'plugin_upload' => '上傳插件(僅支持 zip 文件)', - 'shipping' => '配送方式', - 'payment' => '支付方式', - 'total' => '訂單計算', - 'view' => '頁面修改', + 'shipping' => '配送方式', + 'payment' => '支付方式', + 'total' => '訂單計算', + 'view' => '頁面修改', ]; diff --git a/resources/lang/zh_hk/admin/product.php b/resources/lang/zh_hk/admin/product.php index 597b3beb..e8fffe9c 100644 --- a/resources/lang/zh_hk/admin/product.php +++ b/resources/lang/zh_hk/admin/product.php @@ -10,39 +10,38 @@ */ return [ - 'products_index' => '商品列表', - 'products_create' => '創建商品', - 'products_show' => '商品詳情', - 'products_update' => '更新商品', - 'products_delete' => '刪除商品', - 'products_trashed' => '回收站', - 'products_restore' => '恢復回收站', - 'clear_restore' => '清空回收站', + 'products_index' => '商品列表', + 'products_create' => '創建商品', + 'products_show' => '商品詳情', + 'products_update' => '更新商品', + 'products_delete' => '刪除商品', + 'products_trashed' => '回收站', + 'products_restore' => '恢復回收站', + 'clear_restore' => '清空回收站', + 'batch_delete' => '批量刪除', + 'batch_active' => '批量上架', + 'batch_inactive' => '批量下架', - 'batch_delete' => '批量刪除', - 'batch_active' => '批量上架', - 'batch_inactive' => '批量下架', + 'basic_information' => '基礎信息', + 'product_details' => '商品詳情', + 'product_relations' => '相關商品', + 'stocks' => '商品庫存', + 'model' => '型號', + 'price' => '價格', + 'origin_price' => '原價', + 'cost_price' => '成本價', + 'quantity' => '數量', + 'enable_multi_spec' => '啟用多規格', + 'image_help' => '第一張圖片將作為商品主圖,支持同時上傳多張圖片,多張圖片之間可隨意調整位置', + 'add_variable' => '添加規格', + 'add_variable_value' => '添加規格值', + 'add_variable_image' => '添加規格圖片', + 'default_main_product' => '默認主商品', + 'modify_order' => '雙擊修改、拖動調整順序', - 'basic_information' => '基礎信息', - 'product_details' => '商品詳情', - 'product_relations' => '相關商品', - 'stocks' => '商品庫存', - 'model' => '型號', - 'price' => '價格', - 'origin_price' => '原價', - 'cost_price' => '成本價', - 'quantity' => '數量', - 'enable_multi_spec' => '啟用多規格', - 'image_help' => '第一張圖片將作為商品主圖,支持同時上傳多張圖片,多張圖片之間可隨意調整位置', - 'add_variable' => '添加規格', - 'add_variable_value' => '添加規格值', - 'add_variable_image' => '添加規格圖片', - 'default_main_product' => '默認主商品', - 'modify_order' => '雙擊修改、拖動調整順序', - - 'confirm_batch_product' => '確認要批量刪除選中的商品嗎？ ', - 'confirm_batch_status' => '確認要批量修改選中的商品的狀態嗎？ ', - 'confirm_batch_restore' => '確認要恢復選中的商品嗎？ ', + 'confirm_batch_product' => '確認要批量刪除選中的商品嗎？ ', + 'confirm_batch_status' => '確認要批量修改選中的商品的狀態嗎？ ', + 'confirm_batch_restore' => '確認要恢復選中的商品嗎？ ', 'confirm_delete_restore' => '確認要清空回收站嗎？ ', ]; diff --git a/resources/lang/zh_hk/admin/region.php b/resources/lang/zh_hk/admin/region.php index 82b344eb..2dc754dc 100644 --- a/resources/lang/zh_hk/admin/region.php +++ b/resources/lang/zh_hk/admin/region.php @@ -10,14 +10,14 @@ */ return [ - 'index' => '區域組', - 'regions_index' => '區域組列表', + 'index' => '區域組', + 'regions_index' => '區域組列表', 'regions_create' => '創建區域組', - 'regions_show' => '區域組詳情', + 'regions_show' => '區域組詳情', 'regions_update' => '更新區域組', 'regions_delete' => '刪除區域組', - 'name' => '名稱', - 'describe' => '描述', - 'country' => '國家', - 'zone' => '省份', + 'name' => '名稱', + 'describe' => '描述', + 'country' => '國家', + 'zone' => '省份', ]; diff --git a/resources/lang/zh_hk/admin/rma.php b/resources/lang/zh_hk/admin/rma.php index 8cdb0bfb..720c15f7 100644 --- a/resources/lang/zh_hk/admin/rma.php +++ b/resources/lang/zh_hk/admin/rma.php @@ -10,21 +10,21 @@ */ return [ - 'index' => '售後申請', + 'index' => '售後申請', - 'rmas_index' => '售後服務列表', - 'rmas_show' => '售後服務詳情', - 'rmas_update' => '更新售後服務', - 'rmas_delete' => '刪除售後服務', + 'rmas_index' => '售後服務列表', + 'rmas_show' => '售後服務詳情', + 'rmas_update' => '更新售後服務', + 'rmas_delete' => '刪除售後服務', - 'customers_name' => '客戶姓名', - 'quantity' => '數量', - 'service_type' => '服務類型', - 'rma_details' => '售後申請詳情', - 'reasons_return' => '退貨原因', - 'current_state' => '當前狀態', - 'modify_status' => '修改狀態', - 'remarks' => '備註信息', - 'update_status' => '更新狀態', + 'customers_name' => '客戶姓名', + 'quantity' => '數量', + 'service_type' => '服務類型', + 'rma_details' => '售後申請詳情', + 'reasons_return' => '退貨原因', + 'current_state' => '當前狀態', + 'modify_status' => '修改狀態', + 'remarks' => '備註信息', + 'update_status' => '更新狀態', 'operation_history' => '操作歷史', ]; diff --git a/resources/lang/zh_hk/admin/rma_reason.php b/resources/lang/zh_hk/admin/rma_reason.php index 21f5338d..af450e9b 100644 --- a/resources/lang/zh_hk/admin/rma_reason.php +++ b/resources/lang/zh_hk/admin/rma_reason.php @@ -10,8 +10,8 @@ */ return [ - 'rma_reasons_index' => '原因列表', + 'rma_reasons_index' => '原因列表', 'rma_reasons_create' => '創建原因', 'rma_reasons_update' => '更新原因', - 'rma_reasons_delete' => '刪除原因' + 'rma_reasons_delete' => '刪除原因', ]; diff --git a/resources/lang/zh_hk/admin/role.php b/resources/lang/zh_hk/admin/role.php index 33ea3d08..58722996 100644 --- a/resources/lang/zh_hk/admin/role.php +++ b/resources/lang/zh_hk/admin/role.php @@ -10,10 +10,10 @@ */ return [ - 'admin_roles_index' => '角色列表', - 'admin_roles_create' => '創建角色', - 'admin_roles_show' => '角色詳情', - 'admin_roles_update' => '更新角色', - 'admin_roles_delete' => '刪除角色', - 'select_one_at_least' => '權限不能為空,請選擇至少一項' + 'admin_roles_index' => '角色列表', + 'admin_roles_create' => '創建角色', + 'admin_roles_show' => '角色詳情', + 'admin_roles_update' => '更新角色', + 'admin_roles_delete' => '刪除角色', + 'select_one_at_least' => '權限不能為空,請選擇至少一項', ]; diff --git a/resources/lang/zh_hk/admin/setting.php b/resources/lang/zh_hk/admin/setting.php index a4e9c7a5..3458056a 100644 --- a/resources/lang/zh_hk/admin/setting.php +++ b/resources/lang/zh_hk/admin/setting.php @@ -10,61 +10,61 @@ */ return [ - 'index' => '系統設置', - 'settings_index' => '查看系統設置', - 'settings_update' => '修改系統設置', - 'design_index' => '首頁編輯器', - 'design_footer_index' => '頁尾編輯器', - 'design_menu_index' => '導航編輯器', - 'product_per_page' => '每頁顯示商品個數', + 'index' => '系統設置', + 'settings_index' => '查看系統設置', + 'settings_update' => '修改系統設置', + 'design_index' => '首頁編輯器', + 'design_footer_index' => '頁尾編輯器', + 'design_menu_index' => '導航編輯器', + 'product_per_page' => '每頁顯示商品個數', - '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`', + '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' => '發貨地址', - 'payment_address' => '賬單地址', - 'meta_title' => 'Meta 標題', - 'meta_description' => 'Meta 描述', - 'meta_keywords' => 'Meta 關鍵詞', - 'telephone' => '聯繫電話', - 'email' => '郵箱', - 'default_address' => '默認地址', - 'default_country_set' => '默認國家設置', - 'default_zone_set' => '默認省份設置', - 'default_language' => '默認語言', - 'default_currency' => '默認貨幣', + 'guest_checkout' => '遊客結賬', + 'theme_default' => '默認主題', + 'theme_black' => '黑色主題', + 'shipping_address' => '發貨地址', + 'payment_address' => '賬單地址', + 'meta_title' => 'Meta 標題', + 'meta_description' => 'Meta 描述', + 'meta_keywords' => 'Meta 關鍵詞', + 'telephone' => '聯繫電話', + 'email' => '郵箱', + 'default_address' => '默認地址', + 'default_country_set' => '默認國家設置', + 'default_zone_set' => '默認省份設置', + 'default_language' => '默認語言', + 'default_currency' => '默認貨幣', 'default_customer_group' => '默認客戶組', - 'admin_name' => '後台目錄', - 'admin_name_info' => '管理後台目錄,默認為admin', - 'enable_tax' => '啟用稅費', - 'enable_tax_info' => '是否啟用稅費計算', - 'tax_address' => '稅費地址', - 'tax_address_info' => '按什麼地址計算稅費', - 'logo' => '網站 Logo', - 'favicon' => 'favicon', - 'favicon_info' => '顯示在瀏覽器選項卡上的小圖標，必須為PNG格式大小為：32*32', - 'placeholder_image' => '佔位圖', + 'admin_name' => '後台目錄', + 'admin_name_info' => '管理後台目錄,默認為admin', + 'enable_tax' => '啟用稅費', + 'enable_tax_info' => '是否啟用稅費計算', + 'tax_address' => '稅費地址', + 'tax_address_info' => '按什麼地址計算稅費', + 'logo' => '網站 Logo', + 'favicon' => 'favicon', + 'favicon_info' => '顯示在瀏覽器選項卡上的小圖標，必須為PNG格式大小為：32*32', + 'placeholder_image' => '佔位圖', 'placeholder_image_info' => '無圖片或圖片未找到時顯示的佔位圖，建議尺寸：500*500', - 'head_code' => '插入代碼', - 'head_code_info' => '會將輸入框中的代碼插入到前端頁面 head 中，可用於統計代碼或者添加特殊插件等', + 'head_code' => '插入代碼', + 'head_code_info' => '會將輸入框中的代碼插入到前端頁面 head 中，可用於統計代碼或者添加特殊插件等', ]; diff --git a/resources/lang/zh_hk/admin/tax_class.php b/resources/lang/zh_hk/admin/tax_class.php index 5e6ac75d..bb765dc8 100644 --- a/resources/lang/zh_hk/admin/tax_class.php +++ b/resources/lang/zh_hk/admin/tax_class.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '稅類', - 'rule' => '規則', - 'based_on' => '基於', - 'priority' => '優先級', - 'tax_classes_index' => '稅類列表', + 'index' => '稅類', + 'rule' => '規則', + 'based_on' => '基於', + 'priority' => '優先級', + 'tax_classes_index' => '稅類列表', 'tax_classes_create' => '創建稅類', - 'tax_classes_show' => '稅類詳情', + 'tax_classes_show' => '稅類詳情', 'tax_classes_update' => '更新稅類', 'tax_classes_delete' => '刪除稅類', ]; diff --git a/resources/lang/zh_hk/admin/tax_rate.php b/resources/lang/zh_hk/admin/tax_rate.php index 5e6ac75d..bb765dc8 100644 --- a/resources/lang/zh_hk/admin/tax_rate.php +++ b/resources/lang/zh_hk/admin/tax_rate.php @@ -10,13 +10,13 @@ */ return [ - 'index' => '稅類', - 'rule' => '規則', - 'based_on' => '基於', - 'priority' => '優先級', - 'tax_classes_index' => '稅類列表', + 'index' => '稅類', + 'rule' => '規則', + 'based_on' => '基於', + 'priority' => '優先級', + 'tax_classes_index' => '稅類列表', 'tax_classes_create' => '創建稅類', - 'tax_classes_show' => '稅類詳情', + 'tax_classes_show' => '稅類詳情', 'tax_classes_update' => '更新稅類', 'tax_classes_delete' => '刪除稅類', ]; diff --git a/resources/lang/zh_hk/admin/user.php b/resources/lang/zh_hk/admin/user.php index 86db97bd..13f60b41 100644 --- a/resources/lang/zh_hk/admin/user.php +++ b/resources/lang/zh_hk/admin/user.php @@ -10,12 +10,12 @@ */ return [ - 'admin_users_index' => '用戶列表', - 'admin_users_create' => '創建用戶', - 'admin_users_show' => '用戶詳情', - 'admin_users_update' => '更新用戶', - 'admin_users_delete' => '刪除用戶', + 'admin_users_index' => '用戶列表', + 'admin_users_create' => '創建用戶', + 'admin_users_show' => '用戶詳情', + 'admin_users_update' => '更新用戶', + 'admin_users_delete' => '刪除用戶', 'verify_code_expired' => '您的驗證碼已過期（10分鐘），請重新獲取', - 'verify_code_error' => '您的驗證碼錯誤', - 'account_not_exist' => '賬號不存在', + 'verify_code_error' => '您的驗證碼錯誤', + 'account_not_exist' => '賬號不存在', ]; diff --git a/resources/lang/zh_hk/admin/zone.php b/resources/lang/zh_hk/admin/zone.php index 8acdc98f..af97fab6 100644 --- a/resources/lang/zh_hk/admin/zone.php +++ b/resources/lang/zh_hk/admin/zone.php @@ -9,13 +9,13 @@ * @modified 2022-08-29 17:21:38 */ return [ - 'zone_name' => '省份名稱', + 'zone_name' => '省份名稱', 'country_of_origin' => '所屬國家', - 'zones_index' => '省份列表', - 'zones_create' => '創建省份', - 'zones_update' => '更新省份', - 'zones_delete' => '刪除省份', + 'zones_index' => '省份列表', + 'zones_create' => '創建省份', + 'zones_update' => '更新省份', + 'zones_delete' => '刪除省份', - 'error_country' => '請選擇國家', + 'error_country' => '請選擇國家', ]; diff --git a/resources/lang/zh_hk/brand.php b/resources/lang/zh_hk/brand.php index 0cc16695..648bbecd 100644 --- a/resources/lang/zh_hk/brand.php +++ b/resources/lang/zh_hk/brand.php @@ -10,7 +10,7 @@ */ return [ - 'name' => '品牌名稱', - 'icon' => '圖標', + 'name' => '品牌名稱', + 'icon' => '圖標', 'first_letter' => '首字母', ]; diff --git a/resources/lang/zh_hk/cart.php b/resources/lang/zh_hk/cart.php index 15d24cfd..d939f4f7 100644 --- a/resources/lang/zh_hk/cart.php +++ b/resources/lang/zh_hk/cart.php @@ -10,7 +10,7 @@ */ return [ - 'sku_id' => 'SKU ID', - 'quantity' => '購買數量', + 'sku_id' => 'SKU ID', + 'quantity' => '購買數量', 'stock_out' => '庫存不足', ]; diff --git a/resources/lang/zh_hk/common.php b/resources/lang/zh_hk/common.php index 4b450a78..ee17f36e 100644 --- a/resources/lang/zh_hk/common.php +++ b/resources/lang/zh_hk/common.php @@ -9,78 +9,76 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'error_required' => '請填寫 :name', // 这个有用别删了，:name 是一个变量 + 'error_required' => '請填寫 :name', // 这个有用别删了，:name 是一个变量 'error_input_required' => '輸入框不能為空', - 'error_form' => '請檢查表單是否填寫正確', - 'email' => '郵箱', - 'unauthenticated' => '請先登錄', - 'success' => '成功', - 'no_data' => '暫無數據～', - 'empty_items' => '沒有數據', - 'created_success' => '創建成功!', - 'deleted_success' => '刪除成功!', - 'restored_success' => '恢復成功!', - 'updated_success' => '更新成功!', - 'edit_success' => '修改成功!', - 'get_success' => '獲取成功!', - 'all' => '全部', - 'status' => '狀態', - 'enable' => '啟用', - 'disable' => '禁用', - 'enabled' => '啟用', - 'disabled' => '禁用', - 'home' => '首頁', - 'submit' => '提交', - 'title' => '標題', - 'save' => '保存', - 'cancel' => '取消', - 'confirm' => '確定', - 'no' => '否', - 'yes' => '是', - 'delete' => '刪除', - 'sign_out' => '退出登錄', - 'contact_us' => '聯繫我們', - 'input' => '在此處輸入您的搜索', - 'filter' => '篩選', - 'reset' => '重置', - 'export' => '導出', - 'edit' => '編輯', - 'action' => '操作', - 'add' => '添加', - 'please_choose' => '請選擇', - 'recommend_size' => '建議尺寸', - 'pick_datetime' => '選擇時間', - 'confirm_delete' => '確定要刪除嗎?', - 'text_hint' => '提示', - 'restore' => '恢復', - 'name' => '名稱', - 'image' => '圖片', - 'data' => '數據', - 'view' => '查看', - 'phone' => '電話', - 'exit' => '退出', - 'return' => '返回', - 'language' => '語言', - 'select_all' => '全選', - 'sign_out' => '退出登錄', - 'menu' => '菜單', - 'whether_open' => '是否開啟', - 'to_setting' => '去配置', + 'error_form' => '請檢查表單是否填寫正確', + 'email' => '郵箱', + 'unauthenticated' => '請先登錄', + 'success' => '成功', + 'no_data' => '暫無數據～', + 'empty_items' => '沒有數據', + 'created_success' => '創建成功!', + 'deleted_success' => '刪除成功!', + 'restored_success' => '恢復成功!', + 'updated_success' => '更新成功!', + 'edit_success' => '修改成功!', + 'get_success' => '獲取成功!', + 'all' => '全部', + 'status' => '狀態', + 'enable' => '啟用', + 'disable' => '禁用', + 'enabled' => '啟用', + 'disabled' => '禁用', + 'home' => '首頁', + 'submit' => '提交', + 'title' => '標題', + 'save' => '保存', + 'cancel' => '取消', + 'confirm' => '確定', + 'no' => '否', + 'yes' => '是', + 'delete' => '刪除', + 'sign_out' => '退出登錄', + 'contact_us' => '聯繫我們', + 'input' => '在此處輸入您的搜索', + 'filter' => '篩選', + 'reset' => '重置', + 'export' => '導出', + 'edit' => '編輯', + 'action' => '操作', + 'add' => '添加', + 'please_choose' => '請選擇', + 'recommend_size' => '建議尺寸', + 'pick_datetime' => '選擇時間', + 'confirm_delete' => '確定要刪除嗎?', + 'text_hint' => '提示', + 'restore' => '恢復', + 'name' => '名稱', + 'image' => '圖片', + 'data' => '數據', + 'view' => '查看', + 'phone' => '電話', + 'exit' => '退出', + 'return' => '返回', + 'language' => '語言', + 'select_all' => '全選', + 'sign_out' => '退出登錄', + 'menu' => '菜單', + 'whether_open' => '是否開啟', + 'to_setting' => '去配置', - 'id' => 'ID', - 'created_at' => '創建時間', - 'updated_at' => '修改時間', - 'sort_order' => '排序', - 'error_page' => '您訪問的數據不存在或已被刪除~', - 'error_page_btn' => '返回上一頁', + 'id' => 'ID', + 'created_at' => '創建時間', + 'updated_at' => '修改時間', + 'sort_order' => '排序', + 'error_page' => '您訪問的數據不存在或已被刪除~', + 'error_page_btn' => '返回上一頁', - 'order' => [ - 'unpaid' => '待支付', - 'paid' => '已支付', - 'shipped' => '已發貨', + 'order' => [ + 'unpaid' => '待支付', + 'paid' => '已支付', + 'shipped' => '已發貨', 'completed' => '已完成', 'cancelled' => '已取消', - ] + ], ]; - - diff --git a/resources/lang/zh_hk/currency.php b/resources/lang/zh_hk/currency.php index 5ad1742d..4e16ce34 100644 --- a/resources/lang/zh_hk/currency.php +++ b/resources/lang/zh_hk/currency.php @@ -10,13 +10,13 @@ */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', - 'name' => '名稱', - 'code' => '編碼', - 'icon' => '圖標', - 'symbol_left' => '左符號', - 'symbol_right' => '右符號', - 'value' => '匯率值', - 'decimal_place' => '小數位數', + 'name' => '名稱', + 'code' => '編碼', + 'icon' => '圖標', + 'symbol_left' => '左符號', + 'symbol_right' => '右符號', + 'value' => '匯率值', + 'decimal_place' => '小數位數', ]; diff --git a/resources/lang/zh_hk/customer.php b/resources/lang/zh_hk/customer.php index a3fc2a76..5826ac0c 100644 --- a/resources/lang/zh_hk/customer.php +++ b/resources/lang/zh_hk/customer.php @@ -10,8 +10,8 @@ */ return [ - 'name' => '姓名', - 'email' => 'Email', - 'from' => '註冊來源', + 'name' => '姓名', + 'email' => 'Email', + 'from' => '註冊來源', 'customer_group' => '用戶組', ]; diff --git a/resources/lang/zh_hk/customer_group.php b/resources/lang/zh_hk/customer_group.php index 8f0b643c..4cdf861e 100644 --- a/resources/lang/zh_hk/customer_group.php +++ b/resources/lang/zh_hk/customer_group.php @@ -11,5 +11,5 @@ return [ 'level' => '等級', - 'name' => '客戶組名稱', + 'name' => '客戶組名稱', ]; diff --git a/resources/lang/zh_hk/mail.php b/resources/lang/zh_hk/mail.php index ca2d343a..da2610a1 100644 --- a/resources/lang/zh_hk/mail.php +++ b/resources/lang/zh_hk/mail.php @@ -10,17 +10,17 @@ */ return [ - 'order_success' => '訂單提交成功', - 'order_update' => '訂單狀態更新', - 'order_success_info' => '您的訂單已提交成功，下面是訂單明細', - 'not_oneself' => '非本人操作可忽略。 ', - 'customer_name' => '尊敬的 :name 用戶，您好！ ', - 'sincerely' => '此致', - 'team' => '團隊', - 'order_update_status' => '您的訂單 :number 狀態更新為', - 'welcome_register' => '歡迎註冊', - 'register_end' => '完成註冊，請點擊下面按鈕回到商城。 ', - 'btn_buy_now' => '立即購買', + 'order_success' => '訂單提交成功', + 'order_update' => '訂單狀態更新', + 'order_success_info' => '您的訂單已提交成功，下面是訂單明細', + 'not_oneself' => '非本人操作可忽略。 ', + 'customer_name' => '尊敬的 :name 用戶，您好！ ', + 'sincerely' => '此致', + 'team' => '團隊', + 'order_update_status' => '您的訂單 :number 狀態更新為', + 'welcome_register' => '歡迎註冊', + 'register_end' => '完成註冊，請點擊下面按鈕回到商城。 ', + 'btn_buy_now' => '立即購買', 'retrieve_password_text' => '您正在找回密碼，請點擊下面按鈕完成操作。 ', - 'retrieve_password_btn' => '點擊此處驗證郵箱', + 'retrieve_password_btn' => '點擊此處驗證郵箱', ]; diff --git a/resources/lang/zh_hk/order.php b/resources/lang/zh_hk/order.php index 50975144..fdcc12fe 100644 --- a/resources/lang/zh_hk/order.php +++ b/resources/lang/zh_hk/order.php @@ -10,44 +10,44 @@ */ return [ - 'id' => 'ID', - 'number' => '訂單號', - 'customer_name' => '客戶姓名', - 'payment_method' => '支付方式', - 'email' => 'Email', - 'telephone' => '聯繫電話', - 'created_at' => '創建時間', - 'updated_at' => '更新時間', - 'status' => '狀態', - 'status_format' => '狀態', - 'total' => '訂單總額', - 'express_number' => '快遞單號', - 'express_company' => '快遞公司', - 'order_shipments' => '發貨信息', + 'id' => 'ID', + 'number' => '訂單號', + 'customer_name' => '客戶姓名', + 'payment_method' => '支付方式', + 'email' => 'Email', + 'telephone' => '聯繫電話', + 'created_at' => '創建時間', + 'updated_at' => '更新時間', + 'status' => '狀態', + 'status_format' => '狀態', + 'total' => '訂單總額', + 'express_number' => '快遞單號', + 'express_company' => '快遞公司', + 'order_shipments' => '發貨信息', - 'address_info' => '地址信息', - 'shipping_address' => '配送地址', - 'payment_address' => '賬單地址', - 'order_status' => '訂單狀態', - 'current_status' => '當前狀態', - 'change_to_status' => '修改狀態', - 'comment' => '備註信息', - 'submit_status' => '更新狀態', - 'product_info' => '商品信息', - 'product_name' => '名稱', - 'product_price' => '價格', - 'product_sub_price' => '小計', - 'product_quantity' => '數量', - 'product_sku' => 'SKU', + 'address_info' => '地址信息', + 'shipping_address' => '配送地址', + 'payment_address' => '賬單地址', + 'order_status' => '訂單狀態', + 'current_status' => '當前狀態', + 'change_to_status' => '修改狀態', + 'comment' => '備註信息', + 'submit_status' => '更新狀態', + 'product_info' => '商品信息', + 'product_name' => '名稱', + 'product_price' => '價格', + 'product_sub_price' => '小計', + 'product_quantity' => '數量', + 'product_sku' => 'SKU', - 'action_history' => '操作日誌', - 'history_status' => '狀態', - 'history_comment' => '備註', + 'action_history' => '操作日誌', + 'history_status' => '狀態', + 'history_comment' => '備註', 'history_created_at' => '更新日期', - 'unpaid' => '待支付', - 'paid' => '已支付', - 'shipped' => '已發貨', - 'completed' => '已完成', - 'cancelled' => '已取消', + 'unpaid' => '待支付', + 'paid' => '已支付', + 'shipped' => '已發貨', + 'completed' => '已完成', + 'cancelled' => '已取消', ]; diff --git a/resources/lang/zh_hk/page.php b/resources/lang/zh_hk/page.php index ea053237..11db2d15 100644 --- a/resources/lang/zh_hk/page.php +++ b/resources/lang/zh_hk/page.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 20:59:38 */ return [ - 'title' => '标题', + 'title' => '标题', 'content' => '内容', ]; diff --git a/resources/lang/zh_hk/product.php b/resources/lang/zh_hk/product.php index 97f375fa..d8005a0f 100644 --- a/resources/lang/zh_hk/product.php +++ b/resources/lang/zh_hk/product.php @@ -10,18 +10,18 @@ */ return [ - 'name' => '名稱', - 'sku' => 'SKU', - 'price' => '價格', - 'origin_price' => '原價', - 'cost_price' => '成本價', - 'brand' => '品牌', - 'category' => '分類', - 'model' => '型號', - 'quantity' => '庫存', - 'image' => '圖片', + 'name' => '名稱', + 'sku' => 'SKU', + 'price' => '價格', + 'origin_price' => '原價', + 'cost_price' => '成本價', + 'brand' => '品牌', + 'category' => '分類', + 'model' => '型號', + 'quantity' => '庫存', + 'image' => '圖片', - 'active' => '上架', - 'inactive' => '下架', + 'active' => '上架', + 'inactive' => '下架', 'has_been_inactive' => '該商品已下架', ]; diff --git a/resources/lang/zh_hk/rma.php b/resources/lang/zh_hk/rma.php index b81d6188..8eb33f5a 100644 --- a/resources/lang/zh_hk/rma.php +++ b/resources/lang/zh_hk/rma.php @@ -10,22 +10,22 @@ */ return [ - 'order_id' => '訂單', + 'order_id' => '訂單', 'order_product_id' => '訂單商品', - 'customer_id' => '顧客', - 'quantity' => '數量', - 'opened' => '已拆包裝', - 'rma_reason_id' => '退換貨原因', - 'type' => '售後服務類型', + 'customer_id' => '顧客', + 'quantity' => '數量', + 'opened' => '已拆包裝', + 'rma_reason_id' => '退換貨原因', + 'type' => '售後服務類型', - 'status_pending' => '待處理', - 'status_rejected' => '已拒絕', - 'status_approved' => '已批准（待顧客寄回商品）', - 'status_shipped' => '已發貨（寄回商品）', + 'status_pending' => '待處理', + 'status_rejected' => '已拒絕', + 'status_approved' => '已批准（待顧客寄回商品）', + 'status_shipped' => '已發貨（寄回商品）', 'status_completed' => '已完成', - 'type_return' => '退貨', - 'type_exchange' => '換貨', - 'type_repair' => '維修', - 'type_reissue' => '補發商品', - 'type_refund' => '僅退款' + 'type_return' => '退貨', + 'type_exchange' => '換貨', + 'type_repair' => '維修', + 'type_reissue' => '補發商品', + 'type_refund' => '僅退款', ]; diff --git a/resources/lang/zh_hk/shop/account.php b/resources/lang/zh_hk/shop/account.php index 20d9707e..8fe753d5 100644 --- a/resources/lang/zh_hk/shop/account.php +++ b/resources/lang/zh_hk/shop/account.php @@ -10,128 +10,128 @@ */ return [ - 'index' => '個人中心', - 'revise_info' => '修改信息', - 'collect' => '收藏', - 'coupon' => '優惠券', - 'my_order' => '我的訂單', - 'orders' => '全部訂單', - 'pending_payment' => '待付款', - 'pending_send' => '待發貨', - 'pending_receipt' => '待收貨', - 'after_sales' => '售後', - 'no_order' => '您還沒有訂單！ ', - 'to_buy' => '去下單', - 'order_number' => '訂單號', - 'order_time' => '下單時間', - 'state' => '狀態', - 'amount' => '金額', - 'check_details' => '查看詳情', - 'all' => '共', - 'items' => '件商品', + 'index' => '個人中心', + 'revise_info' => '修改信息', + 'collect' => '收藏', + 'coupon' => '優惠券', + 'my_order' => '我的訂單', + 'orders' => '全部訂單', + 'pending_payment' => '待付款', + 'pending_send' => '待發貨', + 'pending_receipt' => '待收貨', + 'after_sales' => '售後', + 'no_order' => '您還沒有訂單！ ', + 'to_buy' => '去下單', + 'order_number' => '訂單號', + 'order_time' => '下單時間', + 'state' => '狀態', + 'amount' => '金額', + 'check_details' => '查看詳情', + 'all' => '共', + 'items' => '件商品', 'verify_code_expired' => '您的驗證碼已過期（10分鐘），請重新獲取', - 'verify_code_error' => '您的驗證碼錯誤', - 'account_not_exist' => '賬號不存在', + 'verify_code_error' => '您的驗證碼錯誤', + 'account_not_exist' => '賬號不存在', - 'edit' => [ - 'index' => '修改個人信息', - 'modify_avatar' => '修改頭像', - 'suggest' => '上傳JPG或PNG圖片。建議300 x 300。 ', - 'name' => '名稱', - 'email' => '郵箱', - 'crop' => '裁剪', + 'edit' => [ + 'index' => '修改個人信息', + 'modify_avatar' => '修改頭像', + 'suggest' => '上傳JPG或PNG圖片。建議300 x 300。 ', + 'name' => '名稱', + 'email' => '郵箱', + 'crop' => '裁剪', 'password_edit_success' => '密碼修改成功', - 'origin_password_fail' => '原密碼錯誤', + 'origin_password_fail' => '原密碼錯誤', ], - 'wishlist' => [ - 'index' => '我的收藏', - 'product' => '商品', - 'price' => '價格', + 'wishlist' => [ + 'index' => '我的收藏', + 'product' => '商品', + 'price' => '價格', 'check_details' => '查看詳情', ], - 'order' => [ - 'index' => '我的訂單', - 'completed' => '已確認收貨', - 'cancelled' => '訂單已取消', + 'order' => [ + 'index' => '我的訂單', + 'completed' => '已確認收貨', + 'cancelled' => '訂單已取消', 'order_details' => '訂單詳情', - 'amount' => '金額', - 'state' => '狀態', - 'order_number' => '訂單號', - 'check' => '查看', + 'amount' => '金額', + 'state' => '狀態', + 'order_number' => '訂單號', + 'check' => '查看', - 'order_info' => [ - 'index' => '訂單詳情', - 'order_details' => '訂單詳情', - 'to_pay' => '去支付', - 'cancel' => '取消訂單', - 'confirm_receipt' => '確認收貨', - 'order_number' => '訂單號', - 'order_date' => '下單日期', - 'state' => '狀態', - 'order_amount' => '訂單金額', - 'order_items' => '訂購商品', + 'order_info' => [ + 'index' => '訂單詳情', + 'order_details' => '訂單詳情', + 'to_pay' => '去支付', + 'cancel' => '取消訂單', + 'confirm_receipt' => '確認收貨', + 'order_number' => '訂單號', + 'order_date' => '下單日期', + 'state' => '狀態', + 'order_amount' => '訂單金額', + 'order_items' => '訂購商品', 'apply_after_sales' => '申請售後', - 'order_total' => '合計訂單', - 'logistics_status' => '物流狀態', - 'order_status' => '訂單狀態', - 'remark' => '備註', - 'update_time' => '更新時間', + 'order_total' => '合計訂單', + 'logistics_status' => '物流狀態', + 'order_status' => '訂單狀態', + 'remark' => '備註', + 'update_time' => '更新時間', ], 'order_success' => [ - 'order_success' => '恭喜您，訂單生成成功！ ', - 'order_number' => '訂單編號', - 'amounts_payable' => '應付金額 ', - 'payment_method' => '支付方式 ', - 'view_order' => '查看訂單詳情 ', - 'pay_now' => '立即支付 ', - 'kind_tips' => '溫馨提示：您的訂單已生成成功，請盡快完成支付哦～ ', - 'also' => '您還可以', - 'continue_purchase' => '繼續採購', + 'order_success' => '恭喜您，訂單生成成功！ ', + 'order_number' => '訂單編號', + 'amounts_payable' => '應付金額 ', + 'payment_method' => '支付方式 ', + 'view_order' => '查看訂單詳情 ', + 'pay_now' => '立即支付 ', + 'kind_tips' => '溫馨提示：您的訂單已生成成功，請盡快完成支付哦～ ', + 'also' => '您還可以', + 'continue_purchase' => '繼續採購', 'contact_customer_service' => '如果您在訂單過程中有任何問題，可以隨時聯繫我們客服人員', - 'emaill' => '郵箱', - 'service_hotline' => '服務熱線', + 'emaill' => '郵箱', + 'service_hotline' => '服務熱線', ], ], - 'addresses' => [ - 'index' => '我的地址', - 'add_address' => '添加新地址', + 'addresses' => [ + 'index' => '我的地址', + 'add_address' => '添加新地址', 'default_address' => '默認地址', - 'delete' => '刪除', - 'edit' => '編輯', - 'enter_name' => '請輸入姓名', - 'enter_phone' => '請輸入聯繫電話', - 'enter_address' => '請輸入詳細地址 1', + 'delete' => '刪除', + 'edit' => '編輯', + 'enter_name' => '請輸入姓名', + 'enter_phone' => '請輸入聯繫電話', + 'enter_address' => '請輸入詳細地址 1', 'select_province' => '請選擇省份', - 'enter_city' => '請填寫城市', - 'confirm_delete' => '確定要刪除地址嗎？ ', - 'hint' => '提示', - 'check_form' => '請檢查表單是否填寫正確', + 'enter_city' => '請填寫城市', + 'confirm_delete' => '確定要刪除地址嗎？ ', + 'hint' => '提示', + 'check_form' => '請檢查表單是否填寫正確', ], - 'rma' => [ - 'index' => '我的售後', - 'commodity' => '商品', - 'quantity' => '數量', - 'service_type' => '服務類型', + 'rma' => [ + 'index' => '我的售後', + 'commodity' => '商品', + 'quantity' => '數量', + 'service_type' => '服務類型', 'return_reason' => '退換原因', 'creation_time' => '創建時間', - 'check' => '查看', + 'check' => '查看', - 'rma_info' => [ + 'rma_info' => [ 'index' => '售後詳情', ], - 'rma_form' => [ - 'index' => '提交售後信息', - 'service_type' => '服務類型', + 'rma_form' => [ + 'index' => '提交售後信息', + 'service_type' => '服務類型', 'return_quantity' => '退換數量', - 'unpacked' => '已打開包裝', - 'return_reason' => '退換原因', - 'remark' => '備註', ] - ] + 'unpacked' => '已打開包裝', + 'return_reason' => '退換原因', + 'remark' => '備註', ], + ], ]; diff --git a/resources/lang/zh_hk/shop/carts.php b/resources/lang/zh_hk/shop/carts.php index 00514f59..e934ca26 100644 --- a/resources/lang/zh_hk/shop/carts.php +++ b/resources/lang/zh_hk/shop/carts.php @@ -10,30 +10,30 @@ */ return [ - 'index' => '購物車', - 'added_to_cart' => '已加入購物車', - 'select_all' => '全選', - 'commodity' => '商品', - 'quantity' => '數量', - 'subtotal' => '小計', - 'product_total' => '商品總計', - 'order_total' => '應付總金額', - 'shipping_fee' => '運費', - 'all' => '全部', - 'selected' => '已選', - 'to_checkout' => '去結賬', - 'cart_empty' => '您的購物車是空的', - 'go_buy' => '您可以去看看有哪些想買的', - 'go_shopping' => '去逛逛', - 'must_select' => '請選擇至少一個商品', - 'mini' => '您的購物車', - 'delete' => '刪除', - 'check_cart' => '查看購物車', + 'index' => '購物車', + 'added_to_cart' => '已加入購物車', + 'select_all' => '全選', + 'commodity' => '商品', + 'quantity' => '數量', + 'subtotal' => '小計', + 'product_total' => '商品總計', + 'order_total' => '應付總金額', + 'shipping_fee' => '運費', + 'all' => '全部', + 'selected' => '已選', + 'to_checkout' => '去結賬', + 'cart_empty' => '您的購物車是空的', + 'go_buy' => '您可以去看看有哪些想買的', + 'go_shopping' => '去逛逛', + 'must_select' => '請選擇至少一個商品', + 'mini' => '您的購物車', + 'delete' => '刪除', + 'check_cart' => '查看購物車', - 'invalid_customer' => '購物車客戶無效', - 'empty_selected_products' => '購物車選中商品為空', + 'invalid_customer' => '購物車客戶無效', + 'empty_selected_products' => '購物車選中商品為空', 'invalid_shipping_address' => '配送地址無效', - 'invalid_payment_address' => '賬單地址無效', - 'invalid_shipping_method' => '配送方式不可用', - 'invalid_payment_method' => '支付方式不可用', + 'invalid_payment_address' => '賬單地址無效', + 'invalid_shipping_method' => '配送方式不可用', + 'invalid_payment_method' => '支付方式不可用', ]; diff --git a/resources/lang/zh_hk/shop/checkout.php b/resources/lang/zh_hk/shop/checkout.php index 763ff4fd..8861dc4e 100644 --- a/resources/lang/zh_hk/shop/checkout.php +++ b/resources/lang/zh_hk/shop/checkout.php @@ -10,31 +10,31 @@ */ return [ - 'index' => '結賬', - 'address' => '配送地址', - 'payment_address' => '賬單地址', + 'index' => '結賬', + 'address' => '配送地址', + 'payment_address' => '賬單地址', 'same_as_shipping_address' => '賬單地址同收貨地址', - 'chosen' => '已選擇', - 'edit' => '編輯', - 'choose_another_address' => '選擇其他地址', - 'add_new_address' => '添加新地址', - 'payment_method' => '支付方式', - 'delivery_method' => '配送方式', - 'cart_totals' => '購物車總數', - 'submit_order' => '提交訂單', - 'enter_name' => '請輸入姓名', - 'enter_phone' => '請輸入聯繫電話', - 'enter_address' => '請輸入詳細地址 1', - 'select_province' => '請選擇省份', - 'enter_city' => '請填寫城市', - 'check_form' => '請檢查表單是否填寫正確', - 'error_payment_address' => '請選擇賬單地址', + 'chosen' => '已選擇', + 'edit' => '編輯', + 'choose_another_address' => '選擇其他地址', + 'add_new_address' => '添加新地址', + 'payment_method' => '支付方式', + 'delivery_method' => '配送方式', + 'cart_totals' => '購物車總數', + 'submit_order' => '提交訂單', + 'enter_name' => '請輸入姓名', + 'enter_phone' => '請輸入聯繫電話', + 'enter_address' => '請輸入詳細地址 1', + 'select_province' => '請選擇省份', + 'enter_city' => '請填寫城市', + 'check_form' => '請檢查表單是否填寫正確', + 'error_payment_address' => '請選擇賬單地址', - 'payment' => [ - 'index' => '請付款', - 'please_pay' => '訂單提交成功，請付款', - 'order_number' => '訂單編號', + 'payment' => [ + 'index' => '請付款', + 'please_pay' => '訂單提交成功，請付款', + 'order_number' => '訂單編號', 'amounts_payable' => '應付金額', - 'payment_method' => '支付方式', + 'payment_method' => '支付方式', ], ]; diff --git a/resources/lang/zh_hk/shop/common.php b/resources/lang/zh_hk/shop/common.php index e6b45db5..93d07fca 100644 --- a/resources/lang/zh_hk/shop/common.php +++ b/resources/lang/zh_hk/shop/common.php @@ -10,10 +10,10 @@ */ return [ - 'home' => '首頁', - 'submit' => '提交', - 'cancel' => '取消', + 'home' => '首頁', + 'submit' => '提交', + 'cancel' => '取消', 'confirm' => '確定', - 'no' => '否', - 'yes' => '是', + 'no' => '否', + 'yes' => '是', ]; diff --git a/resources/lang/zh_hk/shop/currency.php b/resources/lang/zh_hk/shop/currency.php index 06f91864..c940c346 100644 --- a/resources/lang/zh_hk/shop/currency.php +++ b/resources/lang/zh_hk/shop/currency.php @@ -9,6 +9,6 @@ * @modified 2022-07-28 17:21:38 */ return [ - 'decimal_point' => '.', + 'decimal_point' => '.', 'thousand_point' => ',', ]; diff --git a/resources/lang/zh_hk/shop/forgotten.php b/resources/lang/zh_hk/shop/forgotten.php index ee6ba84a..f343f5d1 100644 --- a/resources/lang/zh_hk/shop/forgotten.php +++ b/resources/lang/zh_hk/shop/forgotten.php @@ -11,23 +11,23 @@ */ return [ - 'index' => '忘記密碼', - 'follow_prompt' => '請根據提示找回您的密碼', - 'email_forCode' => '請輸入郵箱地址獲取驗證碼', - 'enter_password' => '請輸入新密碼', - 'email' => '郵箱', - 'email_address' => '郵箱地址', - 'verification_code' => '驗證碼', - 'password' => '密碼', - 'confirm_password' => '確認密碼', - 'send_code' => '發送驗證碼', - 'to_back' => '返回上一步', - 'enter_password' => '請輸入密碼', - 'enter_email' => '請輸入郵箱', - 'please_confirm' => '請確認密碼', - 'password_err' => '兩次輸入密碼不一致!', - 'email_err' => '請輸入正確郵箱地址!', - 'enter_code' => '請輸入驗證碼', + 'index' => '忘記密碼', + 'follow_prompt' => '請根據提示找回您的密碼', + 'email_forCode' => '請輸入郵箱地址獲取驗證碼', + 'enter_password' => '請輸入新密碼', + 'email' => '郵箱', + 'email_address' => '郵箱地址', + 'verification_code' => '驗證碼', + 'password' => '密碼', + 'confirm_password' => '確認密碼', + 'send_code' => '發送驗證碼', + 'to_back' => '返回上一步', + 'enter_password' => '請輸入密碼', + 'enter_email' => '請輸入郵箱', + 'please_confirm' => '請確認密碼', + 'password_err' => '兩次輸入密碼不一致!', + 'email_err' => '請輸入正確郵箱地址!', + 'enter_code' => '請輸入驗證碼', 'verification_code_sent' => '驗證碼已發送，請查看並輸入驗證碼', - 'password_updated' => '密碼已修改', + 'password_updated' => '密碼已修改', ]; diff --git a/resources/lang/zh_hk/shop/login.php b/resources/lang/zh_hk/shop/login.php index 3c5dde4e..d66d4125 100644 --- a/resources/lang/zh_hk/shop/login.php +++ b/resources/lang/zh_hk/shop/login.php @@ -11,30 +11,30 @@ */ return [ - 'index' => '用戶登錄與註冊', - 'login_and_sign' => '登錄/註冊', - 'home' => '首頁', - 'library' => '個人中心', - 'login' => '登錄', - 'already' => '已經是我們的客戶了？ ', - 'description' => '已經是我們的客戶了？ ', - 'email' => '郵件', - 'email_address' => '郵件地址', - 'password' => '密碼', - 'forget_password' => '忘記密碼', - 'new' => '新賬號', - 'not_already' => '還不是我們的註冊客戶？ ', - 'confirm_password' => '確認密碼', - 'register' => '註冊', - 'enter_password' => '請輸入密碼', - 'enter_email' => '請輸入郵箱', - 'please_confirm' => '請確認密碼', - 'password_err' => '兩次輸入密碼不一致!', - 'email_err' => '請輸入正確郵箱地址!', - 'check_form' => '請檢查表單是否填寫正確', + 'index' => '用戶登錄與註冊', + 'login_and_sign' => '登錄/註冊', + 'home' => '首頁', + 'library' => '個人中心', + 'login' => '登錄', + 'already' => '已經是我們的客戶了？ ', + 'description' => '已經是我們的客戶了？ ', + 'email' => '郵件', + 'email_address' => '郵件地址', + 'password' => '密碼', + 'forget_password' => '忘記密碼', + 'new' => '新賬號', + 'not_already' => '還不是我們的註冊客戶？ ', + 'confirm_password' => '確認密碼', + 'register' => '註冊', + 'enter_password' => '請輸入密碼', + 'enter_email' => '請輸入郵箱', + 'please_confirm' => '請確認密碼', + 'password_err' => '兩次輸入密碼不一致!', + 'email_err' => '請輸入正確郵箱地址!', + 'check_form' => '請檢查表單是否填寫正確', 'email_or_password_error' => '郵件或密碼錯誤!', - 'customer_inactive' => '用戶已被禁用', - 'login_successfully' => '登錄成功', - 'register_success' => '註冊成功', - 'third_party_logins' => '第三方登錄', + 'customer_inactive' => '用戶已被禁用', + 'login_successfully' => '登錄成功', + 'register_success' => '註冊成功', + 'third_party_logins' => '第三方登錄', ]; diff --git a/resources/lang/zh_hk/shop/order.php b/resources/lang/zh_hk/shop/order.php index 1f0a2b21..e30c94b0 100644 --- a/resources/lang/zh_hk/shop/order.php +++ b/resources/lang/zh_hk/shop/order.php @@ -11,8 +11,8 @@ */ return [ - 'invalid_order' => '無效的訂單', - 'confirm_order' => '用戶確認收貨', - 'cancel_order' => '用戶取消訂單', + 'invalid_order' => '無效的訂單', + 'confirm_order' => '用戶確認收貨', + 'cancel_order' => '用戶取消訂單', 'order_already_paid' => '訂單已支付', ]; diff --git a/resources/lang/zh_hk/shop/products.php b/resources/lang/zh_hk/shop/products.php index ac226522..3e3061f0 100644 --- a/resources/lang/zh_hk/shop/products.php +++ b/resources/lang/zh_hk/shop/products.php @@ -10,12 +10,12 @@ */ return [ - 'search' => '搜索', + 'search' => '搜索', 'add_to_favorites' => '加入收藏夾', - 'add_to_cart' => '加入購物車', - 'buy_now' => '立即購買', - 'product_details' => '商品詳情', - 'in_stock' => '有貨', - 'out_stock' => '缺貨', - 'model' => '型號', + 'add_to_cart' => '加入購物車', + 'buy_now' => '立即購買', + 'product_details' => '商品詳情', + 'in_stock' => '有貨', + 'out_stock' => '缺貨', + 'model' => '型號', ]; diff --git a/resources/lang/zh_hk/shop/steps.php b/resources/lang/zh_hk/shop/steps.php index bf38d369..3373ebb7 100644 --- a/resources/lang/zh_hk/shop/steps.php +++ b/resources/lang/zh_hk/shop/steps.php @@ -10,9 +10,9 @@ */ return [ - 'index' => '步驟', - 'cart' => '購物車', - 'checkout' => '結賬', + 'index' => '步驟', + 'cart' => '購物車', + 'checkout' => '結賬', 'submitted_successfully' => '提交成功', - 'payment' => '付款', + 'payment' => '付款', ]; diff --git a/resources/lang/zh_hk/shop/wishlist.php b/resources/lang/zh_hk/shop/wishlist.php index 245f4d8a..e1a94496 100644 --- a/resources/lang/zh_hk/shop/wishlist.php +++ b/resources/lang/zh_hk/shop/wishlist.php @@ -10,6 +10,6 @@ */ return [ - 'add_wishlist_success' => '加入收藏成功', + 'add_wishlist_success' => '加入收藏成功', 'remove_wishlist_success' => '移除收藏成功', ]; diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index 547152f6..ab924025 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -13,7 +13,7 @@ trait CreatesApplication */ public function createApplication() { - $app = require __DIR__.'/../bootstrap/app.php'; + $app = require __DIR__ . '/../bootstrap/app.php'; $app->make(Kernel::class)->bootstrap(); diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 4ae02bc5..0894c608 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -2,7 +2,6 @@ namespace Tests\Feature; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; class ExampleTest extends TestCase