Merge pull request #1542 from abantecart/1.3.3

1.3.3

Author: abantecart

.gitignore

@@ -16,3 +16,6 @@
 /public_html/system/logs/*
 /public_html/system/config.php
 /public_html/image/thumbnails/*
+/public_html/system/page_builder/*
+/public_html/system/page_builder/default/*
+/public_html/system/page_builder/default/base.html

docker/Dockerfile

@@ -1,27 +1,35 @@
-FROM php:7.2-fpm-stretch
-MAINTAINER Dvagner <help@abantecart.com>
+FROM php:7.4-fpm
+LABEL maintainer="Denis Vagner <help@abantecart.com>"
 
 RUN apt-get update && apt-get install -y \
     curl \
     wget \
     git \
+    libwebp-dev \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
     libmcrypt-dev \
     libpng-dev \
+    libxpm-dev \
+    libonig-dev \
+    libzip-dev \
     nginx \
-    mysql-server \
+    mariadb-server \
     mc \
-    net-tools \
-    && docker-php-ext-install -j$(nproc) iconv mbstring mysqli pdo_mysql zip \
-    && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
-    && docker-php-ext-install -j$(nproc) gd
-
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+    net-tools  \
+    libxml2-dev && \
+    docker-php-ext-install -j$(nproc) iconv mbstring mysqli pdo_mysql zip soap && \
+    docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \
+    docker-php-ext-install -j$(nproc) gd && \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer 
 
 ADD default /etc/nginx/sites-available/
 
-RUN service mysql start; mysql -u root -e "CREATE USER 'admin'@'%' IDENTIFIED BY 'pass';";mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'admin'@'%' WITH GRANT OPTION;";mysql -u root -e "create database abantecart;";
+RUN service mariadb start; \
+    mysql -u root -e "CREATE USER 'admin'@'%' IDENTIFIED BY 'pass';"; \
+    mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'admin'@'%' WITH GRANT OPTION;"; \
+    mysql -u root -e "create database abantecart;";
+
 RUN sed -i 's/bind-address/#bind-address/' /etc/mysql/my.cnf
 
 ADD php.ini /usr/local/etc/php/conf.d/40-custom.ini
@@ -30,10 +38,10 @@ RUN git clone https://github.com/abantecart/abantecart-src.git /var/www/abanteca
 RUN chown -R www-data:www-data /var/www/abantecart
 WORKDIR /var/www/abantecart/public_html/
 
-RUN  service mysql start && /usr/local/bin/php ./install/cli_install.php install --db_host=127.0.0.1 --db_user=admin --db_password=pass --db_name=abantecart  --db_driver=amysqli  --db_prefix=abc_ --admin_path=admin  --username=admin  --password=admin  --email=admin@admin.com  --http_server=http://localhost --with-sample-data
+RUN  service mariadb start && /usr/local/bin/php ./install/cli_install.php install --db_host=127.0.0.1 --db_user=admin --db_password=pass --db_name=abantecart  --db_driver=amysqli  --db_prefix=abc_ --admin_path=admin  --username=admin  --password=admin  --email=admin@admin.com  --http_server=http://localhost --with-sample-data
 
 RUN apt-get clean
 
 EXPOSE 80 3306
 
-ENTRYPOINT service mysql start && service nginx start && php-fpm
+ENTRYPOINT service mariadb start && service nginx start && php-fpm

docker/README.MD

@@ -0,0 +1,13 @@
+## Update docker image in DockerHub https://hub.docker.com/r/abantecart/abantecart
+
+### 1. Build Docker image 
+```#  docker build -t abantecart .```
+
+### 2. Tag Docker image
+```# docker tag abantecart:latest abantecart/abantecart:latest```
+
+### 3. Login Docker Hub
+```# docker login --username .......```
+
+### 4. Push Docker image to AWS ECR
+```# docker push abantecart/abantecart:latest```

public_html/admin/controller/common/footer.php

@@ -55,7 +55,6 @@ public function main()
             $this->view->assign('home', $this->html->getSecureURL('index/login', '', true));
         } else {
             $this->view->assign('logged', sprintf($this->language->get('text_logged'), $this->user->getUserName()));
-            $this->view->assign('avatar', $this->user->getAvatar());
             $this->view->assign('username', $this->user->getUserName());
             if ($this->user->getLastLogin()) {
                 $this->view->assign(

public_html/admin/controller/common/header.php

@@ -97,7 +97,6 @@ public function main()
         } else {
             $this->data['home'] = $this->html->getSecureURL('index/home', '', true);
             $this->data['logged'] = sprintf($this->language->get('text_logged'), $this->user->getUserName());
-            $this->data['avatar'] = $this->user->getAvatar();
             $this->data['username'] = $this->user->getUserName();
             if ($this->user->getLastLogin()) {
                 $this->data['last_login'] = sprintf(