Merge master into upgrade branch

.config/psysh/psysh_history

@@ -0,0 +1,62 @@
+_HiStOrY_V2_
+require('./generate_monthly_invoice.php_old');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');
+require('./generate_monthly_invoice.php');

.lesshst

@@ -0,0 +1 @@
+.less-history-file:

app/.env.docker

@@ -0,0 +1,33 @@
+APP_ENV=local
+APP_DEBUG=false
+APP_USE_SSL=0
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.sendgrid.net
+MAIL_PORT=587
+MAIL_USERNAME=apikey
+MAIL_PASSWORD=YOUR-API-KEY
+MAIL_ENCRYPTION=tls
+MAIL_FROM_NAME="Service Emails"
+MAIL_FROM_ADDRESS=emails@lineblocs.com
+
+API_STANDARDS_TREE=vnd
+API_SUBTYPE=oneline_backend
+API_PREFIX=api
+API_VERSION=v1
+API_NAME="Oneline Backend"
+API_CONDITIONAL_REQUEST=false
+API_DEFAULT_FORMAT=json
+API_DEBUG=true
+API_VERSION=v1
+JWT_TTL=null
+AWS_ACCESS_KEY=AWS-KEY
+AWS_SECRET_KEY=AWS-SECRET
+AWS_REGION=ca-central-1
+AWS_BUCKET=lineblocs
+AWS_SESSION_TOKEN=
+SENTRY_LARAVEL_DSN=https://a930fd30e53d48bbb1dcf41bb9d47ff0@o405396.ingest.sentry.io/5270934

app/.gitignore

@@ -1,7 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
-/public/recordings
+/public/recordings/*
 /public/documents
 /public/files
 /public/fs

app/Dockerfile

@@ -1,26 +1,36 @@
-FROM php:7.3.0-apache
+FROM php:7.4.0-apache
 SHELL ["/bin/bash", "-c"]
 
 # Set working directory
 WORKDIR /var/www/html
 
+# TODO: this is a temporary fix. 
+# in the future, upgrade to use later verison of PHP instead (possibly PHP 8)
+#RUN echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list
+
 # Install dependencies
 RUN apt-get update && apt-get install -y \
     build-essential \
+    libcurl3-gnutls \
+    libx11-6 \
+    libpng16-16 \
+    libjpeg62-turbo \
+    curl \
     libzip-dev \
     libpng-dev \
     libjpeg62-turbo-dev \
+    libfreetype6 \
     libfreetype6-dev \
     locales \
     zip \
     jpegoptim optipng pngquant gifsicle \
-    vim \
     unzip \
     git \
-    curl
-RUN apt-get install -y libmcrypt-dev && \
-    pecl install mcrypt-1.0.2 && \
-    docker-php-ext-enable mcrypt
+    libonig-dev
+
+#RUN apt-get install -y libmcrypt-dev && \
+#    pecl install mcrypt-1.0.2 && \
+#    docker-php-ext-enable mcrypt
 
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -35,7 +45,7 @@ RUN rm -rf /etc/apt/preferences.d/no-debian-php \
 
 # Install extensions
 RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl
-RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
+#RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
 RUN docker-php-ext-install gd
 RUN docker-php-ext-install mysqli
 RUN docker-php-ext-install bcmath
@@ -64,7 +74,25 @@ COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
 
 # copy php.ini
 RUN mv php.ini "$PHP_INI_DIR/php.ini"
-RUN mv .env.cop .env
+RUN mv .env.docker .env
+
+#prepare set up .env from docker-compose enviroment
+ARG DB_HOST_ARG=127.0.0.1
+ARG DB_USERNAME_ARG=root_lineblocs
+ARG DB_PASSWORD_ARG=101010
+ARG DB_DATABASE_ARG=lineblocs
+ARG DB_PORT_ARG=3306
+ARG DB_OPENSIPS_DATABASE_ARG=opensips
+ARG DEPLOYMENT_DOMAIN_ARG=domain.tld
+
+ENV DB_HOST $DB_HOST_ARG 
+ENV DB_USERNAME  $DB_USERNAME_ARG 
+ENV DB_PASSWORD $DB_PASSWORD_ARG 
+ENV DB_DATABASE $DB_DATABASE_ARG 
+ENV DB_PORT $DB_PORT_ARG 
+ENV DB_OPENSIPS_DATABASE $DB_OPENSIPS_DATABASE_ARG 
+ENV DEPLOYMENT_DOMAIN $DEPLOYMENT_DOMAIN_ARG
+
 
 # Change current user to www
 # Expose port 9000 and start php-fpm server
@@ -76,12 +104,12 @@ RUN mv vendoring vendor
 
 # Copy existing application directory permissions
 #RUN chown -R www-data:www-data /var/www/html
-RUN ./deploy-docker.sh
+RUN ./shell_scripts/deploy-docker.sh
 
 # Change current user to www
 # Expose port 9000 and start php-fpm server
 COPY ports.conf /etc/apache2/ports.conf
-RUN chown -R www-data www-data ./public/assets
+RUN chown -R www-data:www-data ./public/assets
 EXPOSE 8080
 #CMD [ "apache2-foreground" ]
-ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["./shell_scripts/entrypoint.sh"]

app/app/ApiCredential.php

@@ -5,13 +5,50 @@
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\ApiResource;
 use App\Helpers\MainHelper;
+use Exception;
+use Log;
+use Illuminate\Support\Facades\DB;
 
-class ApiCredential extends Model {
+class ApiCredential extends SettingsRecord {
   protected $dates = ['created_at', 'updated_at'];
+  protected $casts = array(
+    "setup_complete" => "boolean"
+  );
 
   protected $guarded  = array('id');
-  public static function getRecord() {
-    return ApiCredential::all()[0];
+  protected $table  = 'api_credentials';
+
+
+  public static function getParameterIfAvailable($param) {
+    try {
+      $record = self::getRecord();
+      return $record->{$param};
+    } catch (Exception $ex) {
+      print("error occured while getting API credential: " .$param);
+    }
+    return "";
+  }
+  public static function getFrontendValuesOnly() {
+    $creds = self::getRecord()->toArray();
+    extract( $creds );
+    $result = compact(
+'google_signin_developer_key',
+'google_signin_client_id',
+'google_signin_app_id',
+'msft_signin_client_id',
+'msft_signin_client_secret',
+'apple_signin_client_id',
+'apple_signin_client_secret',
+'google_analytics_script_tag',
+'matomo_script_tag',
+'stripe_pub_key',
+'cloudflare_site_key',
+    );
+    if ($creds['stripe_mode'] == 'test') {
+      $result['stripe_pub_key'] = $creds['stripe_test_pub_key'];
+    }
+
+    return $result;
   }
 
 }

app/app/ApiCredentialGroup2.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use App\ApiResource;
+use App\Helpers\MainHelper;
+use Exception;
+use Log;
+use Illuminate\Support\Facades\DB;
+
+class ApiCredentialGroup2 extends SettingsRecord {
+  protected $dates = ['created_at', 'updated_at'];
+  protected $casts = array(
+  );
+
+  protected $guarded  = array('id');
+
+  protected $table  = 'api_credentials_group2';
+}
+
+

app/app/ApiCredentialKVStore.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use App\ApiResource;
+use App\Helpers\MainHelper;
+use Exception;
+use Log;
+use Illuminate\Support\Facades\DB;
+
+class ApiCredentialKVStore extends SettingsKVStoreModel {
+  protected $dates = ['created_at', 'updated_at'];
+  protected $casts = array(
+    "setup_complete" => "boolean"
+  );
+
+  protected $guarded  = array('id');
+  protected $table  = 'api_credentials_kv_store';
+
+
+  public static function getParameterIfAvailable($param) {
+    try {
+      DB::connection()->getPdo();
+  } catch (\Exception $e) {
+      echo("Could not connect to the database.  Please check your configuration. error:" . $e );
+      return;
+  }
+    try {
+      $record = self::getRecord();
+      return $record->{$param};
+    } catch (Exception $ex) {
+      print("error occured while getting API credential: " .$param);
+    }
+    return "";
+  }
+  public static function getFrontendValuesOnly() {
+    $record = self::getKVPairs();
+    extract( $record );
+    $creds = compact(
+'google_signin_developer_key',
+'google_signin_client_id',
+'google_signin_app_id',
+'msft_signin_client_id',
+'msft_signin_client_secret',
+'apple_signin_client_id',
+'apple_signin_client_secret',
+'google_analytics_script_tag',
+'matomo_script_tag',
+'stripe_pub_key',
+'cloudflare_site_key'
+    );
+
+    if ($record['stripe_mode'] == 'test') {
+      $creds['stripe_pub_key'] = $record['stripe_test_pub_key'];
+    }
+
+    return $creds;
+  }
+
+}
+
+