Skip to content

Commit 3492afe

Browse files
ghermansghermans
authored
Merge pull request #253 from avored/dev
2.9.5.7
2 parents f7167a1 + dd7d919 commit 3492afe

File tree

16 files changed

+499
-87
lines changed

16 files changed

+499
-87
lines changed

‎.env.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
APP_NAME=AvoRed
2-
APP_ENV=false
2+
APP_ENV=development
33
APP_KEY=
44
APP_DEBUG=true
55
APP_LOG_LEVEL=debug

‎CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## 2.9.5.7
5+
6+
### Added
7+
- Added Github release badge to the readme.
8+
- 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.
9+
- Added another database table field for properties table: is_visible_frontend.
10+
- Remove hard coded currency code.
11+
- 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.
12+
13+
### Fixed
14+
Updated Dockerfile to use Ubuntu 18.04 and PHP7.2.
15+
16+
## 2.9.5.6
17+
18+
### Fixed
19+
- Fixed backend theme
20+
421
## 2.9.5
522
### Added
623

‎Dockerfile

+25-23
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,41 @@
1-
FROM indpurvesh/laravel-ecommerce
1+
FROM ubuntu:18.04
22
MAINTAINER purvesh <[email protected]>
33

4-
5-
RUN apt-get update && apt-get install -y \
4+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
65
apache2-bin \
7-
libapache2-mod-php5 \
8-
php5-curl \
9-
php5-ldap \
10-
php5-sqlite \
11-
php5-mysql \
12-
php5-mcrypt \
13-
php5-gd \
14-
patch \
6+
libapache2-mod-php \
7+
php-ctype \
8+
php-curl \
9+
php-gd \
10+
php-json \
11+
php-ldap \
12+
php-mbstring \
13+
php-mysql \
14+
php-sqlite3 \
15+
php-tokenizer \
16+
php-xml \
1517
curl \
16-
nano \
17-
vim \
1818
git \
19-
mysql-client
20-
21-
22-
23-
RUN rm /etc/apache2/sites-available/000-default.conf
24-
25-
ADD 000-default.conf /etc/apache2/sites-available/
26-
27-
RUN service apache2 start
19+
mysql-client \
20+
nano \
21+
patch \
22+
unzip \
23+
vim
2824

2925
RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer
3026

31-
Run rm -rf /var/www/laravel
27+
RUN rm -rf /var/www/laravel
3228

3329
RUN composer create-project avored/laravel-ecommerce /var/www/laravel
3430

3531
RUN /bin/chown www-data:www-data -R /var/www/laravel/storage
3632

33+
ADD 000-default.conf /etc/apache2/sites-available/
34+
35+
RUN a2enmod rewrite
36+
37+
RUN service apache2 start
38+
3739
EXPOSE 80
3840

3941
CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

‎composer.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"type" : "project",
1717
"require" : {
1818
"php": ">=7.1.3",
19-
"avored/module-installer": "1.*",
2019
"avored/dummy-data": "~2.0",
20+
"avored/framework": "~2.3",
21+
"avored/module-installer": "1.*",
2122
"fabpot/goutte": "^3.2",
22-
"fideloper/proxy": "~4.0",
23-
"avored/framework": "~2.3"
23+
"fideloper/proxy": "~4.0"
2424
},
2525
"require-dev" : {
2626
"filp/whoops": "~2.0",
@@ -48,7 +48,10 @@
4848
},
4949
"scripts" : {
5050
"post-root-package-install" : "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
51-
"post-create-project-cmd" : "@php artisan key:generate",
51+
"post-create-project-cmd" : [
52+
"@php artisan key:generate",
53+
"@php artisan self-diagnosis"
54+
],
5255
"post-autoload-dump" : [
5356
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
5457
"@php artisan package:discover"

‎config/self-diagnosis.php

+95
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<?php
2+
3+
return [
4+
5+
/*
6+
* A list of environment aliases mapped to the actual environment configuration.
7+
*/
8+
'environment_aliases' => [
9+
'prod' => 'production',
10+
'live' => 'production',
11+
'local' => 'development',
12+
],
13+
14+
/*
15+
* Common checks that will be performed on all environments.
16+
*/
17+
'checks' => [
18+
\BeyondCode\SelfDiagnosis\Checks\AppKeyIsSet::class,
19+
\BeyondCode\SelfDiagnosis\Checks\CorrectPhpVersionIsInstalled::class,
20+
\BeyondCode\SelfDiagnosis\Checks\DatabaseCanBeAccessed::class => [
21+
'default_connection' => true,
22+
'connections' => [],
23+
],
24+
\BeyondCode\SelfDiagnosis\Checks\DirectoriesHaveCorrectPermissions::class => [
25+
'directories' => [
26+
storage_path(),
27+
base_path('bootstrap/cache'),
28+
],
29+
],
30+
\BeyondCode\SelfDiagnosis\Checks\EnvFileExists::class,
31+
\BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreSet::class,
32+
\BeyondCode\SelfDiagnosis\Checks\LocalesAreInstalled::class => [
33+
'required_locales' => [
34+
'en_US'
35+
],
36+
],
37+
\BeyondCode\SelfDiagnosis\Checks\MaintenanceModeNotEnabled::class,
38+
//\BeyondCode\SelfDiagnosis\Checks\MigrationsAreUpToDate::class,
39+
\BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreInstalled::class => [
40+
'extensions' => [
41+
'openssl',
42+
'PDO',
43+
'mbstring',
44+
'tokenizer',
45+
'xml',
46+
'ctype',
47+
'json',
48+
],
49+
'include_composer_extensions' => true,
50+
],
51+
//\BeyondCode\SelfDiagnosis\Checks\RedisCanBeAccessed::class => [
52+
// 'default_connection' => true,
53+
// 'connections' => [],
54+
//],
55+
\BeyondCode\SelfDiagnosis\Checks\StorageDirectoryIsLinked::class,
56+
],
57+
58+
/*
59+
* Environment specific checks that will only be performed for the corresponding environment.
60+
*/
61+
'environment_checks' => [
62+
'development' => [
63+
\BeyondCode\SelfDiagnosis\Checks\ComposerWithDevDependenciesIsUpToDate::class,
64+
\BeyondCode\SelfDiagnosis\Checks\ConfigurationIsNotCached::class,
65+
\BeyondCode\SelfDiagnosis\Checks\RoutesAreNotCached::class,
66+
\BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreUpToDate::class,
67+
],
68+
'production' => [
69+
\BeyondCode\SelfDiagnosis\Checks\ComposerWithoutDevDependenciesIsUpToDate::class,
70+
\BeyondCode\SelfDiagnosis\Checks\ConfigurationIsCached::class,
71+
\BeyondCode\SelfDiagnosis\Checks\DebugModeIsNotEnabled::class,
72+
\BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreDisabled::class => [
73+
'extensions' => [
74+
'xdebug',
75+
],
76+
],
77+
\BeyondCode\SelfDiagnosis\Checks\RoutesAreCached::class,
78+
//\BeyondCode\SelfDiagnosis\Checks\ServersArePingable::class => [
79+
// 'servers' => [
80+
// 'www.google.com',
81+
// ['host' => 'www.google.com', 'port' => 8080],
82+
// '8.8.8.8',
83+
// ['host' => '8.8.8.8', 'port' => 8080, 'timeout' => 5],
84+
// ],
85+
//],
86+
//\BeyondCode\SelfDiagnosis\Checks\SupervisorProgramsAreRunning::class => [
87+
// 'programs' => [
88+
// 'horizon',
89+
// ],
90+
// 'restarted_within' => 300,
91+
//],
92+
],
93+
],
94+
95+
];

‎public/vendor/avored-default/sass/partials/_badges.scss

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
.badge {
2+
font-weight:400;
3+
padding:4px 8px;
4+
text-transform:uppercase;
5+
border:1px solid;
6+
}
7+
8+
.badge .badge-icon {
9+
padding:0.4em 0.55em;
10+
}
11+
.badge .badge-icon i {
12+
font-size:0.8em;
13+
}
14+
.badge .badge-default {
15+
background:transparent;
16+
border-color:#9A9A9A;
17+
color:#9A9A9A;
18+
}
19+
.badge .badge-default .fill {
20+
background:#9A9A9A;
21+
color:#fff;
22+
}
23+
.badge .badge-primary {
24+
background:transparent;
25+
border-color:#49c5b6;
26+
color:#49c5b6;
27+
}
28+
.badge .badge-primary.fill {
29+
background:#49c5b6;
30+
color:#fff;
31+
}
32+
.badge .badge-info {
33+
background:transparent;
34+
border-color:#3C89DA;
35+
color:#3C89DA;
36+
}
37+
.badge .badge-info.fill {
38+
background:#3C89DA;
39+
color:#fff;
40+
}
41+
.badge .badge-success {
42+
background:transparent;
43+
border-color:#22af46;
44+
color:#22af46;
45+
}
46+
.badge .badge-success.fill {
47+
background:#22af46;
48+
color:#fff;
49+
}
50+
.badge .badge-warning {
51+
background:transparent;
52+
border-color:#f3ad06;
53+
color:#f3ad06;
54+
}
55+
.badge .badge-warning .fill {
56+
background:#f3ad06;
57+
color:#fff;
58+
}
59+
.badge .badge-danger {
60+
background:transparent;
61+
border-color:#de4848;
62+
color:#de4848;
63+
}
64+
.badge .badge-danger .fill {
65+
background:#de4848;
66+
color:#fff;
67+
}
68+
.badge .round {
69+
-webkit-border-radius:30px;
70+
-moz-border-radius:30px;
71+
border-radius:30px
72+
}

‎readme.md

+17-37
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,33 @@
1-
# AvoRed E Commerce is an Laravel Open Source Shopping Cart
1+
# AvoRed E-Commerce
22

3-
[![Total Downloads](https://poser.pugx.org/avored/framework/downloads)](https://packagist.org/packages/avored/framework)
4-
[![Backers](https://opencollective.com/laravel-ecommerce/backers/badge.svg)](#backers)
5-
[![Sponsors](https://opencollective.com/laravel-ecommerce/sponsors/badge.svg)](#sponsors)
3+
[![GitHub release](https://img.shields.io/github/release/avored/laravel-ecommerce.svg?style=flat-square)](https://github.com/avored/laravel-ecommerce/releases/latest)
4+
[![Total Downloads](https://poser.pugx.org/avored/framework/downloads)](https://packagist.org/packages/avored/framework)
5+
[![Backers](https://opencollective.com/laravel-ecommerce/backers/badge.svg?style=flat-square)](#backers)
6+
[![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)
7+
8+
[AvoRed](https://www.avored.com/) is a free open-source e-commerce platform written in PHP based on Laravel.
9+
Its an ingenuous and modular e-commerce that is easily customizable according to your needs, with a modern responsive mobile friendly interface as default.
10+
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.
611

7-
[![](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)
12+
A working demo can be found [here](http://demo.avored.com/)
813

9-
[AvoRed Laravel E Commerce Official](https://www.avored.com/)
10-
[Changelog](CHANGELOG.md)
11-
[Demo](http://demo.avored.com/)
14+
## Changelog
1215

13-
### About AvoRed
16+
All notable changes to [AvoRed](https://www.avored.com/) will be documented [here](CHANGELOG.md).
1417

15-
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.
16-
17-
### AvoRed Docs
18-
19-
To get started with AvoRed Installation Please visit [AvoRed Documentation](https://www.avored.com/docs)
20-
21-
22-
##### Available Modules for AvoRed
23-
- [AvoRed Admin](https://github.com/avored/ecommerce)
24-
- [AvoRed Banner Slider](https://github.com/avored/banner)
25-
- [AvoRed Brand](https://github.com/avored/brand)
26-
- [AvoRed Contact](https://github.com/avored/contact)
27-
- [AvoRed Dummy Data](https://github.com/avored/dummy-data)
28-
- [AvoRed Feature Product](https://github.com/avored/feature)
29-
- [AvoRed Related Product](https://github.com/avored/related)
30-
- [AvoRed Product Review](https://github.com/avored/review)
31-
- [AvoRed Subscribe](https://github.com/avored/subscribe)
32-
33-
##### Payment Gateway
34-
- Stripe
35-
- Pay by Cheque (comming soon)
36-
37-
##### Shipping Gateway
38-
- Free Shipping
39-
- USPS (comming soon)
18+
## Documentation
4019

20+
Please visit the [AvoRed Documentation](https://www.avored.com/docs) to get started with [AvoRed](https://www.avored.com/).
4121

4222
## Contributing
4323

44-
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)!
24+
[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)!
4525

4626
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).
4727

4828
## Contributors
4929

50-
This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
30+
[AvoRed](https://www.avored.com/) exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
5131
<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>
5232

5333
## Backers
@@ -58,6 +38,6 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
5838

5939
## Sponsors
6040

61-
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)]
41+
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)]
6242

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

0 commit comments

Comments
 (0)