diff --git a/app/Console/Commands/ExportMigrations.php b/app/Console/Commands/ExportMigrations.php index 8e8f086689..536c23a354 100644 --- a/app/Console/Commands/ExportMigrations.php +++ b/app/Console/Commands/ExportMigrations.php @@ -101,6 +101,7 @@ class ExportMigrations extends Command 'expenses' => $this->getExpenses(), 'tasks' => $this->getTasks(), 'documents' => $this->getDocuments(), + 'ninja_tokens' => $this->getNinjaToken(), ]; $file = storage_path("migrations/{$fileName}.zip"); diff --git a/app/Console/Commands/SyncAccounts.php b/app/Console/Commands/SyncAccounts.php new file mode 100644 index 0000000000..8b163a77c8 --- /dev/null +++ b/app/Console/Commands/SyncAccounts.php @@ -0,0 +1,82 @@ + DB_NINJA_1]); + + $this->updateAccounts(); + + config(['database.default' => DB_NINJA_2]); + + $this->updateAccounts(); + + } + + private function updateAccounts() + { + $data = []; + + $a = Company::whereIn('plan', ['pro', 'enterprise']) + ->with('accounts') + ->cursor()->each(function ($company) use ($data){ + + $accounts = $company->accounts->pluck('account_key'); + + $data[] = [ + 'plan' => $company->plan, + 'plan_term' => $company->plan_term, + 'plan_started' => $company->plan_started, + 'plan_paid' => $company->plan_paid, + 'plan_expires' => $company->plan_expires, + 'num_users' => $company->num_users, + 'accounts' => $accounts + ]; + + }); + + //post DATA + } +} \ No newline at end of file diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 19250788a6..617e3929ab 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -32,6 +32,7 @@ class Kernel extends ConsoleKernel 'App\Console\Commands\CalculatePayouts', 'App\Console\Commands\UpdateKey', 'App\Console\Commands\ExportMigrations', + 'App\Console\Commands\SyncAccounts', ]; /** @@ -55,5 +56,15 @@ class Kernel extends ConsoleKernel ->command('ninja:send-reminders --force') ->sendOutputTo($logFile) ->daily(); + + if(Utils::isNinjaProd()) + { + + $schedule + ->command('ninja:sync-v5') + ->withoutOverlapping() + ->daily(); + + } } } diff --git a/app/Constants.php b/app/Constants.php index 9025bb31fd..cb1b206007 100644 --- a/app/Constants.php +++ b/app/Constants.php @@ -631,6 +631,8 @@ if (! defined('APP_NAME')) { define('INVOICE_FIELDS_PRODUCT', 'product_fields'); define('INVOICE_FIELDS_TASK', 'task_fields'); + define('NINJA_V5_TOKEN', env('NINJA_V5_TOKEN',false)); + $creditCards = [ 1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'], 2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'], diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index 84e74b1d01..df4bb05162 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -245,9 +245,35 @@ info("get company"); 'schedule_reminder3' => $this->buildReminderString($this->account->direction_reminder3, $this->account->field_reminder3), 'endless_reminder_frequency_id' => $this->account->account_email_settings->reset_counter_frequency_id ? $this->transformFrequencyId($this->account->account_email_settings->reset_counter_frequency_id) : 0, 'email_signature' => $this->account->email_footer ?: '', + 'email_style' => $this->getEmailStyle($this->account->email_design_id), + 'custom_message_dashboard' => $this->account->customMessage('dashboard'), + 'custom_message_unpaid_invoice' => $this->account->customMessage('unpaid_invoice'), + 'custom_message_paid_invoice' => $this->account->customMessage('paid_invoice'), + 'custom_message_unapproved_quote' => $this->account->customMessage('unapproved_quote'), ]; } + private function getEmailStyle($id){ + + switch ($id) { + case 1: + return 'plain'; + break; + case 2: + return 'light'; + break; + case 3: + return 'dark'; + break; + + default: + return 'light'; + + break; + } + + } + private function buildReminderString($direction, $field) { diff --git a/public/images/btn_facebook_signin.png b/public/images/btn_facebook_signin.png new file mode 100644 index 0000000000..aa4f62348c Binary files /dev/null and b/public/images/btn_facebook_signin.png differ diff --git a/public/images/btn_github_signin.png b/public/images/btn_github_signin.png new file mode 100644 index 0000000000..007be18580 Binary files /dev/null and b/public/images/btn_github_signin.png differ diff --git a/public/images/btn_google_signin_dark_normal_web@2x.png b/public/images/btn_google_signin_dark_normal_web@2x.png new file mode 100644 index 0000000000..f27bb24330 Binary files /dev/null and b/public/images/btn_google_signin_dark_normal_web@2x.png differ diff --git a/public/images/btn_linkedin_signin.png b/public/images/btn_linkedin_signin.png new file mode 100644 index 0000000000..a3faf3b850 Binary files /dev/null and b/public/images/btn_linkedin_signin.png differ