Skip to content

Commit

Permalink
Merge pull request #253 from avored/dev
Browse files Browse the repository at this point in the history
2.9.5.7
  • Loading branch information
ghermans authored Oct 9, 2018
2 parents f7167a1 + dd7d919 commit 3492afe
Show file tree
Hide file tree
Showing 16 changed files with 499 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
APP_NAME=AvoRed
APP_ENV=false
APP_ENV=development
APP_KEY=
APP_DEBUG=true
APP_LOG_LEVEL=debug
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
48 changes: 25 additions & 23 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
FROM indpurvesh/laravel-ecommerce
FROM ubuntu:18.04
MAINTAINER purvesh <[email protected]>


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"]
11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
95 changes: 95 additions & 0 deletions config/self-diagnosis.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?php

return [

/*
* A list of environment aliases mapped to the actual environment configuration.
*/
'environment_aliases' => [
'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,
//],
],
],

];
72 changes: 72 additions & 0 deletions public/vendor/avored-default/sass/partials/_badges.scss
Original file line number Diff line number Diff line change
@@ -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
}
54 changes: 17 additions & 37 deletions readme.md
Original file line number Diff line number Diff line change
@@ -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).
<a href="https://github.com/avored/laravel-ecommerce/graphs/contributors"><img src="https://opencollective.com/laravel-ecommerce/contributors.svg?width=890" title="contributors" alt="contributors" /></a>

## Backers
Expand All @@ -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)]

<a href="https://opencollective.com/laravel-ecommerce/sponsor/0/website" target="_blank"><img src="https://opencollective.com/laravel-ecommerce/sponsor/0/avatar.svg"></a>
Loading

0 comments on commit 3492afe

Please sign in to comment.