Fix redirection after client password reset

.env.example

@@ -105,3 +105,11 @@ CLOUDFLARE_API_KEY=
 CLOUDFLARE_EMAIL=
 CLOUDFLARE_TARGET_IP_ADDRESS=
 CLOUDFLARE_ZONE_IDS={}
+
+POSTMARK_API_TICKET_TOKEN=
+POSTMARK_API_TICKET_TOKEN_2=
+TICKET_SUPPORT_DOMAIN=
+TICKET_SUPPORT_DOMAIN_2=
+TICKET_SUPPORT_EMAIL=
+TICKET_SUPPORT_EMAIL_2=
+TICKET_SUPPORT_EMAIL_NAME=

.travis.yml

@@ -86,6 +86,7 @@ script:
   - php ./vendor/codeception/codeception/codecept run --debug acceptance PaymentCest.php
   - php ./vendor/codeception/codeception/codecept run --debug acceptance TaskCest.php
   - php ./vendor/codeception/codeception/codecept run --debug acceptance AllPagesCept.php
+  - php ./vendor/codeception/codeception/codecept run --debug acceptance TicketCest.php
   - php ./vendor/codeception/codeception/codecept run --debug functional PermissionsCest.php
 
   #- sed -i 's/NINJA_DEV=true/NINJA_PROD=true/g' .env

README.md

@@ -5,7 +5,7 @@
 # Invoice Ninja
 
 [![Build Status](https://travis-ci.org/invoiceninja/invoiceninja.svg?branch=develop)](https://travis-ci.org/invoiceninja/invoiceninja)
-[![Docs](https://readthedocs.org/projects/invoice-ninja/badge/?version=latest)](http://docs.invoiceninja.com/en/latest/?badge=latest)
+[![Docs](https://readthedocs.org/projects/invoice-ninja/badge/?version=latest)](https://invoice-ninja.readthedocs.io/en/latest/?badge=latest)
 
 ## [Hosted](https://www.invoiceninja.com) | [Self-Hosted](https://www.invoiceninja.org)
 
@@ -17,7 +17,7 @@ The self-host zip includes all third party libraries whereas downloading the cod
 
 * [Features](https://www.invoiceninja.com/invoicing-features/)
 * [Videos](https://www.youtube.com/channel/UCXAHcBvhW05PDtWYIq7WDFA/videos)
-* [User Guide](http://docs.invoiceninja.com/en/latest/)
+* [User Guide](https://invoice-ninja.readthedocs.io/en/latest/)
 * [Support Forum](https://www.invoiceninja.com/forums/forum/support/)
 * [Roadmap](https://trello.com/b/63BbiVVe/)
 
@@ -37,7 +37,7 @@ The self-host zip includes all third party libraries whereas downloading the cod
 
 ## Installation Options
 * [Ansible](https://github.com/invoiceninja/ansible-installer)
-* [Self-Host Zip](http://docs.invoiceninja.com/en/latest/install.html)
+* [Self-Host Zip](https://invoice-ninja.readthedocs.io/en/latest/install.html)
 * [Docker File](https://hub.docker.com/r/invoiceninja/invoiceninja/)
 * [Cloudron](https://cloudron.io/store/com.invoiceninja.cloudronapp.html)
 * [Softaculous](https://www.softaculous.com/apps/ecommerce/Invoice_Ninja)
@@ -47,13 +47,14 @@ The self-host zip includes all third party libraries whereas downloading the cod
 * [Postmark](https://postmarkapp.com/)
 
 ## Development
-* [API Documentation](http://docs.invoiceninja.com/en/latest/api.html)
+* [API Documentation](https://invoice-ninja.readthedocs.io/en/latest/api.html)
 * [PHP SDK](https://github.com/invoiceninja/sdk-php)
 * [Zend Framework](https://github.com/alexz707/InvoiceNinjaModule)
-* [Custom Module](http://docs.invoiceninja.com/en/latest/custom_modules.html) | [Watch Video](https://www.youtube.com/watch?v=8jJ-PYuq85k)
+* [Custom Module](https://invoice-ninja.readthedocs.io/en/latest/custom_modules.html) | [Watch Video](https://www.youtube.com/watch?v=8jJ-PYuq85k)
 
 ## Third Party Modules
 * [Event Scheduler](https://github.com/cytech/Scheduler-InvoiceNinja)
+* [Manufacturer Module](https://github.com/dicarlosystems/manufacturer-invoiceninja)
 
 > Feel free to email us for help if you're working on a module, we're happy to provide developer support.
 
@@ -66,7 +67,7 @@ The self-host zip includes all third party libraries whereas downloading the cod
 * [Some Techie](https://www.sometechie.com/customize-invoice-ninja/)
 
 ## Contributing
-All contributors are welcome!  
+All contributors are welcome!
 For information on how contribute to Invoice Ninja, please see our [contributing guide](CONTRIBUTING.md).
 
 ## Credits
@@ -83,7 +84,9 @@ For information on how contribute to Invoice Ninja, please see our [contributing
 * [Samuel Laulhau](https://github.com/lalop) - [Lalop](http://lalop.co/)
 * [Alexander Zamponi](https://github.com/alexz707)
 * [Matthieu Calie](https://github.com/Matth--)
+* [Christopher Di Carlo](https://github.com/dicarlosystems) - [Di Carlo Systems Inc.](https://www.dicarlosystems.ca)
+* [Kristian Feldsam](https://github.com/feldsam) - [FeldHost™](https://www.feldhost.net)
 
 ## License
-Invoice Ninja is released under the Attribution Assurance License.  
+Invoice Ninja is released under the Attribution Assurance License.
 See [LICENSE](LICENSE) for details.

app/Console/Commands/CalculatePayouts.php

@@ -83,14 +83,17 @@ private function referralPayouts()
             foreach ($companies as $company) {
                 $user = $userMap[$company->referral_code];
                 $payment = $company->payment;
-                $client = $payment->client;
 
-                $this->info("User: $user");
-                $this->info("Client: " . $client->getDisplayName());
+                if ($payment) {
+                    $client = $payment->client;
 
-                foreach ($client->payments as $payment) {
-                    $amount = $payment->getCompletedAmount();
-                    $this->info("Date: $payment->payment_date, Amount: $amount, Reference: $payment->transaction_reference");
+                    $this->info("User: $user");
+                    $this->info("Client: " . $client->getDisplayName());
+
+                    foreach ($client->payments as $payment) {
+                        $amount = $payment->getCompletedAmount();
+                        $this->info("Date: $payment->payment_date, Amount: $amount, Reference: $payment->transaction_reference");
+                    }
                 }
             }
         }

app/Console/Commands/CheckData.php

@@ -87,7 +87,7 @@ public function fire()
         $this->checkClientBalances();
         $this->checkContacts();
         $this->checkUserAccounts();
-        $this->checkLogoFiles();
+        //$this->checkLogoFiles();
 
         if (! $this->option('client_id')) {
             $this->checkOAuth();
@@ -107,7 +107,7 @@ public function fire()
                         ->subject("Check-Data: " . strtoupper($this->isValid ? RESULT_SUCCESS : RESULT_FAILURE) . " [{$database}]");
             });
         } elseif (! $this->isValid) {
-            throw new Exception('Check data failed!!');
+            throw new Exception("Check data failed!!\n" . $this->log);
         }
     }
 

app/Console/Commands/CreateTestData.php

@@ -2,11 +2,16 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Ticket;
+use App\Models\TicketCategory;
+use App\Models\TicketComment;
+use App\Models\TicketTemplate;
 use App\Ninja\Repositories\AccountRepository;
 use App\Ninja\Repositories\ClientRepository;
 use App\Ninja\Repositories\ExpenseRepository;
 use App\Ninja\Repositories\InvoiceRepository;
 use App\Ninja\Repositories\PaymentRepository;
+use App\Ninja\Repositories\TicketRepository;
 use App\Ninja\Repositories\VendorRepository;
 use App\Ninja\Repositories\TaskRepository;
 use App\Ninja\Repositories\ProjectRepository;
@@ -15,6 +20,7 @@
 use App\Models\Project;
 use App\Models\ExpenseCategory;
 use Auth;
+use Carbon\Carbon;
 use Faker\Factory;
 use Illuminate\Console\Command;
 use Utils;
@@ -48,8 +54,12 @@ class CreateTestData extends Command
      * @param ExpenseRepository $expenseRepo
      * @param TaskRepository $taskRepo
      * @param AccountRepository $accountRepo
+     * @param TicketRepository $ticketRepo
+     * @param ProjectRepository $projectRepo
      */
+
     public function __construct(
+        TicketRepository $ticketRepo,
         ClientRepository $clientRepo,
         InvoiceRepository $invoiceRepo,
         PaymentRepository $paymentRepo,
@@ -71,6 +81,7 @@ public function __construct(
         $this->taskRepo = $taskRepo;
         $this->projectRepo = $projectRepo;
         $this->accountRepo = $accountRepo;
+        $this->ticketRepo = $ticketRepo;
     }
 
     /**
@@ -103,6 +114,8 @@ public function fire()
             Auth::loginUsingId(1);
         }
 
+        //$this->createTicketStubs();
+        //$this->createTicketTemplates();
         $this->createClients();
         $this->createVendors();
         $this->createOtherObjects();
@@ -134,6 +147,84 @@ private function createClients()
             $this->createInvoices($client);
             $this->createInvoices($client, true);
             $this->createTasks($client);
+            $this->createTickets($client);
+
+        }
+    }
+
+    private function createTicketTemplates()
+    {
+        $ticketTemplate = TicketTemplate::createNew();
+        $ticketTemplate->name = 'Default response';
+        $ticketTemplate->description = $this->faker->realText(50);
+        $ticketTemplate->save();
+
+        $ticketTemplate = TicketTemplate::createNew();
+        $ticketTemplate->name = 'Updated ticket';
+        $ticketTemplate->description = $this->faker->realText(50);
+        $ticketTemplate->save();
+
+
+        $ticketTemplate = TicketTemplate::createNew();
+        $ticketTemplate->name = 'Ticket closed';
+        $ticketTemplate->description = $this->faker->realText(50);
+        $ticketTemplate->save();
+
+
+        $ticketTemplate = TicketTemplate::createNew();
+        $ticketTemplate->name = 'Generic response';
+        $ticketTemplate->description = $this->faker->realText(50);
+        $ticketTemplate->save();
+
+
+    }
+
+
+    /**
+     * @param $client
+     */
+    private function createTickets($client)
+    {
+        $this->info('creating tickets');
+
+        for ($i = 0; $i < $this->count; $i++)
+        {
+            $maxTicketNumber = Ticket::getNextTicketNumber(Auth::user()->account->id);
+
+            $this->info('next ticket number = '.$maxTicketNumber);
+
+            $data = [
+                'priority_id'=> TICKET_PRIORITY_LOW,
+                'category_id'=> 1,
+                'client_id' => $client->id,
+                'is_deleted'=> 0,
+                'is_internal'=> (bool)random_int(0, 1),
+                'status_id'=> random_int(1,3),
+                'category_id'=> 1,
+                'subject'=> $this->faker->realText(10),
+                'description'=> $this->faker->realText(50),
+                'tags'=> json_encode($this->faker->words($nb = 5, $asText = false)),
+                'private_notes'=> $this->faker->realText(50),
+                'ccs'=> json_encode([]),
+                'contact_key'=> $client->getPrimaryContact()->contact_key,
+                'due_date'=> Carbon::now(),
+                'ticket_number' => $maxTicketNumber ? $maxTicketNumber : 1,
+                'action' => TICKET_SAVE_ONLY,
+            ];
+
+            $ticket = $this->ticketRepo->save($data);
+
+            $ticketComment = TicketComment::createNew($ticket);
+            $ticketComment->description = $this->faker->realText(70);
+            $ticketComment->contact_key = $client->getPrimaryContact()->contact_key;
+            $ticket->comments()->save($ticketComment);
+
+            $ticketComment = TicketComment::createNew($ticket);
+            $ticketComment->description = $this->faker->realText(40);
+            $ticketComment->user_id = 1;
+            $ticket->comments()->save($ticketComment);
+
+            $this->info("Ticket: - {$ticket->ticket_number} - {$client->account->account_ticket_settings->ticket_number_start} - {$maxTicketNumber}");
         }
     }
 

app/Console/Commands/InitLookup.php

@@ -362,6 +362,7 @@ private function truncateTables()
         DB::statement('truncate lookup_invitations');
         DB::statement('truncate lookup_proposal_invitations');
         DB::statement('truncate lookup_account_tokens');
+        DB::statement('truncate lookup_ticket_invitations');
         DB::statement('SET FOREIGN_KEY_CHECKS = 1');
     }
 

app/Console/Commands/MakeModuleSettings.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Nwidart\Modules\Commands\GeneratorCommand;
+use Nwidart\Modules\Support\Stub;
+use Nwidart\Modules\Traits\ModuleCommandTrait;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+
+class MakeModuleSettings extends GeneratorCommand
+{
+    use ModuleCommandTrait;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    // protected $signature = 'ninja:make-module-settings {name : Module name} {--route : Add routes }';
+
+    protected $name = 'ninja:make-module-settings';
+    protected $argumentName = 'module';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Create module settings';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function getTemplateContents()
+    {
+        $module = $this->laravel['modules']->findOrFail($this->getModuleName());
+        $path = str_replace('/', '\\', config('modules.paths.generator.module-settings-view'));
+
+        return (new Stub('/module-settings-view.stub', [
+            'MODULE_NAME' => $module->getName(),
+            'LOWER_NAME' => $module->getLowerName(),
+            'SHOW_ROUTES' => $this->option('route') ? true : false
+        ]))->render();
+    }
+
+    public function fire() {
+        $this->info('Creating settings view template for ' . $this->getModuleName());
+        $module = $this->laravel['modules']->findOrFail($this->getModuleName());
+
+        parent::fire();
+
+        // add default routes if option specified
+        $route =  $this->option('route');
+
+        if ($route) {
+            file_put_contents(
+                $this->getModuleRoutesFilePath(),
+                (new Stub('/module-settings-routes.stub', [
+                    'MODULE_NAME' => $module->getName(),
+                    'LOWER_NAME' => $module->getLowerName(),
+                ]))->render(),
+                FILE_APPEND
+            );
+            $this->info('Added routes to module routes.php.');
+        }
+    }
+
+    protected function getModuleRoutesFilePath() {
+        $path = $this->laravel['modules']->getModulePath($this->getModuleName());
+        $seederPath = $this->laravel['modules']->config('paths.generator.module-settings-routes');
+
+        return $path . $seederPath . '/routes.php';
+    }
+
+    public function getDestinationFilePath()
+    {
+        $path = $this->laravel['modules']->getModulePath($this->getModuleName());
+        $seederPath = $this->laravel['modules']->config('paths.generator.module-settings-view');
+
+        return $path . $seederPath . '/' . $this->getFileName();
+    }
+
+    protected function getArguments()
+    {
+        return [
+            ['module', InputArgument::REQUIRED, 'The name of the module.']
+        ];
+    }
+
+    protected function getOptions()
+    {
+        return [
+            ['route', null, InputOption::VALUE_NONE, 'Add default routes.', null]
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    protected function getFileName()
+    {
+        return 'settings.blade.php';
+    }
+}