diff --git a/.env.example b/.env.example index 78faeb5ea..dbe7cde12 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,5 @@ APP_NAME=AvoRed -APP_ENV=false +APP_ENV=development APP_KEY= APP_DEBUG=true APP_LOG_LEVEL=debug diff --git a/CHANGELOG.md b/CHANGELOG.md index dac40a535..d686d602e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,23 @@ # Changelog All notable changes to this project will be documented in this file. +## 2.9.5.7 + +### Added +- Added Github release badge to the readme. +- Added new feature **order returns**: this allows your customers to return a product if the product is damaged or if the customer just dont like the item. +- Added another database table field for properties table: is_visible_frontend. +- Remove hard coded currency code. +- Added Laravel Self-Diagnosis package and added code into an `avored:install` command to check if there is an error then it won't allow you to installed it. + +### Fixed +Updated Dockerfile to use Ubuntu 18.04 and PHP7.2. + +## 2.9.5.6 + +### Fixed +- Fixed backend theme + ## 2.9.5 ### Added diff --git a/Dockerfile b/Dockerfile index 836f6982f..c86f4ec70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,39 +1,41 @@ -FROM indpurvesh/laravel-ecommerce +FROM ubuntu:18.04 MAINTAINER purvesh - -RUN apt-get update && apt-get install -y \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ apache2-bin \ - libapache2-mod-php5 \ - php5-curl \ - php5-ldap \ - php5-sqlite \ - php5-mysql \ - php5-mcrypt \ - php5-gd \ - patch \ + libapache2-mod-php \ + php-ctype \ + php-curl \ + php-gd \ + php-json \ + php-ldap \ + php-mbstring \ + php-mysql \ + php-sqlite3 \ + php-tokenizer \ + php-xml \ curl \ - nano \ - vim \ git \ - mysql-client - - - -RUN rm /etc/apache2/sites-available/000-default.conf - -ADD 000-default.conf /etc/apache2/sites-available/ - -RUN service apache2 start + mysql-client \ + nano \ + patch \ + unzip \ + vim RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer -Run rm -rf /var/www/laravel +RUN rm -rf /var/www/laravel RUN composer create-project avored/laravel-ecommerce /var/www/laravel RUN /bin/chown www-data:www-data -R /var/www/laravel/storage +ADD 000-default.conf /etc/apache2/sites-available/ + +RUN a2enmod rewrite + +RUN service apache2 start + EXPOSE 80 CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"] diff --git a/composer.json b/composer.json index 1fabd8a72..9e73203de 100644 --- a/composer.json +++ b/composer.json @@ -16,11 +16,11 @@ "type" : "project", "require" : { "php": ">=7.1.3", - "avored/module-installer": "1.*", "avored/dummy-data": "~2.0", + "avored/framework": "~2.3", + "avored/module-installer": "1.*", "fabpot/goutte": "^3.2", - "fideloper/proxy": "~4.0", - "avored/framework": "~2.3" + "fideloper/proxy": "~4.0" }, "require-dev" : { "filp/whoops": "~2.0", @@ -48,7 +48,10 @@ }, "scripts" : { "post-root-package-install" : "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"", - "post-create-project-cmd" : "@php artisan key:generate", + "post-create-project-cmd" : [ + "@php artisan key:generate", + "@php artisan self-diagnosis" + ], "post-autoload-dump" : [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "@php artisan package:discover" diff --git a/config/self-diagnosis.php b/config/self-diagnosis.php new file mode 100644 index 000000000..6b0dee281 --- /dev/null +++ b/config/self-diagnosis.php @@ -0,0 +1,95 @@ + [ + 'prod' => 'production', + 'live' => 'production', + 'local' => 'development', + ], + + /* + * Common checks that will be performed on all environments. + */ + 'checks' => [ + \BeyondCode\SelfDiagnosis\Checks\AppKeyIsSet::class, + \BeyondCode\SelfDiagnosis\Checks\CorrectPhpVersionIsInstalled::class, + \BeyondCode\SelfDiagnosis\Checks\DatabaseCanBeAccessed::class => [ + 'default_connection' => true, + 'connections' => [], + ], + \BeyondCode\SelfDiagnosis\Checks\DirectoriesHaveCorrectPermissions::class => [ + 'directories' => [ + storage_path(), + base_path('bootstrap/cache'), + ], + ], + \BeyondCode\SelfDiagnosis\Checks\EnvFileExists::class, + \BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreSet::class, + \BeyondCode\SelfDiagnosis\Checks\LocalesAreInstalled::class => [ + 'required_locales' => [ + 'en_US' + ], + ], + \BeyondCode\SelfDiagnosis\Checks\MaintenanceModeNotEnabled::class, + //\BeyondCode\SelfDiagnosis\Checks\MigrationsAreUpToDate::class, + \BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreInstalled::class => [ + 'extensions' => [ + 'openssl', + 'PDO', + 'mbstring', + 'tokenizer', + 'xml', + 'ctype', + 'json', + ], + 'include_composer_extensions' => true, + ], + //\BeyondCode\SelfDiagnosis\Checks\RedisCanBeAccessed::class => [ + // 'default_connection' => true, + // 'connections' => [], + //], + \BeyondCode\SelfDiagnosis\Checks\StorageDirectoryIsLinked::class, + ], + + /* + * Environment specific checks that will only be performed for the corresponding environment. + */ + 'environment_checks' => [ + 'development' => [ + \BeyondCode\SelfDiagnosis\Checks\ComposerWithDevDependenciesIsUpToDate::class, + \BeyondCode\SelfDiagnosis\Checks\ConfigurationIsNotCached::class, + \BeyondCode\SelfDiagnosis\Checks\RoutesAreNotCached::class, + \BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreUpToDate::class, + ], + 'production' => [ + \BeyondCode\SelfDiagnosis\Checks\ComposerWithoutDevDependenciesIsUpToDate::class, + \BeyondCode\SelfDiagnosis\Checks\ConfigurationIsCached::class, + \BeyondCode\SelfDiagnosis\Checks\DebugModeIsNotEnabled::class, + \BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreDisabled::class => [ + 'extensions' => [ + 'xdebug', + ], + ], + \BeyondCode\SelfDiagnosis\Checks\RoutesAreCached::class, + //\BeyondCode\SelfDiagnosis\Checks\ServersArePingable::class => [ + // 'servers' => [ + // 'www.google.com', + // ['host' => 'www.google.com', 'port' => 8080], + // '8.8.8.8', + // ['host' => '8.8.8.8', 'port' => 8080, 'timeout' => 5], + // ], + //], + //\BeyondCode\SelfDiagnosis\Checks\SupervisorProgramsAreRunning::class => [ + // 'programs' => [ + // 'horizon', + // ], + // 'restarted_within' => 300, + //], + ], + ], + +]; diff --git a/public/vendor/avored-default/sass/partials/_badges.scss b/public/vendor/avored-default/sass/partials/_badges.scss new file mode 100644 index 000000000..20d72997f --- /dev/null +++ b/public/vendor/avored-default/sass/partials/_badges.scss @@ -0,0 +1,72 @@ +.badge { + font-weight:400; + padding:4px 8px; + text-transform:uppercase; + border:1px solid; +} + +.badge .badge-icon { + padding:0.4em 0.55em; +} +.badge .badge-icon i { + font-size:0.8em; +} +.badge .badge-default { + background:transparent; + border-color:#9A9A9A; + color:#9A9A9A; +} +.badge .badge-default .fill { + background:#9A9A9A; + color:#fff; +} +.badge .badge-primary { + background:transparent; + border-color:#49c5b6; + color:#49c5b6; +} +.badge .badge-primary.fill { + background:#49c5b6; + color:#fff; +} +.badge .badge-info { + background:transparent; + border-color:#3C89DA; + color:#3C89DA; +} +.badge .badge-info.fill { + background:#3C89DA; + color:#fff; +} +.badge .badge-success { + background:transparent; + border-color:#22af46; + color:#22af46; +} +.badge .badge-success.fill { + background:#22af46; + color:#fff; +} +.badge .badge-warning { + background:transparent; + border-color:#f3ad06; + color:#f3ad06; +} +.badge .badge-warning .fill { + background:#f3ad06; + color:#fff; +} +.badge .badge-danger { + background:transparent; + border-color:#de4848; + color:#de4848; +} +.badge .badge-danger .fill { + background:#de4848; + color:#fff; +} +.badge .round { + -webkit-border-radius:30px; + -moz-border-radius:30px; + border-radius:30px +} \ No newline at end of file diff --git a/readme.md b/readme.md index 3f6de991b..29745c8d6 100644 --- a/readme.md +++ b/readme.md @@ -1,53 +1,33 @@ -# AvoRed E Commerce is an Laravel Open Source Shopping Cart +# AvoRed E-Commerce -[![Total Downloads](https://poser.pugx.org/avored/framework/downloads)](https://packagist.org/packages/avored/framework) -[![Backers](https://opencollective.com/laravel-ecommerce/backers/badge.svg)](#backers) -[![Sponsors](https://opencollective.com/laravel-ecommerce/sponsors/badge.svg)](#sponsors) +[![GitHub release](https://img.shields.io/github/release/avored/laravel-ecommerce.svg?style=flat-square)](https://github.com/avored/laravel-ecommerce/releases/latest) +[![Total Downloads](https://poser.pugx.org/avored/framework/downloads)](https://packagist.org/packages/avored/framework) +[![Backers](https://opencollective.com/laravel-ecommerce/backers/badge.svg?style=flat-square)](#backers) +[![Sponsors](https://opencollective.com/laravel-ecommerce/sponsors/badge.svg?style=flat-square)](#sponsors) [![](https://img.shields.io/badge/join--slack-avored--ecommerce-c62828.svg?longCache=true&style=for-the-badge&logo=slack&color=#c62828)](https://join.slack.com/t/avored/shared_invite/enQtNDQ1Nzc0MTQ1NjIwLTNiMzIyYzc4M2Y2YWE4YzlhNjM3NzhhN2I0NTAyMzhkNGZmOWUyNjQ1N2U1NGQ3MzIzOGU0MDM0MDM1NTc2MDg) + +[AvoRed](https://www.avored.com/) is a free open-source e-commerce platform written in PHP based on Laravel. +Its an ingenuous and modular e-commerce that is easily customizable according to your needs, with a modern responsive mobile friendly interface as default. +The main advantage of being an modular E-Commerce is you can download a module that is required by your E-Commerce so it is not tightly couple E-Commerce application. -[![](https://img.shields.io/badge/join--slack-avored--ecommerce-c62828.svg?longCache=true&style=for-the-badge&logo=slack&color=#c62828)](https://join.slack.com/t/avored/shared_invite/enQtNDQ1Nzc0MTQ1NjIwLTNiMzIyYzc4M2Y2YWE4YzlhNjM3NzhhN2I0NTAyMzhkNGZmOWUyNjQ1N2U1NGQ3MzIzOGU0MDM0MDM1NTc2MDg) +A working demo can be found [here](http://demo.avored.com/) -[AvoRed Laravel E Commerce Official](https://www.avored.com/) -[Changelog](CHANGELOG.md) -[Demo](http://demo.avored.com/) +## Changelog -### About AvoRed +All notable changes to [AvoRed](https://www.avored.com/) will be documented [here](CHANGELOG.md). -AvoRed is a free open-source e-commerce application development platform written in PHP based on Laravel. Its an ingenuous and modular e-commerce that is easily customizable according to your needs, with a modern responsive mobile friendly interface as default. Main Advantage of being an modular E commerce is you can download a module that is required by your e commerce so it is not tightly couple e commerce application. - -### AvoRed Docs - -To get started with AvoRed Installation Please visit [AvoRed Documentation](https://www.avored.com/docs) - - -##### Available Modules for AvoRed -- [AvoRed Admin](https://github.com/avored/ecommerce) -- [AvoRed Banner Slider](https://github.com/avored/banner) -- [AvoRed Brand](https://github.com/avored/brand) -- [AvoRed Contact](https://github.com/avored/contact) -- [AvoRed Dummy Data](https://github.com/avored/dummy-data) -- [AvoRed Feature Product](https://github.com/avored/feature) -- [AvoRed Related Product](https://github.com/avored/related) -- [AvoRed Product Review](https://github.com/avored/review) -- [AvoRed Subscribe](https://github.com/avored/subscribe) - -##### Payment Gateway -- Stripe -- Pay by Cheque (comming soon) - -##### Shipping Gateway -- Free Shipping -- USPS (comming soon) +## Documentation +Please visit the [AvoRed Documentation](https://www.avored.com/docs) to get started with [AvoRed](https://www.avored.com/). ## Contributing -AvoRed E commerce is in active development and If you want to contribute in this project then simply do the [Pull Request](https://github.com/avored/laravel-ecommerce/pulls)! +[AvoRed](https://www.avored.com/) is in active development, if you want to contribute to this project then simply do a [Pull Request](https://github.com/avored/laravel-ecommerce/pulls)! If you find any bug or problem please submit here [AvoRed Ecommerce Forum](http://avored.website/forum/) or [raise the issue here](https://github.com/avored/laravel-ecommerce/issues/new). ## Contributors -This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md). +[AvoRed](https://www.avored.com/) exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md). contributors ## Backers @@ -58,6 +38,6 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com ## Sponsors -Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/laravel-ecommerce#sponsor)] +Support [AvoRed](https://www.avored.com/) by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/laravel-ecommerce#sponsor)] diff --git a/resources/lang/vendor/self-diagnosis/de/checks.php b/resources/lang/vendor/self-diagnosis/de/checks.php new file mode 100644 index 000000000..4b6be7e34 --- /dev/null +++ b/resources/lang/vendor/self-diagnosis/de/checks.php @@ -0,0 +1,109 @@ + [ + 'message' => 'Der Anwendungsschlüssel ist nicht gesetzt. Nutze "php artisan key:generate", um einen zu erstellen und zu setzen.', + 'name' => 'Anwendungsschlüssel ist gesetzt', + ], + 'composer_with_dev_dependencies_is_up_to_date' => [ + 'message' => 'Die Composer Abhängigkeiten sind nicht aktuell. Nutze "composer install", um diese zu aktualisieren. :more', + 'name' => 'Composer Abhängigkeiten (inkl. dev) sind aktuell', + ], + 'composer_without_dev_dependencies_is_up_to_date' => [ + 'message' => 'Die Composer Abhängigkeiten sind nicht aktuell. Nutze "composer install", um diese zu aktualisieren. :more', + 'name' => 'Composer Abhängigkeiten (ohne dev) sind aktuell', + ], + 'configuration_is_cached' => [ + 'message' => 'Die Konfiguration sollte für bessere Performance gecached sein im Produktivbetrieb. Nutze "php artisan config:cache", um den Konfigurations-Cache zu erstellen.', + 'name' => 'Konfiguration ist gecached', + ], + 'configuration_is_not_cached' => [ + 'message' => 'Die Konfiguration sollte während der Entwicklung nicht gecached sein. Nutze "php artisan config:clear", um den Konfigurations-Cache zu leeren.', + 'name' => 'Konfiguration ist nicht gecached', + ], + 'correct_php_version_is_installed' => [ + 'message' => 'Die benötigte PHP Version ist nicht installiert.' . PHP_EOL . 'Benötigt: :required' . PHP_EOL . 'In Verwendung: :used', + 'name' => 'Die richtige PHP Version ist installiert', + ], + 'database_can_be_accessed' => [ + 'message' => 'Auf die Datenbank kann nicht zugegriffen werden: :error', + 'name' => 'Die Datenbank ist erreichbar', + ], + 'debug_mode_is_not_enabled' => [ + 'message' => 'Der Debugging-Modus sollte im Produktivbetrieb nicht genutzt werden. Setze "APP_DEBUG" in der .env Datei auf "false".', + 'name' => 'Der Debugging-Modus ist deaktiviert', + ], + 'directories_have_correct_permissions' => [ + 'message' => 'Folgende Verzeichnisse sind nicht beschreibbar:' . PHP_EOL .':directories', + 'name' => 'Alle Verzeichnisse haben die richtigen Berechtigungen', + ], + 'env_file_exists' => [ + 'message' => 'Die .env Datei existiert nicht. Bitte kopiere die Datei .env.example zu .env und passe diese entsprechend an.', + 'name' => 'Die Umgebungsvariablendatei existiert', + ], + 'example_environment_variables_are_set' => [ + 'message' => 'Folgende Umgebungsvariablen fehlen im .env Umgebungsfile, sind aber in .env.example definiert:' . PHP_EOL . ':variables', + 'name' => 'Die Beispiel-Umgebungsvariablen sind gesetzt', + ], + 'locales_are_installed' => [ + 'message' => [ + 'cannot_run_on_windows' => 'Dieser Check kann unter Windows nicht ausgeführt werden..', + 'locale_command_not_available' => 'Der Befehl "locale -a" ist auf dem aktuellen System nicht verfügbar.', + 'missing_locales' => 'Folgende Sprachumgebungen (locales) fehlen:' . PHP_EOL . ':locales', + 'shell_exec_not_available' => 'Die Funktion "shell_exec" ist entweder nicht definiert oder deaktiviert, daher können die Sprachumgebungen nicht abgefragt werden.', + ], + 'name' => 'Benötigte Sprachumgebungen sind installiert', + ], + 'maintenance_mode_not_enabled' => [ + 'message' => 'Der Wartungsmodus ist noch aktiv. Deaktiviere ihn mit "php artisan up".', + 'name' => 'Wartungsmodus ist nicht aktiv', + ], + 'migrations_are_up_to_date' => [ + 'message' => [ + 'need_to_migrate' => 'Die Datenbank muss aktualisiert werden. Nutze "php artisan migrate", um die Migrationen einzuspielen.', + 'unable_to_check' => 'Die Migrationen konnten nicht geprüft werden: :reason', + ], + 'name' => 'Die Migrationen sind aktuell', + ], + 'php_extensions_are_disabled' => [ + 'message' => 'Die folgenden Erweiterungen sind noch immer aktiviert:' . PHP_EOL . ':extensions', + 'name' => 'Unerwünschte PHP Erweiterungen sind deaktiviert', + ], + 'php_extensions_are_installed' => [ + 'message' => 'Die folgenden Erweiterungen fehlen:' . PHP_EOL . ':extensions', + 'name' => 'Die benötigten PHP Erweiterungen sind installiert', + ], + 'redis_can_be_accessed' => [ + 'message' => [ + 'not_accessible' => 'Auf den Redis Cache kann nicht zugegriffen werden: :error', + 'default_cache' => 'Der Standard-Cache ist nicht erreichbar.', + 'named_cache' => 'Der Cache :name ist nicht erreichbar.', + ], + 'name' => 'Der Redis Cache ist erreichbar', + ], + 'routes_are_cached' => [ + 'message' => 'Die Routen sollten für bessere Performance gecached sein im Produktivbetrieb. Nutze "php artisan route:cache", um den Routen-Cache zu erstellen.', + 'name' => 'Routen sind gecached', + ], + 'routes_are_not_cached' => [ + 'message' => 'Die Routen sollten während der Entwicklung nicht gecached sein. Nutze "php artisan route:clear", um den Routen-Cache zu leeren.', + 'name' => 'Routen sind nicht gecached', + ], + 'servers_are_pingable' => [ + 'message' => "Der Server ':host' (Port: :port) ist nicht erreichbar (Timeout nach :timeout Sekunden).", + 'name' => 'Benötigte Server sind pingbar', + ], + 'storage_directory_is_linked' => [ + 'message' => 'Das Speicherverzeichnis ist nicht verlinkt. Nutze "php artisan storage:link", um eine symbolische Verknüpfung zu erstellen.', + 'name' => 'Das Speicherverzeichnis ist verlinkt', + ], + 'supervisor_programs_are_running' => [ + 'message' => [ + 'cannot_run_on_windows' => 'Dieser Check kann unter Windows nicht ausgeführt werden..', + 'not_running_programs' => 'Die folgenden Programme laufen nicht oder benötigen einen Neustart:' . PHP_EOL . ':programs', + 'shell_exec_not_available' => 'Die Funktion "shell_exec" ist entweder nicht definiert oder deaktiviert, daher können die laufenden Programme nicht abgefragt werden.', + 'supervisor_command_not_available' => 'Der Befehl "supervisorctl" ist auf dem aktuellen System nicht verfügbar.', + ], + 'name' => 'Alle supervisor Programme sind in Betrieb', + ], +]; diff --git a/resources/lang/vendor/self-diagnosis/de/commands.php b/resources/lang/vendor/self-diagnosis/de/commands.php new file mode 100644 index 000000000..307b324dd --- /dev/null +++ b/resources/lang/vendor/self-diagnosis/de/commands.php @@ -0,0 +1,11 @@ + [ + 'common_checks' => 'Allgemeine Überprüfungen', + 'environment_specific_checks' => 'Umgebungsspezifische Überprüfungen (:environment)', + 'failed_checks' => 'Folgende Überprüfungen sind fehlgeschlagen:', + 'running_check' => 'Überprüfung :current/:max: :name... ', + 'success' => 'Gute Arbeit, sieht so aus, als wäre alles richtig eingestellt!', + ], +]; diff --git a/resources/lang/vendor/self-diagnosis/en/checks.php b/resources/lang/vendor/self-diagnosis/en/checks.php new file mode 100644 index 000000000..2915a13d0 --- /dev/null +++ b/resources/lang/vendor/self-diagnosis/en/checks.php @@ -0,0 +1,113 @@ + [ + 'message' => 'The application key is not set. Call "php artisan key:generate" to create and set one.', + 'name' => 'App key is set', + ], + 'composer_with_dev_dependencies_is_up_to_date' => [ + 'message' => 'Your composer dependencies are not up to date. Call "composer install" to update them. :more', + 'name' => 'Composer dependencies (including dev) are up to date', + ], + 'composer_without_dev_dependencies_is_up_to_date' => [ + 'message' => 'Your composer dependencies are not up to date. Call "composer install" to update them. :more', + 'name' => 'Composer dependencies (without dev) are up to date', + ], + 'configuration_is_cached' => [ + 'message' => 'Your configuration should be cached in production for better performance. Call "php artisan config:cache" to create the configuration cache.', + 'name' => 'Configuration is cached', + ], + 'configuration_is_not_cached' => [ + 'message' => 'Your configuration files should not be cached during development. Call "php artisan config:clear" to clear the configuration cache.', + 'name' => 'Configuration is not cached', + ], + 'correct_php_version_is_installed' => [ + 'message' => 'You do not have the required PHP version installed.' . PHP_EOL . 'Required: :required' . PHP_EOL . 'Used: :used', + 'name' => 'The correct PHP version is installed', + ], + 'database_can_be_accessed' => [ + 'message' => 'The database can not be accessed: :error', + 'name' => 'The database can be accessed', + ], + 'debug_mode_is_not_enabled' => [ + 'message' => 'You should not use debug mode in production. Set "APP_DEBUG" in the .env file to "false".', + 'name' => 'Debug mode is not enabled', + ], + 'directories_have_correct_permissions' => [ + 'message' => 'The following directories are not writable:' . PHP_EOL .':directories', + 'name' => 'All directories have the correct permissions', + ], + 'env_file_exists' => [ + 'message' => 'The .env file does not exist. Please copy your .env.example file as .env and adjust accordingly.', + 'name' => 'The environment file exists', + ], + 'example_environment_variables_are_set' => [ + 'message' => 'These environment variables are missing in your .env file, but are defined in your .env.example:' . PHP_EOL . ':variables', + 'name' => 'The example environment variables are set', + ], + 'example_environment_variables_are_up_to_date' => [ + 'message' => 'These environment variables are defined in your .env file, but are missing in your .env.example:' . PHP_EOL . ':variables', + 'name' => 'The example environment variables are up-to-date', + ], + 'locales_are_installed' => [ + 'message' => [ + 'cannot_run_on_windows' => 'This check cannot be run on Windows.', + 'locale_command_not_available' => 'The "locale -a" command is not available on the current OS.', + 'missing_locales' => 'The following locales are missing:' . PHP_EOL . ':locales', + 'shell_exec_not_available' => 'The function "shell_exec" is not defined or disabled, so we cannot check the locales.', + ], + 'name' => 'Required locales are installed', + ], + 'maintenance_mode_not_enabled' => [ + 'message' => 'Maintenance mode is still enabled. Disable it with "php artisan up".', + 'name' => 'Maintenance mode is not enabled', + ], + 'migrations_are_up_to_date' => [ + 'message' => [ + 'need_to_migrate' => 'You need to update your database. Call "php artisan migrate" to run migrations.', + 'unable_to_check' => 'Unable to check for migrations: :reason', + ], + 'name' => 'The migrations are up to date', + ], + 'php_extensions_are_disabled' => [ + 'message' => 'The following extensions are still enabled:' . PHP_EOL . ':extensions', + 'name' => 'Unwanted PHP extensions are disabled', + ], + 'php_extensions_are_installed' => [ + 'message' => 'The following extensions are missing:' . PHP_EOL . ':extensions', + 'name' => 'The required PHP extensions are installed', + ], + 'redis_can_be_accessed' => [ + 'message' => [ + 'not_accessible' => 'The Redis cache can not be accessed: :error', + 'default_cache' => 'The default cache is not reachable.', + 'named_cache' => 'The named cache :name is not reachable.', + ], + 'name' => 'The Redis cache can be accessed', + ], + 'routes_are_cached' => [ + 'message' => 'Your routes should be cached in production for better performance. Call "php artisan route:cache" to create the route cache.', + 'name' => 'Routes are cached', + ], + 'routes_are_not_cached' => [ + 'message' => 'Your routes should not be cached during development. Call "php artisan route:clear" to clear the route cache.', + 'name' => 'Routes are not cached', + ], + 'servers_are_pingable' => [ + 'message' => "The server ':host' (port: :port) is not reachable (timeout after :timeout seconds).", + 'name' => 'Required servers are pingable', + ], + 'storage_directory_is_linked' => [ + 'message' => 'The storage directory is not linked. Use "php artisan storage:link" to create a symbolic link.', + 'name' => 'The storage directory is linked', + ], + 'supervisor_programs_are_running' => [ + 'message' => [ + 'cannot_run_on_windows' => 'This check cannot be run on Windows.', + 'not_running_programs' => 'The following programs are not running or require a restart:' . PHP_EOL . ':programs', + 'shell_exec_not_available' => 'The function "shell_exec" is not defined or disabled, so we cannot check the running programs.', + 'supervisor_command_not_available' => 'The "supervisorctl" command is not available on the current OS.', + ], + 'name' => 'All supervisor programs are running', + ], +]; diff --git a/resources/lang/vendor/self-diagnosis/en/commands.php b/resources/lang/vendor/self-diagnosis/en/commands.php new file mode 100644 index 000000000..c999d9cb5 --- /dev/null +++ b/resources/lang/vendor/self-diagnosis/en/commands.php @@ -0,0 +1,11 @@ + [ + 'common_checks' => 'Common Checks', + 'environment_specific_checks' => 'Environment Specific Checks (:environment)', + 'failed_checks' => 'The following checks failed:', + 'running_check' => 'Running check :current/:max: :name... ', + 'success' => 'Good job, looks like you are all set up!', + ], +]; diff --git a/themes/avored/default/views/cart/view.blade.php b/themes/avored/default/views/cart/view.blade.php index 60b72e121..074507a30 100644 --- a/themes/avored/default/views/cart/view.blade.php +++ b/themes/avored/default/views/cart/view.blade.php @@ -43,7 +43,7 @@
- ${{ number_format((Cart::taxTotal()),2) }} + {{ Session::get('currency_code') . number_format((Cart::taxTotal()), 2) }}
@@ -59,7 +59,7 @@
- ${{ number_format((Cart::total()),2) }} + {{ Session::get('currency_code') . number_format((Cart::total()), 2) }}
@@ -76,7 +76,7 @@ - Checkout + Checkout @@ -90,4 +90,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/themes/avored/default/views/checkout/cards/shopping-cart.blade.php b/themes/avored/default/views/checkout/cards/shopping-cart.blade.php index 2a97f1920..36c920d1a 100644 --- a/themes/avored/default/views/checkout/cards/shopping-cart.blade.php +++ b/themes/avored/default/views/checkout/cards/shopping-cart.blade.php @@ -34,7 +34,7 @@ @endif @endforeach -

Attributes: +

Attributes: {{ $attributeText}} @@ -45,10 +45,10 @@ {{ $cartItem->qty() }} - ${{ $cartItem->priceFormat() }} + {{ Session::get('currency_code') . $cartItem->priceFormat() }} - ${{ $cartItem->lineTotal() }} + {{ Session::get('currency_code') . $cartItem->lineTotal() }} @@ -56,27 +56,27 @@ $subTotal = $total = 0; $subTotal += $cartItem->price(); @endphp - + @endforeach Sub-Total: - - ${{ number_format(Cart::total(),2) }} + + {{ Session::get('currency_code') . number_format(Cart::total(), 2) }} Shipping Option - $ + {{ Session::get('currency_code') }} Total: - - ${{ number_format(Cart::total(),2) }} + + {{ Session::get('currency_code') . number_format(Cart::total(), 2) }} diff --git a/themes/avored/default/views/product/view.blade.php b/themes/avored/default/views/product/view.blade.php index dc4a7025e..22db7e254 100644 --- a/themes/avored/default/views/product/view.blade.php +++ b/themes/avored/default/views/product/view.blade.php @@ -18,7 +18,7 @@

{{ $product->name }}

- $ + {{ Session::get('currency_code') }} {{ number_format($product->price,2) }}
@@ -56,8 +56,8 @@
  • Reviews -
    • - + + @foreach(Tabs::all('product-view') as $key => $tab)
  • {{ $tab->label }} @@ -68,7 +68,7 @@

    {!! $product->description !!}

    -
    +

    @include("avored-review::product.review")

    @@ -76,11 +76,11 @@ @foreach(Tabs::all('product-view') as $key => $tab) @include($tab->view) - @endforeach + @endforeach
    - +
    • @endsection diff --git a/themes/avored/default/views/product/view/product-card.blade.php b/themes/avored/default/views/product/view/product-card.blade.php index a16061371..25f6b0b0f 100644 --- a/themes/avored/default/views/product/view/product-card.blade.php +++ b/themes/avored/default/views/product/view/product-card.blade.php @@ -14,7 +14,7 @@

    - $ {{ number_format($product->price,2) }} + {{ Session::get('currency_code') }} {{ number_format($product->price,2) }}

    diff --git a/themes/avored/default/views/product/view/type/variation-add-to-cart.blade.php b/themes/avored/default/views/product/view/type/variation-add-to-cart.blade.php index a9f090b2c..0a96034d2 100644 --- a/themes/avored/default/views/product/view/type/variation-add-to-cart.blade.php +++ b/themes/avored/default/views/product/view/type/variation-add-to-cart.blade.php @@ -14,7 +14,6 @@ attribute; - //$attributeValueList = $product->getCombinationAttributeValueList(); ?> @foreach($attributes as $attribute)