build 311

Refactor issues

See merge request mohit.panjvani/crater-web!241

.dockerignore

@@ -0,0 +1,10 @@
+.dockerignore
+.gitignore
+*.md
+.git/
+.idea/
+.DS_Store/
+docker-compose.*
+LICENSE
+nginx.conf
+yarn.lock

.env.example

@@ -1,15 +1,15 @@
 APP_ENV=production
 APP_KEY=base64:kgk/4DW1vEVy7aEvet5FPp5un6PIGe/so8H0mvoUtW0=
-APP_DEBUG=false
+APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://crater.test
 
 DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=db
 DB_PORT=3306
 DB_DATABASE=crater
-DB_USERNAME=root
-DB_PASSWORD=bytefury
+DB_USERNAME=crater
+DB_PASSWORD="crater"
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

.eslintrc

@@ -2,9 +2,17 @@
   "root": true,
   "extends": [
     "plugin:vue/recommended",
-    "standard"
+    "eslint:recommended",
+    "prettier/vue",
+    "plugin:prettier/recommended"
   ],
   "rules": {
-    "vue/max-attributes-per-line" : 3
+    "vue/max-attributes-per-line": ["error", {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }]    
   }
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Please complete the following information:**
+- Crater version: 
+- PHP version: 
+- Database type and version: 
+
+**Optional info**
+- OS:  [e.g. Ubuntu]
+- Browser: [e.g. chrome, safari]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.

.prettierrc.json

@@ -0,0 +1,5 @@
+{
+  "semi": false,
+  "singleQuote": true,
+  "tabWidth": 2
+}

Dockerfile

@@ -0,0 +1,39 @@
+FROM php:7.4-fpm
+
+# Arguments defined in docker-compose.yml
+ARG user
+ARG uid
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    zip \
+    unzip \ 
+    libzip-dev \ 
+    libmagickwand-dev
+
+# Clear cache
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN pecl install imagick \ 
+    && docker-php-ext-enable imagick
+
+# Install PHP extensions
+RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd 
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Create system user to run Composer and Artisan Commands
+RUN useradd -G www-data,root -u $uid -d /home/$user $user
+RUN mkdir -p /home/$user/.composer && \
+    chown -R $user:$user /home/$user
+
+# Set working directory
+WORKDIR /var/www
+
+USER $user

app/Address.php

@@ -4,20 +4,18 @@ namespace Crater;
 use Illuminate\Database\Eloquent\Model;
 use Crater\User;
 use Crater\Country;
-use Crater\State;
-use Crater\City;
 
 class Address extends Model
 {
-    const BILLING_TYPE = 'BILLING';
-    const SHIPPING_TYPE = 'SHIPPING';
+    const BILLING_TYPE = 'billing';
+    const SHIPPING_TYPE = 'shipping';
 
     protected $fillable = [
         'name',
         'address_street_1',
         'address_street_2',
-        'city_id',
-        'state_id',
+        'city',
+        'state',
         'country_id',
         'zip',
         'phone',
@@ -35,14 +33,4 @@ class Address extends Model
     {
         return $this->belongsTo(Country::class);
     }
-
-    public function state()
-    {
-        return $this->belongsTo(State::class);
-    }
-
-    public function city()
-    {
-        return $this->belongsTo(City::class);
-    }
 }

app/City.php

@@ -1,18 +0,0 @@
-<?php
-namespace Crater;
-
-use Illuminate\Database\Eloquent\Model;
-use Crater\State;
-
-class City extends Model
-{
-    public function state()
-    {
-        return $this->belongsTo(State::class);
-    }
-
-    public function address()
-    {
-        return $this->hasMany(Address::class);
-    }
-}

app/Console/Commands/ResetApp.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Crater\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Filesystem\Filesystem;
+
+class ResetApp extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:app';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Clean database, database_created and public/storage folder';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if ($this->confirm('Do you wish to continue? This will delete your tables')) {
+            Artisan::call('migrate:reset --force');
+
+            \Storage::disk('local')->delete('database_created');
+
+            // $file = new Filesystem;
+            // $file->cleanDirectory('public/storage');
+        }
+    }
+}

app/Console/Commands/UpdateCommand.php

@@ -0,0 +1,190 @@
+<?php
+
+namespace Crater\Console\Commands;
+
+use Illuminate\Console\Command;
+use Crater\Space\Updater;
+use Crater\Setting;
+
+// Implementation taken from Akaunting - https://github.com/akaunting/akaunting
+class UpdateCommand extends Command
+{
+    public $installed;
+
+    public $version;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'crater:update';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Automatically update your crater app';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        set_time_limit(3600); // 1 hour
+
+        $this->installed = $this->getInstalledVersion();
+        $this->version = $this->getLatestVersion();
+
+        if (!$this->version) {
+            $this->info('No Update Available! You are already on the latest version.');
+            return;
+        }
+
+        if (!$this->confirm("Do you wish to update to {$this->version}?")) {
+            return;
+        }
+
+        if (!$path = $this->download()) {
+            return;
+        }
+
+        if (!$path = $this->unzip($path)) {
+            return;
+        }
+
+        if (!$this->copyFiles($path)) {
+            return;
+        }
+
+        if (!$this->migrateUpdate()) {
+            return;
+        }
+
+        if (!$this->finish()) {
+            return;
+        }
+
+        $this->info('Successfully updated to ' . $this->version);
+    }
+
+    public function getInstalledVersion()
+    {
+        return Setting::getSetting('version');
+    }
+
+    public function getLatestVersion()
+    {
+        $this->info('Your currently installed version is ' . $this->installed);
+        $this->line('');
+        $this->info('Checking for update...');
+
+        try {
+            $response = Updater::checkForUpdate($this->installed);
+
+            if ($response->success) {
+                return $response->version->version;
+            }
+
+            return false;
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+    }
+
+    public function download()
+    {
+        $this->info('Downloading update...');
+
+        try {
+            $path = Updater::download($this->version);
+            if (!is_string($path)) {
+                $this->error('Download exception');
+                return false;
+            }
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return $path;
+    }
+
+    public function unzip($path)
+    {
+        $this->info('Unzipping update package...');
+
+        try {
+            $path = Updater::unzip($path);
+            if (!is_string($path)) {
+                $this->error('Unzipping exception');
+                return false;
+            }
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return $path;
+    }
+
+    public function copyFiles($path)
+    {
+        $this->info('Copying update files...');
+
+        try {
+            Updater::copyFiles($path);
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return true;
+    }
+
+    public function migrateUpdate()
+    {
+        $this->info('Running Migrations...');
+
+        try {
+            Updater::migrateUpdate();
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return true;
+    }
+
+    public function finish()
+    {
+        $this->info('Finishing update...');
+
+        try {
+            Updater::finishUpdate($this->installed, $this->version);
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+
+            return false;
+        }
+
+        return true;
+    }
+}

app/Console/Kernel.php

@@ -12,7 +12,8 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-
+        Commands\ResetApp::class,
+        Commands\UpdateCommand::class
     ];
 
     /**

app/Country.php

@@ -2,15 +2,9 @@
 namespace Crater;
 
 use Illuminate\Database\Eloquent\Model;
-use Crater\State;
 
 class Country extends Model
 {
-    public function states()
-    {
-        return $this->hasMany(State::class);
-    }
-
     public function address()
     {
         return $this->hasMany(Address::class);

app/Estimate.php

@@ -49,15 +49,20 @@ class Estimate extends Model
     ];
 
     protected $casts = [
-        'total' => 'float',
-        'tax' => 'float',
-        'sub_total' => 'float'
+        'total' => 'integer',
+        'tax' => 'integer',
+        'sub_total' => 'integer',
+        'discount' => 'float',
+        'discount_val' => 'integer',
     ];
 
-    public static function getNextEstimateNumber()
+    public static function getNextEstimateNumber($value)
     {
-        // Get the last created order
-        $lastOrder = Estimate::orderBy('created_at', 'desc')->first();
+         // Get the last created order
+         $lastOrder = Estimate::where('estimate_number', 'LIKE', $value . '-%')
+                        ->orderBy('created_at', 'desc')
+                        ->first();
+
         if (!$lastOrder) {
             // We get here if there is no order at all
             // If there is no number set it to 0, which will be 1 at the end.
@@ -99,10 +104,16 @@ class Estimate extends Model
 
     public function getEstimateNumAttribute()
     {
-        $position = $this->strposX($this->estimate_number, "-", 2) + 1;
+        $position = $this->strposX($this->estimate_number, "-", 1) + 1;
         return substr($this->estimate_number, $position);
     }
 
+    public function getEstimatePrefixAttribute()
+    {
+        $prefix = explode("-",$this->estimate_number)[0];
+        return $prefix;
+    }
+
     private function strposX($haystack, $needle, $number)
     {
         if ($number == '1') {

app/EstimateItem.php

@@ -24,6 +24,7 @@ class EstimateItem extends Model
         'price' => 'integer',
         'total' => 'integer',
         'discount' => 'float',
+        'quantity' => 'float',
         'discount_val' => 'integer',
         'tax' => 'integer'
     ];

app/Events/UpdateFinished.php

@@ -25,7 +25,7 @@ class UpdateFinished
      */
     public function __construct($old, $new)
     {
-        $this->old   = $old;
-        $this->new   = $new;
+        $this->old = $old;
+        $this->new = $new;
     }
 }

app/Expense.php

@@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
 use Crater\ExpenseCategory;
+use Crater\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 
@@ -16,6 +17,7 @@ class Expense extends Model implements HasMedia
         'expense_category_id',
         'amount',
         'company_id',
+        'user_id',
         'expense_date',
         'notes',
         'attachment_receipt'
@@ -32,6 +34,11 @@ class Expense extends Model implements HasMedia
         return $this->belongsTo(ExpenseCategory::class, 'expense_category_id');
     }
 
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+
     public function getFormattedExpenseDateAttribute($value)
     {
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $this->company_id);
@@ -81,6 +88,11 @@ class Expense extends Model implements HasMedia
         return $query->where('expenses.expense_category_id', $categoryId);
     }
 
+    public function scopeWhereUser($query, $user_id)
+    {
+        return $query->where('expenses.user_id', $user_id);
+    }
+
     public function scopeApplyFilters($query, array $filters)
     {
         $filters = collect($filters);
@@ -89,6 +101,10 @@ class Expense extends Model implements HasMedia
             $query->whereCategory($filters->get('expense_category_id'));
         }
 
+        if ($filters->get('user_id')) {
+            $query->whereUser($filters->get('user_id'));
+        }
+
         if ($filters->get('from_date') && $filters->get('to_date')) {
             $start = Carbon::createFromFormat('d/m/Y', $filters->get('from_date'));
             $end = Carbon::createFromFormat('d/m/Y', $filters->get('to_date'));

app/Http/Controllers/CompanyController.php

@@ -20,11 +20,22 @@ use Crater\CompanySetting;
 
 class CompanyController extends Controller
 {
+    /**
+     * Retrive the Admin account.
+     * @return \Crater\User
+     */
     public function getAdmin()
     {
         return User::find(1);
     }
 
+    /**
+     * Update the Admin profile.
+     * Includes name, email and (or) password
+     *
+     * @param  \Crater\Http\Requests\ProfileRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function updateAdminProfile(ProfileRequest $request)
     {
         $verifyEmail = User::where('email', $request->email)->first();
@@ -54,15 +65,30 @@ class CompanyController extends Controller
         ]);
     }
 
+
+
+    /**
+     * Get Admin Account alongside the country from the addresses table and
+     * The company from companies table
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getAdminCompany()
     {
-        $user = User::with(['addresses', 'addresses.country', 'addresses.state', 'addresses.city', 'company'])->find(1);
+        $user = User::with(['addresses', 'addresses.country', 'company'])->find(1);
 
         return response()->json([
             'user' => $user
         ]);
     }
 
+
+
+    /**
+     * Update Admin Company Details
+     * @param \Crater\Http\Requests\CompanyRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function updateAdminCompany(CompanyRequest $request)
     {
         $user = User::find(1);
@@ -75,9 +101,9 @@ class CompanyController extends Controller
             $company->addMediaFromRequest('logo')->toMediaCollection('logo');
         }
 
-        $fields = $request->only(['address_street_1', 'address_street_2', 'city_id', 'state_id', 'country_id', 'zip', 'phone']);
+        $fields = $request->only(['address_street_1', 'address_street_2', 'city', 'state', 'country_id', 'zip', 'phone']);
         $address = Address::updateOrCreate(['user_id' => 1], $fields);
-        $user = User::with(['addresses', 'addresses.country', 'addresses.state', 'addresses.city', 'company'])->find(1);
+        $user = User::with(['addresses', 'addresses.country', 'company'])->find(1);
 
         return response()->json([
             'user' => $user,
@@ -85,6 +111,11 @@ class CompanyController extends Controller
         ]);
     }
 
+    /**
+     * Retrieve General App Settings
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getGeneralSettings(Request $request)
     {
         $date_formats = DateFormatter::get_list();
@@ -112,10 +143,14 @@ class CompanyController extends Controller
         $currency = CompanySetting::getSetting('currency', $request->header('company'));
         $fiscal_year = CompanySetting::getSetting('fiscal_year', $request->header('company'));
 
-        $languages = [
+        $languages = [  // alphabetical order
+            ["code"=>"pt_BR", "name" => "Brazilian Portuguese"],
             ["code"=>"en", "name" => "English"],
             ["code"=>"fr", "name" => "French"],
-            ["code"=>"es", "name" => "Spanish"]
+            ["code"=>"de", "name" => "German"],
+            ["code"=>"it", "name" => "Italian"],
+            ["code"=>"es", "name" => "Spanish"],
+            ["code"=>"ar", "name" => "العربية"],
         ];
 
         return response()->json([
@@ -133,6 +168,13 @@ class CompanyController extends Controller
         ]);
     }
 
+
+
+    /**
+     * Update General App Settings
+     * @param \Crater\Http\Requests\CompanySettingRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function updateGeneralSettings(CompanySettingRequest $request)
     {
         $sets = [
@@ -153,6 +195,63 @@ class CompanyController extends Controller
         ]);
     }
 
+    public function getCustomizeSetting (Request $request)
+    {
+        $invoice_prefix = CompanySetting::getSetting('invoice_prefix', $request->header('company'));
+        $invoice_auto_generate = CompanySetting::getSetting('invoice_auto_generate', $request->header('company'));
+
+        $estimate_prefix = CompanySetting::getSetting('estimate_prefix', $request->header('company'));
+        $estimate_auto_generate  = CompanySetting::getSetting('estimate_auto_generate', $request->header('company'));
+
+        $payment_prefix = CompanySetting::getSetting('payment_prefix', $request->header('company'));
+        $payment_auto_generate = CompanySetting::getSetting('payment_auto_generate', $request->header('company'));
+
+        return  response()->json([
+            'invoice_prefix' => $invoice_prefix,
+            'invoice_auto_generate' => $invoice_auto_generate,
+            'estimate_prefix' => $estimate_prefix,
+            'estimate_auto_generate' => $estimate_auto_generate,
+            'payment_prefix' => $payment_prefix,
+            'payment_auto_generate' => $payment_auto_generate,
+        ]);
+    }
+
+    public function updateCustomizeSetting (Request $request)
+    {
+        $sets = [];
+
+        if ($request->type == "PAYMENTS") {
+            $sets = [
+                'payment_prefix'
+            ];
+        }
+
+        if ($request->type == "INVOICES") {
+            $sets = [
+                'invoice_prefix',
+            ];
+        }
+
+        if ($request->type == "ESTIMATES") {
+            $sets = [
+                'estimate_prefix',
+            ];
+        }
+
+        foreach ($sets as $key) {
+            CompanySetting::setSetting($key, $request->$key, $request->header('company'));
+        }
+
+        return response()->json([
+            'success' => true
+        ]);
+    }
+
+    /**
+     * Update a specific Company Setting
+     * @param \Crater\Http\Requests\SettingRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function updateSetting(SettingRequest $request)
     {
         CompanySetting::setSetting($request->key, $request->value, $request->header('company'));
@@ -162,6 +261,11 @@ class CompanyController extends Controller
         ]);
     }
 
+    /**
+     * Retrieve Specific Company Setting
+     * @param \Crater\Http\Requests\SettingKeyRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getSetting(SettingKeyRequest $request)
     {
         $setting = CompanySetting::getSetting($request->key, $request->header('company'));
@@ -171,6 +275,12 @@ class CompanyController extends Controller
         ]);
     }
 
+
+    /**
+     * Retrieve App Colors
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getColors(Request $request)
     {
         $colors = [
@@ -205,7 +315,7 @@ class CompanyController extends Controller
      * Upload the company logo to storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function uploadCompanyLogo(Request $request)
     {
@@ -232,7 +342,7 @@ class CompanyController extends Controller
      * Upload the Admin Avatar to public storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function uploadAdminAvatar(Request $request)
     {

app/Http/Controllers/CustomersController.php

@@ -19,7 +19,7 @@ class CustomersController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function index(Request $request)
     {
@@ -53,7 +53,7 @@ class CustomersController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(Requests\CustomerRequest $request)
     {
@@ -80,8 +80,8 @@ class CustomersController extends Controller
                 $newAddress->name = $address["name"];
                 $newAddress->address_street_1 = $address["address_street_1"];
                 $newAddress->address_street_2 = $address["address_street_2"];
-                $newAddress->city_id = $address["city_id"];
-                $newAddress->state_id = $address["state_id"];
+                $newAddress->city = $address["city"];
+                $newAddress->state = $address["state"];
                 $newAddress->country_id = $address["country_id"];
                 $newAddress->zip = $address["zip"];
                 $newAddress->phone = $address["phone"];
@@ -104,7 +104,7 @@ class CustomersController extends Controller
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function show($id)
     {
@@ -112,11 +112,7 @@ class CustomersController extends Controller
             'billingAddress',
             'shippingAddress',
             'billingAddress.country',
-            'billingAddress.state',
-            'billingAddress.city',
             'shippingAddress.country',
-            'shippingAddress.state',
-            'shippingAddress.city',
         ])->find($id);
 
         return response()->json([
@@ -128,7 +124,7 @@ class CustomersController extends Controller
      * Show the form for editing the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function edit($id)
     {
@@ -148,7 +144,7 @@ class CustomersController extends Controller
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update($id, Requests\CustomerRequest $request)
     {
@@ -181,14 +177,15 @@ class CustomersController extends Controller
         $customer->enable_portal = $request->enable_portal;
         $customer->save();
 
+        $customer->addresses()->delete();
         if ($request->addresses) {
             foreach ($request->addresses as $address) {
                 $newAddress = $customer->addresses()->firstOrNew(['type' => $address["type"]]);
                 $newAddress->name = $address["name"];
                 $newAddress->address_street_1 = $address["address_street_1"];
                 $newAddress->address_street_2 = $address["address_street_2"];
-                $newAddress->city_id = $address["city_id"];
-                $newAddress->state_id = $address["state_id"];
+                $newAddress->city = $address["city"];
+                $newAddress->state = $address["state"];
                 $newAddress->country_id = $address["country_id"];
                 $newAddress->zip = $address["zip"];
                 $newAddress->phone = $address["phone"];
@@ -207,10 +204,10 @@ class CustomersController extends Controller
     }
 
     /**
-     * Remove the specified resource from storage.
+     * Remove the specified Customer along side all his/her resources (ie. Estimates, Invoices, Payments and Addresses)
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)
     {
@@ -221,6 +218,13 @@ class CustomersController extends Controller
         ]);
     }
 
+
+    /**
+     * Remove a list of Customers along side all their resources (ie. Estimates, Invoices, Payments and Addresses)
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function delete(Request $request)
     {
         foreach ($request->id as $id) {

app/Http/Controllers/DashboardController.php

@@ -15,6 +15,12 @@ use Illuminate\Support\Facades\DB;
 
 class DashboardController extends Controller
 {
+
+    /**
+     * Retrieve Dashboard details
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function index(Request $request)
     {
         $invoiceTotals = [];
@@ -30,7 +36,8 @@ class DashboardController extends Controller
         $start = Carbon::now();
         $end = Carbon::now();
         $terms = explode('-', $fiscalYear);
-        if ($terms[0] < $start->month) {
+
+        if ($terms[0] <= $start->month) {
             $startDate->month($terms[0])->startOfMonth();
             $start->month($terms[0])->startOfMonth();
             $end->month($terms[0])->endOfMonth();
@@ -87,6 +94,7 @@ class DashboardController extends Controller
         }
 
         $start->subMonth()->endOfMonth();
+
         $salesTotal = Invoice::whereCompany($request->header('company'))
             ->whereBetween(
                 'invoice_date',
@@ -137,6 +145,11 @@ class DashboardController extends Controller
         ]);
     }
 
+    /**
+     * Retrive Expense Chart data
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getExpenseChartData(Request $request)
     {
         $expensesCategories = Expense::with('category')

app/Http/Controllers/EnvironmentController.php

@@ -33,10 +33,14 @@ class EnvironmentController extends Controller
      */
     public function saveDatabaseEnvironment(DatabaseEnvironmentRequest $request)
     {
+        Artisan::call('config:clear');
+        Artisan::call('cache:clear');
+
         $results = $this->EnvironmentManager->saveDatabaseVariables($request);
 
         if(array_key_exists("success", $results)) {
             Artisan::call('config:clear');
+            Artisan::call('cache:clear');
             Artisan::call('storage:link');
             Artisan::call('key:generate --force');
             Artisan::call('migrate --seed --force');

app/Http/Controllers/EstimatesController.php

@@ -56,25 +56,43 @@ class EstimatesController extends Controller
 
     public function create(Request $request)
     {
-        $nextEstimateNumber = 'EST-'.Estimate::getNextEstimateNumber();
+        $estimate_prefix = CompanySetting::getSetting('estimate_prefix', $request->header('company'));
+        $estimate_num_auto_generate = CompanySetting::getSetting('estimate_auto_generate', $request->header('company'));
+
+        $nextEstimateNumberAttribute = null;
+        $nextEstimateNumber = Estimate::getNextEstimateNumber($estimate_prefix);
+
+        if ($estimate_num_auto_generate == "YES") {
+            $nextEstimateNumberAttribute = $nextEstimateNumber;
+        }
+
         $tax_per_item = CompanySetting::getSetting('tax_per_item', $request->header('company'));
         $discount_per_item = CompanySetting::getSetting('discount_per_item', $request->header('company'));
         $customers = User::where('role', 'customer')->get();
 
         return response()->json([
             'customers' => $customers,
-            'nextEstimateNumber' => $nextEstimateNumber,
+            'nextEstimateNumberAttribute' => $nextEstimateNumberAttribute,
+            'nextEstimateNumber' => $estimate_prefix.'-'.$nextEstimateNumber,
             'taxes' => Tax::whereCompany($request->header('company'))->latest()->get(),
             'items' => Item::whereCompany($request->header('company'))->get(),
             'tax_per_item' => $tax_per_item,
             'discount_per_item' => $discount_per_item,
             'estimateTemplates' => EstimateTemplate::all(),
-            'shareable_link' => ''
+            'shareable_link' => '',
+            'estimate_prefix' => $estimate_prefix
         ]);
     }
 
     public function store(EstimatesRequest $request)
     {
+        $estimate_number = explode("-",$request->estimate_number);
+        $number_attributes['estimate_number'] = $estimate_number[0].'-'.sprintf('%06d', intval($estimate_number[1]));
+
+        Validator::make($number_attributes, [
+            'estimate_number' => 'required|unique:estimates,estimate_number'
+        ])->validate();
+
         $estimate_date = Carbon::createFromFormat('d/m/Y', $request->estimate_date);
         $expiry_date = Carbon::createFromFormat('d/m/Y', $request->expiry_date);
         $status = Estimate::STATUS_DRAFT;
@@ -101,7 +119,7 @@ class EstimatesController extends Controller
         $estimate = Estimate::create([
             'estimate_date' => $estimate_date,
             'expiry_date' => $expiry_date,
-            'estimate_number' => $request->estimate_number,
+            'estimate_number' => $number_attributes['estimate_number'],
             'reference_number' => $request->reference_number,
             'user_id' => $request->user_id,
             'company_id' => $request->header('company'),
@@ -127,7 +145,7 @@ class EstimatesController extends Controller
 
             if (array_key_exists('taxes', $estimateItem) && $estimateItem['taxes']) {
                 foreach ($estimateItem['taxes'] as $tax) {
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $tax['company_id'] = $request->header('company');
                         $item->taxes()->create($tax);
                     }
@@ -137,7 +155,7 @@ class EstimatesController extends Controller
 
         if ($request->has('taxes')) {
             foreach ($request->taxes as $tax) {
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $tax['company_id'] = $request->header('company');
                     $estimate->taxes()->create($tax);
                 }
@@ -150,10 +168,6 @@ class EstimatesController extends Controller
             $data['user'] = User::find($userId)->toArray();
             $data['company'] = Company::find($estimate->company_id);
             $email = $data['user']['email'];
-            $notificationEmail = CompanySetting::getSetting(
-                'notification_email',
-                $request->header('company')
-            );
 
             if (!$email) {
                 return response()->json([
@@ -161,13 +175,7 @@ class EstimatesController extends Controller
                 ]);
             }
 
-            if (!$notificationEmail) {
-                return response()->json([
-                    'error' => 'notification_email_does_not_exist'
-                ]);
-            }
-
-            \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
+            \Mail::to($email)->send(new EstimatePdf($data));
         }
 
         $estimate = Estimate::with([
@@ -216,26 +224,33 @@ class EstimatesController extends Controller
 
         return response()->json( [
             'customers' => $customers,
-            'nextEstimateNumber' => $estimate->estimate_number,
+            'nextEstimateNumber' => $estimate->getEstimateNumAttribute(),
             'taxes' => Tax::latest()->whereCompany($request->header('company'))->get(),
             'estimate' => $estimate,
             'items' => Item::whereCompany($request->header('company'))->latest()->get(),
             'estimateTemplates' => EstimateTemplate::all(),
             'tax_per_item' => $estimate->tax_per_item,
             'discount_per_item' => $estimate->discount_per_item,
-            'shareable_link' => url('/estimates/pdf/'.$estimate->unique_hash)
+            'shareable_link' => url('/estimates/pdf/'.$estimate->unique_hash),
+            'estimate_prefix' => $estimate->getEstimatePrefixAttribute()
         ]);
     }
 
     public function update(EstimatesRequest $request, $id)
     {
+        $estimate_number = explode("-",$request->estimate_number);
+        $number_attributes['estimate_number'] = $estimate_number[0].'-'.sprintf('%06d', intval($estimate_number[1]));
+        Validator::make($number_attributes, [
+            'estimate_number' => 'required|unique:estimates,estimate_number'.','.$id
+        ])->validate();
+
         $estimate_date = Carbon::createFromFormat('d/m/Y', $request->estimate_date);
         $expiry_date = Carbon::createFromFormat('d/m/Y', $request->expiry_date);
 
         $estimate = Estimate::find($id);
         $estimate->estimate_date = $estimate_date;
         $estimate->expiry_date = $expiry_date;
-        $estimate->estimate_number = $request->estimate_number;
+        $estimate->estimate_number = $number_attributes['estimate_number'];
         $estimate->reference_number = $request->reference_number;
         $estimate->user_id = $request->user_id;
         $estimate->estimate_template_id = $request->estimate_template_id;
@@ -266,7 +281,7 @@ class EstimatesController extends Controller
 
             if (array_key_exists('taxes', $estimateItem) && $estimateItem['taxes']) {
                 foreach ($estimateItem['taxes'] as $tax) {
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $tax['company_id'] = $request->header('company');
                         $item->taxes()->create($tax);
                     }
@@ -276,7 +291,7 @@ class EstimatesController extends Controller
 
         if ($request->has('taxes')) {
             foreach ($request->taxes as $tax) {
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $tax['company_id'] = $request->header('company');
                     $estimate->taxes()->create($tax);
                 }
@@ -315,10 +330,6 @@ class EstimatesController extends Controller
         $data['company'] = Company::find($estimate->company_id);
 
         $email = $data['user']['email'];
-        $notificationEmail = CompanySetting::getSetting(
-            'notification_email',
-            $request->header('company')
-        );
 
         if (!$email) {
             return response()->json([
@@ -326,13 +337,7 @@ class EstimatesController extends Controller
             ]);
         }
 
-        if (!$notificationEmail) {
-            return response()->json([
-                'error' => 'notification_email_does_not_exist'
-            ]);
-        }
-
-        \Mail::to($email)->send(new EstimatePdf($data, $notificationEmail));
+        \Mail::to($email)->send(new EstimatePdf($data));
 
         if ($estimate->status == Estimate::STATUS_DRAFT) {
             $estimate->status = Estimate::STATUS_SENT;
@@ -380,8 +385,12 @@ class EstimatesController extends Controller
     public function estimateToInvoice(Request $request, $id)
     {
         $estimate = Estimate::with(['items', 'items.taxes', 'user', 'estimateTemplate', 'taxes'])->find($id);
-        $invoice_date = Carbon::parse($estimate->estimate_date);
-        $due_date = Carbon::parse($estimate->estimate_date)->addDays(7);
+        $invoice_date = Carbon::now();
+        $invoice_prefix = CompanySetting::getSetting(
+            'invoice_prefix',
+            $request->header('company')
+        );
+        $due_date = Carbon::now()->addDays(7);
         $tax_per_item = CompanySetting::getSetting(
                 'tax_per_item',
                 $request->header('company')
@@ -400,7 +409,7 @@ class EstimatesController extends Controller
         $invoice = Invoice::create([
             'invoice_date' => $invoice_date,
             'due_date' => $due_date,
-            'invoice_number' => "INV-".Invoice::getNextInvoiceNumber(),
+            'invoice_number' => $invoice_prefix."-".Invoice::getNextInvoiceNumber($invoice_prefix),
             'reference_number' => $estimate->reference_number,
             'user_id' => $estimate->user_id,
             'company_id' => $request->header('company'),

app/Http/Controllers/ExpensesController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Http\Controllers;
 
 use Crater\Expense;
@@ -17,16 +18,18 @@ class ExpensesController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function index(Request $request)
     {
         $limit = $request->has('limit') ? $request->limit : 10;
 
         $expenses = Expense::with('category')
+            ->leftJoin('users', 'users.id', '=', 'expenses.user_id')
             ->join('expense_categories', 'expense_categories.id', '=', 'expenses.expense_category_id')
             ->applyFilters($request->only([
                 'expense_category_id',
+                'user_id',
                 'search',
                 'from_date',
                 'to_date',
@@ -34,11 +37,16 @@ class ExpensesController extends Controller
                 'orderBy'
             ]))
             ->whereCompany($request->header('company'))
-            ->select('expenses.*', 'expense_categories.name')
+            ->select('expenses.*', 'expense_categories.name', 'users.name as user_name')
             ->paginate($limit);
 
+        $customers = User::customer()
+            ->whereCompany($request->header('company'))
+            ->get();
+
         return response()->json([
             'expenses' => $expenses,
+            'customers' => $customers,
             'currency' => Currency::findOrFail(
                 CompanySetting::getSetting('currency', $request->header('company'))
             )
@@ -48,14 +56,18 @@ class ExpensesController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function create(Request $request)
     {
         $categories = ExpenseCategory::whereCompany($request->header('company'))->get();
+        $customers = User::customer()
+            ->whereCompany($request->header('company'))
+            ->get();
 
         return response()->json([
-            'categories' => $categories
+            'categories' => $categories,
+            'customers' => $customers
         ]);
     }
 
@@ -63,7 +75,7 @@ class ExpensesController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(ExpenseRequest $request)
     {
@@ -72,6 +84,7 @@ class ExpensesController extends Controller
         $expense = new Expense();
         $expense->notes = $request->notes;
         $expense->expense_category_id = $request->expense_category_id;
+        $expense->user_id = $request->user_id;
         $expense->amount = $request->amount;
         $expense->company_id = $request->header('company');
         $expense->expense_date = $expense_date;
@@ -91,7 +104,7 @@ class ExpensesController extends Controller
      * Display the specified resource.
      *
      * @param  \Crater\Expense $expense
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function show(Expense $expense)
     {
@@ -102,12 +115,14 @@ class ExpensesController extends Controller
      * Show the form for editing the specified resource.
      *
      * @param  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function edit(Request $request,$id)
+    public function edit(Request $request, $id)
     {
         $categories = ExpenseCategory::whereCompany($request->header('company'))->get();
-        $customers = User::where('role', 'customer')->whereCompany($request->header('company'))->get();
+        $customers = User::customer()
+            ->whereCompany($request->header('company'))
+            ->get();
         $expense = Expense::with('category')->where('id', $id)->first();
 
         return response()->json([
@@ -122,7 +137,7 @@ class ExpensesController extends Controller
      *
      * @param  \Illuminate\Http\Request $request
      * @param  \Crater\Expense $expense
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(ExpenseRequest $request, Expense $expense)
     {
@@ -132,6 +147,7 @@ class ExpensesController extends Controller
         $expense->notes = $request->notes;
         $expense->expense_category_id = $request->expense_category_id;
         $expense->amount = $request->amount;
+        $expense->user_id = $request->user_id;
         $expense->expense_date = $expense_date;
         $expense->save();
 
@@ -150,7 +166,7 @@ class ExpensesController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  \Crater\Expense $expense
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(Expense $expense)
     {
@@ -175,17 +191,17 @@ class ExpensesController extends Controller
      *
      * @param  \Illuminate\Http\Request $request
      * @param   $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function uploadReceipts(Request $request, $id)
     {
         $data = json_decode($request->attachment_receipt);
 
-        if($data) {
+        if ($data) {
             $expense = Expense::find($id);
 
-            if($expense) {
-                if($request->type === 'edit') {
+            if ($expense) {
+                if ($request->type === 'edit') {
                     $expense->clearMediaCollection('receipts');
                 }
 
@@ -200,14 +216,20 @@ class ExpensesController extends Controller
         ]);
     }
 
+
+    /**
+     * Retrive details of an expense receipt from storage.
+     * @param   int $id
+     * @return  \Illuminate\Http\JsonResponse
+     */
     public function showReceipt($id)
     {
         $expense = Expense::find($id);
         $imagePath  = null;
 
-        if($expense) {
+        if ($expense) {
             $media = $expense->getFirstMedia('receipts');
-            if($media) {
+            if ($media) {
                 $imagePath = $media->getPath();
             } else {
                 return response()->json([
@@ -218,7 +240,7 @@ class ExpensesController extends Controller
 
         $type = \File::mimeType($imagePath);
 
-        $image = 'data:'.$type.';base64,'.base64_encode(file_get_contents($imagePath));
+        $image = 'data:' . $type . ';base64,' . base64_encode(file_get_contents($imagePath));
 
         return response()->json([
             'image' => $image,
@@ -226,6 +248,14 @@ class ExpensesController extends Controller
         ]);
     }
 
+
+
+    /**
+     * Download an expense receipt from storage.
+     * @param   int $id
+     * @param   strig $hash
+     * @return  \Symfony\Component\HttpFoundation\BinaryFileResponse | \Illuminate\Http\JsonResponse
+     */
     public function downloadReceipt($id, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
@@ -235,17 +265,10 @@ class ExpensesController extends Controller
             ->first();
         $imagePath  = null;
 
-        if($expense) {
+        if ($expense) {
             $media = $expense->getFirstMedia('receipts');
-            if($media) {
+            if ($media) {
                 $imagePath = $media->getPath();
-                $filename = $media->getPath();
-                $type = \File::mimeType($imagePath);
-
-                $headers = array(
-                    'Content-Type' => $type,
-                );
-
                 $response = \Response::download($imagePath, $media->file_name);
                 ob_end_clean();
                 return $response;
@@ -257,4 +280,3 @@ class ExpensesController extends Controller
         ]);
     }
 }
-

app/Http/Controllers/FrontendController.php

@@ -6,6 +6,7 @@ use Crater\Invoice;
 use PDF;
 use Crater\CompanySetting;
 use Crater\Estimate;
+use Crater\Payment;
 use Crater\User;
 use Crater\Company;
 use Crater\InvoiceTemplate;
@@ -90,7 +91,7 @@ class FrontendController extends Controller
             }
         }
 
-        $companyAddress = User::with(['addresses', 'addresses.country', 'addresses.state', 'addresses.city'])->find(1);
+        $companyAddress = User::with(['addresses', 'addresses.country'])->find(1);
 
         $colors = [
             'invoice_primary_color',
@@ -118,6 +119,11 @@ class FrontendController extends Controller
         return $pdf->stream();
     }
 
+
+    /**
+    *
+     * @return \Illuminate\Http\Response
+     */
     public function getCustomerInvoicePdf($id)
     {
         $invoice = Invoice::with([
@@ -189,7 +195,7 @@ class FrontendController extends Controller
             }
         }
 
-        $companyAddress = User::with(['addresses', 'addresses.country', 'addresses.state', 'addresses.city'])->find(1);
+        $companyAddress = User::with(['addresses', 'addresses.country'])->find(1);
 
         $colors = [
             'invoice_primary_color',
@@ -262,7 +268,7 @@ class FrontendController extends Controller
         $estimateTemplate = EstimateTemplate::find($estimate->estimate_template_id);
 
         $company = Company::find($estimate->company_id);
-        $companyAddress = User::with(['addresses', 'addresses.country', 'addresses.state', 'addresses.city'])->find(1);
+        $companyAddress = User::with(['addresses', 'addresses.country'])->find(1);
         $logo = $company->getMedia('logo')->first();
 
         if($logo) {
@@ -338,7 +344,7 @@ class FrontendController extends Controller
 
         $invoiceTemplate = InvoiceTemplate::find($invoice->invoice_template_id);
         $company = Company::find($invoice->company_id);
-        $companyAddress = User::with(['addresses', 'addresses.country', 'addresses.state', 'addresses.city'])->find(1);
+        $companyAddress = User::with(['addresses', 'addresses.country'])->find(1);
 
         $logo = $company->getMedia('logo')->first();
 
@@ -371,4 +377,34 @@ class FrontendController extends Controller
 
         return $pdf->stream();
     }
+
+    public function getPaymentPdf($id)
+    {
+        $payment = Payment::with([
+                'user',
+                'invoice',
+                'paymentMethod'
+            ])
+            ->where('unique_hash', $id)
+            ->first();
+
+        $company = Company::find($payment->company_id);
+        $companyAddress = User::with(['addresses', 'addresses.country'])->find(1);
+
+        $logo = $company->getMedia('logo')->first();
+
+        if($logo) {
+            $logo = $logo->getFullUrl();
+        }
+
+        view()->share([
+            'payment' => $payment,
+            'company_address' => $companyAddress,
+            'logo' => $logo ?? null
+        ]);
+
+        $pdf = PDF::loadView('app.pdf.payment.payment');
+
+        return $pdf->stream();
+    }
 }

app/Http/Controllers/InvoicesController.php

@@ -12,7 +12,7 @@ use Crater\Invoice;
 use Crater\InvoiceItem;
 use Carbon\Carbon;
 use Crater\Item;
-use Crater\Mail\invoicePdf;
+use Crater\Mail\InvoicePdf;
 use function MongoDB\BSON\toJSON;
 use Illuminate\Support\Facades\Log;
 use Crater\User;
@@ -27,7 +27,7 @@ class InvoicesController extends Controller
     /**
      * Display a listing of the resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function index(Request $request)
     {
@@ -60,20 +60,30 @@ class InvoicesController extends Controller
     /**
      * Show the form for creating a new resource.
      *
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function create(Request $request)
     {
         $tax_per_item = CompanySetting::getSetting('tax_per_item', $request->header('company'));
         $discount_per_item = CompanySetting::getSetting('discount_per_item', $request->header('company'));
-        $nextInvoiceNumber = "INV-".Invoice::getNextInvoiceNumber();
+        $invoice_prefix = CompanySetting::getSetting('invoice_prefix', $request->header('company'));
+        $invoice_num_auto_generate = CompanySetting::getSetting('invoice_auto_generate', $request->header('company'));
+
+        $nextInvoiceNumberAttribute = null;
+        $nextInvoiceNumber = Invoice::getNextInvoiceNumber($invoice_prefix);
+
+        if ($invoice_num_auto_generate == "YES") {
+            $nextInvoiceNumberAttribute = $nextInvoiceNumber;
+        }
 
         return response()->json([
-            'nextInvoiceNumber' => $nextInvoiceNumber,
+            'nextInvoiceNumberAttribute' => $nextInvoiceNumberAttribute,
+            'nextInvoiceNumber' => $invoice_prefix.'-'.$nextInvoiceNumber,
             'items' => Item::with('taxes')->whereCompany($request->header('company'))->get(),
             'invoiceTemplates' => InvoiceTemplate::all(),
             'tax_per_item' => $tax_per_item,
-            'discount_per_item' => $discount_per_item
+            'discount_per_item' => $discount_per_item,
+            'invoice_prefix' => $invoice_prefix
         ]);
     }
 
@@ -81,10 +91,17 @@ class InvoicesController extends Controller
      * Store a newly created resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function store(Requests\InvoicesRequest $request)
     {
+        $invoice_number = explode("-",$request->invoice_number);
+        $number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1]));
+
+        Validator::make($number_attributes, [
+            'invoice_number' => 'required|unique:invoices,invoice_number'
+        ])->validate();
+
         $invoice_date = Carbon::createFromFormat('d/m/Y', $request->invoice_date);
         $due_date = Carbon::createFromFormat('d/m/Y', $request->due_date);
         $status = Invoice::STATUS_DRAFT;
@@ -99,7 +116,7 @@ class InvoicesController extends Controller
         $invoice = Invoice::create([
             'invoice_date' => $invoice_date,
             'due_date' => $due_date,
-            'invoice_number' => $request->invoice_number,
+            'invoice_number' => $number_attributes['invoice_number'],
             'reference_number' => $request->reference_number,
             'user_id' => $request->user_id,
             'company_id' => $request->header('company'),
@@ -128,8 +145,7 @@ class InvoicesController extends Controller
             if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
                 foreach ($invoiceItem['taxes'] as $tax) {
                     $tax['company_id'] = $request->header('company');
-
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $item->taxes()->create($tax);
                     }
                 }
@@ -140,7 +156,7 @@ class InvoicesController extends Controller
             foreach ($request->taxes as $tax) {
                 $tax['company_id'] = $request->header('company');
 
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $invoice->taxes()->create($tax);
                 }
             }
@@ -151,11 +167,6 @@ class InvoicesController extends Controller
             $data['user'] = User::find($request->user_id)->toArray();
             $data['company'] = Company::find($invoice->company_id);
 
-            $notificationEmail = CompanySetting::getSetting(
-                'notification_email',
-                $request->header('company')
-            );
-
             $email = $data['user']['email'];
 
             if (!$email) {
@@ -164,13 +175,7 @@ class InvoicesController extends Controller
                 ]);
             }
 
-            if (!$notificationEmail) {
-                return response()->json([
-                    'error' => 'notification_email_does_not_exist'
-                ]);
-            }
-
-            \Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
+            \Mail::to($email)->send(new InvoicePdf($data));
         }
 
         $invoice = Invoice::with(['items', 'user', 'invoiceTemplate', 'taxes'])->find($invoice->id);
@@ -185,7 +190,7 @@ class InvoicesController extends Controller
      * Display the specified resource.
      *
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function show(Request $request, $id)
     {
@@ -209,7 +214,7 @@ class InvoicesController extends Controller
      * Show the form for editing the specified resource.
      *
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function edit(Request $request,$id)
     {
@@ -222,12 +227,13 @@ class InvoicesController extends Controller
         ])->find($id);
 
         return response()->json([
-            'nextInvoiceNumber' => $invoice->invoice_number,
+            'nextInvoiceNumber' => $invoice->getInvoiceNumAttribute(),
             'invoice' => $invoice,
             'invoiceTemplates' => InvoiceTemplate::all(),
             'tax_per_item' => $invoice->tax_per_item,
             'discount_per_item' => $invoice->discount_per_item,
-            'shareable_link' => url('/invoices/pdf/'.$invoice->unique_hash)
+            'shareable_link' => url('/invoices/pdf/'.$invoice->unique_hash),
+            'invoice_prefix' => $invoice->getInvoicePrefixAttribute()
         ]);
     }
 
@@ -236,10 +242,17 @@ class InvoicesController extends Controller
      *
      * @param  \Illuminate\Http\Request $request
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function update(Requests\InvoicesRequest $request, $id)
     {
+        $invoice_number = explode("-",$request->invoice_number);
+        $number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1]));
+
+        Validator::make($number_attributes, [
+            'invoice_number' => 'required|unique:invoices,invoice_number'.','.$id
+        ])->validate();
+
         $invoice_date = Carbon::createFromFormat('d/m/Y', $request->invoice_date);
         $due_date = Carbon::createFromFormat('d/m/Y', $request->due_date);
 
@@ -268,7 +281,7 @@ class InvoicesController extends Controller
 
         $invoice->invoice_date = $invoice_date;
         $invoice->due_date = $due_date;
-        $invoice->invoice_number = $request->invoice_number;
+        $invoice->invoice_number =  $number_attributes['invoice_number'];
         $invoice->reference_number = $request->reference_number;
         $invoice->user_id = $request->user_id;
         $invoice->invoice_template_id = $request->invoice_template_id;
@@ -292,7 +305,6 @@ class InvoicesController extends Controller
         foreach ($oldTaxes as $oldTax) {
             Tax::destroy($oldTax['id']);
         }
-
         foreach ($invoiceItems as $invoiceItem) {
             $invoiceItem['company_id'] = $request->header('company');
             $item = $invoice->items()->create($invoiceItem);
@@ -300,8 +312,7 @@ class InvoicesController extends Controller
             if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
                 foreach ($invoiceItem['taxes'] as $tax) {
                     $tax['company_id'] = $request->header('company');
-
-                    if ($tax['amount']) {
+                    if (gettype($tax['amount']) !== "NULL") {
                         $item->taxes()->create($tax);
                     }
                 }
@@ -312,7 +323,7 @@ class InvoicesController extends Controller
             foreach ($request->taxes as $tax) {
                 $tax['company_id'] = $request->header('company');
 
-                if ($tax['amount']) {
+                if (gettype($tax['amount']) !== "NULL") {
                     $invoice->taxes()->create($tax);
                 }
             }
@@ -331,7 +342,7 @@ class InvoicesController extends Controller
      * Remove the specified resource from storage.
      *
      * @param  int $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroy($id)
     {
@@ -369,6 +380,14 @@ class InvoicesController extends Controller
         ]);
     }
 
+
+
+     /**
+     * Mail a specific invoice to the correponding cusitomer's email address.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function sendInvoice(Request $request)
     {
         $invoice = Invoice::findOrFail($request->id);
@@ -378,10 +397,6 @@ class InvoicesController extends Controller
         $data['user'] = User::find($userId)->toArray();
         $data['company'] = Company::find($invoice->company_id);
         $email = $data['user']['email'];
-        $notificationEmail = CompanySetting::getSetting(
-            'notification_email',
-            $request->header('company')
-        );
 
         if (!$email) {
             return response()->json([
@@ -389,13 +404,7 @@ class InvoicesController extends Controller
             ]);
         }
 
-        if (!$notificationEmail) {
-            return response()->json([
-                'error' => 'notification_email_does_not_exist'
-            ]);
-        }
-
-        \Mail::to($email)->send(new invoicePdf($data, $notificationEmail));
+        \Mail::to($email)->send(new InvoicePdf($data));
 
         if ($invoice->status == Invoice::STATUS_DRAFT) {
             $invoice->status = Invoice::STATUS_SENT;
@@ -409,6 +418,13 @@ class InvoicesController extends Controller
         ]);
     }
 
+
+     /**
+     * Mark a specific invoice as sent.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function markAsSent(Request $request)
     {
         $invoice = Invoice::findOrFail($request->id);
@@ -421,6 +437,13 @@ class InvoicesController extends Controller
         ]);
     }
 
+
+     /**
+     * Mark a specific invoice as paid.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function markAsPaid(Request $request)
     {
         $invoice = Invoice::findOrFail($request->id);
@@ -434,6 +457,14 @@ class InvoicesController extends Controller
         ]);
     }
 
+
+     /**
+     * Retrive a specified user's unpaid invoices from storage.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  int $id
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getCustomersUnpaidInvoices(Request $request, $id)
     {
         $invoices = Invoice::where('paid_status', '<>', Invoice::STATUS_PAID)
@@ -445,4 +476,94 @@ class InvoicesController extends Controller
             'invoices' => $invoices
         ]);
     }
+
+    public function cloneInvoice(Request $request)
+    {
+        $oldInvoice = Invoice::with([
+            'items.taxes',
+            'user',
+            'invoiceTemplate',
+            'taxes.taxType'
+        ])
+        ->find($request->id);
+
+        $date = Carbon::now();
+        $invoice_prefix = CompanySetting::getSetting(
+            'invoice_prefix',
+            $request->header('company')
+        );
+        $tax_per_item = CompanySetting::getSetting(
+                'tax_per_item',
+                $request->header('company')
+            ) ? CompanySetting::getSetting(
+                'tax_per_item',
+                $request->header('company')
+            ) : 'NO';
+        $discount_per_item = CompanySetting::getSetting(
+                'discount_per_item',
+                $request->header('company')
+            ) ? CompanySetting::getSetting(
+                'discount_per_item',
+                $request->header('company')
+            ) : 'NO';
+
+        $invoice = Invoice::create([
+            'invoice_date' => $date,
+            'due_date' => $date,
+            'invoice_number' => $invoice_prefix."-".Invoice::getNextInvoiceNumber($invoice_prefix),
+            'reference_number' => $oldInvoice->reference_number,
+            'user_id' => $oldInvoice->user_id,
+            'company_id' => $request->header('company'),
+            'invoice_template_id' => 1,
+            'status' => Invoice::STATUS_DRAFT,
+            'paid_status' => Invoice::STATUS_UNPAID,
+            'sub_total' => $oldInvoice->sub_total,
+            'discount' => $oldInvoice->discount,
+            'discount_type' => $oldInvoice->discount_type,
+            'discount_val' => $oldInvoice->discount_val,
+            'total' => $oldInvoice->total,
+            'due_amount' => $oldInvoice->total,
+            'tax_per_item' => $oldInvoice->tax_per_item,
+            'discount_per_item' => $oldInvoice->discount_per_item,
+            'tax' => $oldInvoice->tax,
+            'notes' => $oldInvoice->notes,
+            'unique_hash' => str_random(60)
+        ]);
+
+        $invoiceItems = $oldInvoice->items->toArray();
+
+        foreach ($invoiceItems as $invoiceItem) {
+            $invoiceItem['company_id'] = $request->header('company');
+            $invoiceItem['name'] = $invoiceItem['name'];
+            $item = $invoice->items()->create($invoiceItem);
+
+            if (array_key_exists('taxes', $invoiceItem) && $invoiceItem['taxes']) {
+                foreach ($invoiceItem['taxes'] as $tax) {
+                    $tax['company_id'] = $request->header('company');
+
+                    if ($tax['amount']) {
+                        $item->taxes()->create($tax);
+                    }
+                }
+            }
+        }
+
+        if ($oldInvoice->taxes) {
+            foreach ($oldInvoice->taxes->toArray() as $tax) {
+                $tax['company_id'] = $request->header('company');
+                $invoice->taxes()->create($tax);
+            }
+        }
+
+        $invoice = Invoice::with([
+            'items',
+            'user',
+            'invoiceTemplate',
+            'taxes'
+        ])->find($invoice->id);
+
+        return response()->json([
+            'invoice' => $invoice
+        ]);
+    }
 }

app/Http/Controllers/ItemsController.php

@@ -14,14 +14,17 @@ class ItemsController extends Controller
     {
         $limit = $request->has('limit') ? $request->limit : 10;
 
-        $items = Item::applyFilters($request->only([
+        $items = Item::with(['taxes'])
+            ->leftJoin('units', 'units.id', '=', 'items.unit_id')
+            ->applyFilters($request->only([
                 'search',
                 'price',
-                'unit',
+                'unit_id',
                 'orderByField',
                 'orderBy'
             ]))
             ->whereCompany($request->header('company'))
+            ->select('items.*', 'units.name as unit_name')
             ->latest()
             ->paginate($limit);
 
@@ -33,7 +36,7 @@ class ItemsController extends Controller
 
     public function edit(Request $request, $id)
     {
-        $item = Item::with('taxes')->find($id);
+        $item = Item::with(['taxes', 'unit'])->find($id);
 
         return response()->json([
             'item' => $item,
@@ -43,11 +46,18 @@ class ItemsController extends Controller
         ]);
     }
 
+
+     /**
+     * Create Item.
+     *
+     * @param  Crater\Http\Requests\ItemsRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function store(Requests\ItemsRequest $request)
     {
         $item = new Item();
         $item->name = $request->name;
-        $item->unit = $request->unit;
+        $item->unit_id = $request->unit_id;
         $item->description = $request->description;
         $item->company_id = $request->header('company');
         $item->price = $request->price;
@@ -67,11 +77,18 @@ class ItemsController extends Controller
         ]);
     }
 
+    /**
+     * Update an existing Item.
+     *
+     * @param  Crater\Http\Requests\ItemsRequest $request
+     * @param int $id
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function update(Requests\ItemsRequest $request, $id)
     {
         $item = Item::find($id);
         $item->name = $request->name;
-        $item->unit = $request->unit;
+        $item->unit_id = $request->unit_id;
         $item->description = $request->description;
         $item->price = $request->price;
         $item->save();
@@ -96,6 +113,13 @@ class ItemsController extends Controller
         ]);
     }
 
+
+    /**
+     * Delete an existing Item.
+     *
+     * @param int $id
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function destroy($id)
     {
         $data = Item::deleteItem($id);
@@ -111,12 +135,20 @@ class ItemsController extends Controller
         ]);
     }
 
+
+
+    /**
+     * Delete a list of existing Items.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function delete(Request $request)
     {
         $items = [];
         foreach ($request->id as $id) {
             $item = Item::deleteItem($id);
-            if (!$item) {
+            if ($item) {
                 array_push($items, $id);
             }
         }

app/Http/Controllers/LocationController.php

@@ -3,29 +3,19 @@ namespace Crater\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Crater\Country;
-use Crater\State;
-use Crater\City;
 
 class LocationController extends Controller
 {
+
+    /**
+     * Retrive a list of Countries.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getCountries()
     {
         return response()->json([
             'countries' => Country::all()
         ]);
     }
-
-    public function getStates($id)
-    {
-        return response()->json([
-            'states' => Country::find($id)->states
-        ]);
-    }
-
-    public function getCities($id)
-    {
-        return response()->json([
-            'cities' => State::find($id)->cities
-        ]);
-    }
 }

app/Http/Controllers/OnboardingController.php

@@ -18,6 +18,13 @@ use Illuminate\Support\Facades\Artisan;
 
 class OnboardingController extends Controller
 {
+
+    /**
+     * Retrieve Onboarding data.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getOnboardingData(Request $request)
     {
         if (!\Storage::disk('local')->has('database_created')) {
@@ -37,9 +44,14 @@ class OnboardingController extends Controller
         $date_formats = DateFormatter::get_list();
         $time_zones = TimeZones::get_list();
         $languages = [
+            ["code"=>"ar", "name" => "Arabic"],
             ["code"=>"en", "name" => "English"],
             ["code"=>"fr", "name" => "French"],
-            ["code"=>"es", "name" => "Spanish"]
+            ["code"=>"es", "name" => "Spanish"],
+            ["code"=>"ar", "name" => "العربية"],
+            ["code"=>"de", "name" => "German"],
+            ["code"=>"pt-br", "name" => "Portuguese (Brazilian)"],
+            ["code"=>"it", "name" => "Italian"],
         ];
         $fiscal_years = [
             ['key' => 'january-december' , 'value' => '1-12'],
@@ -58,8 +70,6 @@ class OnboardingController extends Controller
         $user = User::with([
             'addresses',
             'addresses.country',
-            'addresses.state',
-            'addresses.city',
             'company'
         ])->find(1);
 
@@ -74,6 +84,13 @@ class OnboardingController extends Controller
         ]);
     }
 
+
+    /**
+     * Setup Admin Profile.
+     *
+     * @param  \Crater\Http\Requests\ProfileRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function adminProfile(ProfileRequest $request)
     {
         $setting = Setting::getSetting('profile_complete');
@@ -99,6 +116,12 @@ class OnboardingController extends Controller
         ]);
     }
 
+    /**
+     * Setup Admin Avatar.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function uploadAdminAvatar(Request $request)
     {
         $setting = Setting::getSetting('profile_complete');
@@ -125,6 +148,12 @@ class OnboardingController extends Controller
         ]);
     }
 
+    /**
+     * Setup Admin Company.
+     *
+     * @param  \Crater\Http\Requests\CompanyRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function adminCompany(CompanyRequest $request)
     {
         $setting = Setting::getSetting('profile_complete');
@@ -156,8 +185,8 @@ class OnboardingController extends Controller
         $fields = $request->only([
             'address_street_1',
             'address_street_2',
-            'city_id',
-            'state_id',
+            'city',
+            'state',
             'country_id',
             'zip',
             'phone'
@@ -176,6 +205,13 @@ class OnboardingController extends Controller
         ]);
     }
 
+
+    /**
+     * Setup Company Settings.
+     *
+     * @param  \Crater\Http\Requests\CompanySettingRequest $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function companySettings(CompanySettingRequest $request)
     {
         $setting = Setting::getSetting('profile_complete');
@@ -204,6 +240,45 @@ class OnboardingController extends Controller
             );
         }
 
+        $invoices = [
+            'invoice_auto_generate' => 'YES',
+            'invoice_prefix' => 'INV'
+        ];
+
+        foreach ($invoices as $key => $value) {
+            CompanySetting::setSetting(
+                $key,
+                $value,
+                $user->company_id
+            );
+        }
+
+        $estimates = [
+            'estimate_prefix' => 'EST',
+            'estimate_auto_generate' => 'YES'
+        ];
+
+        foreach ($estimates as $key => $value) {
+            CompanySetting::setSetting(
+                $key,
+                $value,
+                $user->company_id
+            );
+        }
+
+        $payments = [
+            'payment_prefix' => 'PAY',
+            'payment_auto_generate' => 'YES'
+        ];
+
+        foreach ($payments as $key => $value) {
+            CompanySetting::setSetting(
+                $key,
+                $value,
+                $user->company_id
+            );
+        }
+
         $colors = [
             'primary_text_color' => '#5851D8',
             'heading_text_color' => '#595959',
@@ -234,13 +309,24 @@ class OnboardingController extends Controller
 
         Artisan::call('passport:install --force');
 
+        Artisan::call('db:seed', ['--class' => 'PaymentMethodSeeder', '--force' => true]);
+
+        Artisan::call('db:seed', ['--class' => 'UnitSeeder', '--force' => true]);
+
         $client = DB::table('oauth_clients')->find(2);
 
         $path = base_path('.env');
 
         if (file_exists($path)) {
             file_put_contents($path, str_replace(
-                'PROXY_OAUTH_CLIENT_SECRET='.config('auth.proxy.client_secret'), 'PROXY_OAUTH_CLIENT_SECRET='.$client->secret, file_get_contents($path)
+                'PROXY_OAUTH_CLIENT_SECRET='.config('auth.proxy.client_secret'),
+                'PROXY_OAUTH_CLIENT_SECRET='.$client->secret,
+                file_get_contents($path)
+            ));
+            file_put_contents($path, str_replace(
+                'APP_DEBUG=true',
+                'APP_DEBUG=false',
+                file_get_contents($path)
             ));
         }
 

app/Http/Controllers/PaymentController.php

@@ -4,12 +4,16 @@ namespace Crater\Http\Controllers;
 use Illuminate\Http\Request;
 use Crater\CompanySetting;
 use Crater\Currency;
+use Crater\Company;
 use Crater\Invoice;
 use Crater\Payment;
+use Crater\PaymentMethod;
 use Carbon\Carbon;
 use function MongoDB\BSON\toJSON;
 use Crater\User;
 use Crater\Http\Requests\PaymentRequest;
+use Validator;
+use Crater\Mail\PaymentPdf;
 
 class PaymentController extends Controller
 {
@@ -22,19 +26,20 @@ class PaymentController extends Controller
     {
         $limit = $request->has('limit') ? $request->limit : 10;
 
-        $payments = Payment::with('user', 'invoice')
+        $payments = Payment::with(['user', 'invoice', 'paymentMethod'])
             ->join('users', 'users.id', '=', 'payments.user_id')
             ->leftJoin('invoices', 'invoices.id', '=', 'payments.invoice_id')
+            ->leftJoin('payment_methods', 'payment_methods.id', '=', 'payments.payment_method_id')
             ->applyFilters($request->only([
                 'search',
                 'payment_number',
-                'payment_mode',
+                'payment_method_id',
                 'customer_id',
                 'orderByField',
                 'orderBy'
             ]))
             ->whereCompany($request->header('company'))
-            ->select('payments.*', 'users.name', 'invoices.invoice_number')
+            ->select('payments.*', 'users.name', 'invoices.invoice_number', 'payment_methods.name as payment_mode')
             ->latest()
             ->paginate($limit);
 
@@ -50,13 +55,27 @@ class PaymentController extends Controller
      */
     public function create(Request $request)
     {
-        $nextPaymentNumber = 'PAY-'.Payment::getNextPaymentNumber();
+        $payment_prefix = CompanySetting::getSetting('payment_prefix', $request->header('company'));
+        $payment_num_auto_generate = CompanySetting::getSetting('payment_auto_generate', $request->header('company'));
+
+
+        $nextPaymentNumberAttribute = null;
+        $nextPaymentNumber = Payment::getNextPaymentNumber($payment_prefix);
+
+        if ($payment_num_auto_generate == "YES") {
+            $nextPaymentNumberAttribute = $nextPaymentNumber;
+        }
 
         return response()->json([
             'customers' => User::where('role', 'customer')
                 ->whereCompany($request->header('company'))
                 ->get(),
-            'nextPaymentNumber' => $nextPaymentNumber
+            'paymentMethods' => PaymentMethod::whereCompany($request->header('company'))
+                ->latest()
+                ->get(),
+            'nextPaymentNumberAttribute' => $nextPaymentNumberAttribute,
+            'nextPaymentNumber' => $payment_prefix.'-'.$nextPaymentNumber,
+            'payment_prefix' => $payment_prefix
         ]);
     }
 
@@ -68,6 +87,13 @@ class PaymentController extends Controller
      */
     public function store(PaymentRequest $request)
     {
+        $payment_number = explode("-",$request->payment_number);
+        $number_attributes['payment_number'] = $payment_number[0].'-'.sprintf('%06d', intval($payment_number[1]));
+
+        Validator::make($number_attributes, [
+            'payment_number' => 'required|unique:payments,payment_number'
+        ])->validate();
+
         $payment_date = Carbon::createFromFormat('d/m/Y', $request->payment_date);
 
         if ($request->has('invoice_id') && $request->invoice_id != null) {
@@ -90,17 +116,19 @@ class PaymentController extends Controller
 
         $payment = Payment::create([
             'payment_date' => $payment_date,
-            'payment_number' => $request->payment_number,
+            'payment_number' => $number_attributes['payment_number'],
             'user_id' => $request->user_id,
             'company_id' => $request->header('company'),
             'invoice_id' => $request->invoice_id,
-            'payment_mode' => $request->payment_mode,
+            'payment_method_id' => $request->payment_method_id,
             'amount' => $request->amount,
             'notes' => $request->notes,
+            'unique_hash' => str_random(60)
         ]);
 
         return response()->json([
             'payment' => $payment,
+            'shareable_link' => url('/payments/pdf/'.$payment->unique_hash),
             'success' => true
         ]);
     }
@@ -113,7 +141,12 @@ class PaymentController extends Controller
      */
     public function show($id)
     {
-        //
+        $payment = Payment::with(['user', 'invoice', 'paymentMethod'])->find($id);
+
+        return response()->json([
+            'payment' => $payment,
+            'shareable_link' => url('/payments/pdf/'.$payment->unique_hash)
+        ]);
     }
 
     /**
@@ -124,7 +157,7 @@ class PaymentController extends Controller
      */
     public function edit(Request $request, $id)
     {
-        $payment = Payment::with('user', 'invoice')->find($id);
+        $payment = Payment::with(['user', 'invoice', 'paymentMethod'])->find($id);
 
         $invoices = Invoice::where('paid_status', '<>', Invoice::STATUS_PAID)
             ->where('user_id', $payment->user_id)->where('due_amount', '>', 0)
@@ -135,7 +168,12 @@ class PaymentController extends Controller
             'customers' => User::where('role', 'customer')
                 ->whereCompany($request->header('company'))
                 ->get(),
-            'nextPaymentNumber' => $payment->payment_number,
+            'paymentMethods' => PaymentMethod::whereCompany($request->header('company'))
+                ->latest()
+                ->get(),
+            'nextPaymentNumber' => $payment->getPaymentNumAttribute(),
+            'payment_prefix' => $payment->getPaymentPrefixAttribute(),
+            'shareable_link' => url('/payments/pdf/'.$payment->unique_hash),
             'payment' => $payment,
             'invoices' => $invoices
         ]);
@@ -150,6 +188,13 @@ class PaymentController extends Controller
      */
     public function update(PaymentRequest $request, $id)
     {
+        $payment_number = explode("-",$request->payment_number);
+        $number_attributes['payment_number'] = $payment_number[0].'-'.sprintf('%06d', intval($payment_number[1]));
+
+        Validator::make($number_attributes, [
+            'payment_number' => 'required|unique:payments,payment_number'.','.$id
+        ])->validate();
+
         $payment_date = Carbon::createFromFormat('d/m/Y', $request->payment_date);
 
         $payment = Payment::find($id);
@@ -178,16 +223,17 @@ class PaymentController extends Controller
         }
 
         $payment->payment_date = $payment_date;
-        $payment->payment_number = $request->payment_number;
+        $payment->payment_number = $number_attributes['payment_number'];
         $payment->user_id = $request->user_id;
         $payment->invoice_id = $request->invoice_id;
-        $payment->payment_mode = $request->payment_mode;
+        $payment->payment_method_id = $request->payment_method_id;
         $payment->amount = $request->amount;
         $payment->notes = $request->notes;
         $payment->save();
 
         return response()->json([
             'payment' => $payment,
+            'shareable_link' => url('/payments/pdf/'.$payment->unique_hash),
             'success' => true
         ]);
     }
@@ -249,4 +295,27 @@ class PaymentController extends Controller
             'success' => true
         ]);
     }
+
+    public function sendPayment(Request $request)
+    {
+        $payment = Payment::findOrFail($request->id);
+
+        $data['payment'] = $payment->toArray();
+        $userId = $data['payment']['user_id'];
+        $data['user'] = User::find($userId)->toArray();
+        $data['company'] = Company::find($payment->company_id);
+        $email = $data['user']['email'];
+
+        if (!$email) {
+            return response()->json([
+                'error' => 'user_email_does_not_exist'
+            ]);
+        }
+
+        \Mail::to($email)->send(new PaymentPdf($data));
+
+        return response()->json([
+            'success' => true
+        ]);
+    }
 }

app/Http/Controllers/PaymentMethodController.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Crater\Http\Controllers;
+
+use Crater\PaymentMethod;
+use Illuminate\Http\Request;
+use Crater\Http\Requests\PaymentMethodRequest;
+
+class PaymentMethodController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $paymentMethods = PaymentMethod::whereCompany($request->header('company'))
+            ->latest()
+            ->get();
+
+        return response()->json([
+            'paymentMethods' => $paymentMethods
+        ]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(PaymentMethodRequest $request)
+    {
+        $paymentMethod = new PaymentMethod;
+        $paymentMethod->name = $request->name;
+        $paymentMethod->company_id = $request->header('company');
+        $paymentMethod->save();
+
+        return response()->json([
+            'paymentMethod' => $paymentMethod
+        ]);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \Crater\PaymentMethod  $paymentMethod
+     * @return \Illuminate\Http\Response
+     */
+    public function show(PaymentMethod $paymentMethod)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \Crater\PaymentMethod  $paymentMethod
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(PaymentMethod $paymentMethod)
+    {
+        return response()->json([
+            'paymentMethod' => $paymentMethod
+        ]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Crater\PaymentMethod  $paymentMethod
+     * @return \Illuminate\Http\Response
+     */
+    public function update(PaymentMethodRequest $request, PaymentMethod $paymentMethod)
+    {
+        $paymentMethod->name = $request->name;
+        $paymentMethod->company_id = $request->header('company');
+        $paymentMethod->save();
+
+        return response()->json([
+            'paymentMethod' => $paymentMethod
+        ]);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \Crater\PaymentMethod  $paymentMethod
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(PaymentMethod $paymentMethod)
+    {
+        $payments = $paymentMethod->payments;
+
+        if ($payments->count() > 0) {
+            return response()->json([
+                'error' => 'payments_attached'
+            ]);
+        }
+
+        $paymentMethod->delete();
+
+        return response()->json([
+            'success' => 'Payment method deleted successfully'
+        ]);
+    }
+}

app/Http/Controllers/SettingsController.php

@@ -4,9 +4,18 @@ namespace Crater\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Crater\Setting;
+use Crater\Mail\TestMail;
+use Mail;
 
 class SettingsController extends Controller
 {
+
+    /**
+     * Retrive App Version.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function getAppVersion(Request $request)
     {
         $version = Setting::getSetting('version');
@@ -16,4 +25,18 @@ class SettingsController extends Controller
         ]);
     }
 
+    public function testEmailConfig(Request $request)
+    {
+        $this->validate($request, [
+            'to' => 'required|email',
+            'subject' => 'required',
+            'message' => 'required'
+        ]);
+
+        Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
+
+        return response()->json([
+            'success' => true
+        ]);
+    }
 }

app/Http/Controllers/UnitController.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Crater\Http\Controllers;
+
+use Crater\Unit;
+use Illuminate\Http\Request;
+use Crater\Http\Requests\UnitRequest;
+
+class UnitController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $units = Unit::whereCompany($request->header('company'))
+            ->latest()
+            ->get();
+
+        return response()->json([
+            'units' => $units
+        ]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(UnitRequest $request)
+    {
+        $unit = new Unit;
+        $unit->name = $request->name;
+        $unit->company_id = $request->header('company');
+        $unit->save();
+
+        return response()->json([
+            'unit' => $unit
+        ]);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \Crater\Unit  $unit
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Unit $unit)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \Crater\Unit  $unit
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Unit $unit)
+    {
+        return response()->json([
+            'unit' => $unit
+        ]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Crater\Unit  $unit
+     * @return \Illuminate\Http\Response
+     */
+    public function update(UnitRequest $request, Unit $unit)
+    {
+        $unit->name = $request->name;
+        $unit->company_id = $request->header('company');
+        $unit->save();
+
+        return response()->json([
+            'unit' => $unit
+        ]);
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \Crater\Unit  $unit
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Unit $unit)
+    {
+        $items = $unit->items;
+
+        if ($items->count() > 0) {
+            return response()->json([
+                'error' => 'items_attached'
+            ]);
+        }
+
+        $unit->delete();
+
+        return response()->json([
+            'success' => 'Unit deleted successfully'
+        ]);
+    }
+}

app/Http/Controllers/UpdateController.php

@@ -2,23 +2,81 @@
 
 namespace Crater\Http\Controllers;
 
+use Crater\Setting;
 use Illuminate\Http\Request;
 use Crater\Space\Updater;
 use Crater\Space\SiteApi;
+use Illuminate\Support\Facades\Artisan;
 
 class UpdateController extends Controller
 {
-    public function update(Request $request)
+
+    public function download(Request $request)
     {
-        set_time_limit(600); // 10 minutes
+        $request->validate([
+            'version' => 'required',
+        ]);
 
-        $json = Updater::update($request->installed, $request->version);
+        $path = Updater::download($request->version);
 
-        return response()->json($json);
+        return response()->json([
+            'success' => true,
+            'path' => $path
+        ]);
+    }
+
+    public function unzip(Request $request)
+    {
+        $request->validate([
+            'path' => 'required',
+        ]);
+
+        try {
+            $path = Updater::unzip($request->path);
+
+            return response()->json([
+                'success' => true,
+                'path' => $path
+            ]);
+
+        } catch (\Exception $e) {
+            return response()->json([
+                'success' => false,
+                'error' => $e->getMessage()
+            ], 500);
+        }
+    }
+
+    public function copyFiles(Request $request)
+    {
+        $request->validate([
+            'path' => 'required',
+        ]);
+
+        $path = Updater::copyFiles($request->path);
+
+        return response()->json([
+            'success' => true,
+            'path' => $path
+        ]);
+    }
+
+    public function migrate(Request $request)
+    {
+        Updater::migrateUpdate();
+
+        return response()->json([
+            'success' => true
+        ]);
     }
 
     public function finishUpdate(Request $request)
     {
+        $request->validate([
+            'installed' => 'required',
+            'version' => 'required',
+        ]);
+
         $json = Updater::finishUpdate($request->installed, $request->version);
 
         return response()->json($json);
@@ -28,7 +86,7 @@ class UpdateController extends Controller
     {
         set_time_limit(600); // 10 minutes
 
-        $json = Updater::checkForUpdate();
+        $json = Updater::checkForUpdate(Setting::getSetting('version'));
 
         return response()->json($json);
     }

app/Http/Controllers/UsersController.php

@@ -7,6 +7,8 @@ use Crater\User;
 use Crater\Currency;
 use Crater\Setting;
 use Crater\Item;
+use Crater\PaymentMethod;
+use Crater\Unit;
 use Crater\TaxType;
 use DB;
 use Carbon\Carbon;
@@ -46,10 +48,18 @@ class UsersController extends Controller
             $request->header('company')
         );
 
-        $items = Item::all();
+        $items = Item::with('taxes')->get();
 
         $taxTypes = TaxType::latest()->get();
 
+        $paymentMethods = PaymentMethod::whereCompany($request->header('company'))
+            ->latest()
+            ->get();
+
+        $units = Unit::whereCompany($request->header('company'))
+            ->latest()
+            ->get();
+
         return response()->json([
             'user' => $user,
             'customers' => $customers,
@@ -61,6 +71,8 @@ class UsersController extends Controller
             'items' => $items,
             'taxTypes' => $taxTypes,
             'moment_date_format' => $moment_date_format,
+            'paymentMethods' => $paymentMethods,
+            'units' => $units,
             'fiscal_year' => $fiscal_year,
         ]);
     }

app/Http/Requests/EstimatesRequest.php

@@ -25,7 +25,6 @@ class EstimatesRequest extends FormRequest
         $rules = [
             'estimate_date' => 'required',
             'expiry_date' => 'required',
-            'estimate_number' => 'required|unique:estimates,estimate_number',
             'user_id' => 'required',
             'discount' => 'required',
             'discount_val' => 'required',
@@ -41,10 +40,6 @@ class EstimatesRequest extends FormRequest
             'items.*.price' => 'required'
         ];
 
-        if ($this->getMethod() == 'PUT') {
-            $rules['estimate_number'] = $rules['estimate_number'].','.$this->get('id');
-        }
-
         return $rules;
     }
 }

app/Http/Requests/InvoicesRequest.php

@@ -25,7 +25,6 @@ class InvoicesRequest extends FormRequest
         $rules = [
             'invoice_date' => 'required',
             'due_date' => 'required',
-            'invoice_number' => 'required|unique:invoices,invoice_number',
             'user_id' => 'required',
             'discount' => 'required',
             'discount_val' => 'required',
@@ -41,10 +40,6 @@ class InvoicesRequest extends FormRequest
             'items.*.price' => 'required'
         ];
 
-        if ($this->getMethod() == 'PUT') {
-            $rules['invoice_number'] = $rules['invoice_number'].','.$this->get('id');
-        }
-
         return $rules;
     }
 }

app/Http/Requests/MailEnvironmentRequest.php

@@ -40,12 +40,9 @@ class MailEnvironmentRequest extends FormRequest
             case 'mailgun':
                 return [
                     'mail_driver'           => 'required|string',
-                    'mail_host'             => 'required|string',
-                    'mail_port'             => 'required',
                     'mail_mailgun_domain'   => 'required|string',
                     'mail_mailgun_secret'   => 'required|string',
                     'mail_mailgun_endpoint' => 'required|string',
-                    'mail_encryption'       => 'required|string',
                     'from_name'             => 'required|string',
                     'from_mail'             => 'required|string',
                 ];

app/Http/Requests/PaymentMethodRequest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Crater\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class PaymentMethodRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $data = [
+            'name' => 'required|unique:payment_methods,name'
+        ];
+
+        if ($this->getMethod() == 'PUT') {
+            $data['name'] = [
+                'required',
+                Rule::unique('payment_methods')->ignore($this->route('payment_method'), 'id')
+            ];
+        }
+
+        return $data;
+    }
+}

app/Http/Requests/PaymentRequest.php

@@ -24,15 +24,10 @@ class PaymentRequest extends FormRequest
     {
         $rules = [
             'payment_date' => 'required',
-            'payment_number' => 'required|unique:payments,payment_number',
             'user_id' => 'required',
             'amount' => 'required',
         ];
 
-        if ($this->getMethod() == 'PUT') {
-            $rules['payment_number'] = $rules['payment_number'].','.$this->route('payment');
-        }
-
         return $rules;
     }
 }

app/Http/Requests/ProfileRequest.php

@@ -30,7 +30,7 @@ class ProfileRequest extends FormRequest
             case 'POST':
                 return [
                     'name' => 'required',
-                    'password' => 'required',
+                    'password' => 'required|min:8',
                     'address_street_1' => 'max:255',
                     'address_street_2' => 'max:255',
                     'email' => [

app/Http/Requests/UnitRequest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Crater\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+
+class UnitRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $data = [
+            'name' => 'required|unique:units,name'
+        ];
+
+        if ($this->getMethod() == 'PUT') {
+            $data['name'] = [
+                'required',
+                Rule::unique('units')->ignore($this->route('unit'), 'id')
+            ];
+        }
+
+        return $data;
+    }
+}

app/Invoice.php

@@ -66,10 +66,14 @@ class Invoice extends Model
         'formattedDueDate'
     ];
 
-    public static function getNextInvoiceNumber()
+    public static function getNextInvoiceNumber($value)
     {
         // Get the last created order
-        $lastOrder = Invoice::orderBy('created_at', 'desc')->first();
+        $lastOrder = Invoice::where('invoice_number', 'LIKE', $value . '-%')
+                    ->orderBy('created_at', 'desc')
+                    ->first();
+
+
         if (!$lastOrder) {
             // We get here if there is no order at all
             // If there is no number set it to 0, which will be 1 at the end.
@@ -82,7 +86,7 @@ class Invoice extends Model
         // So the substr returns this 000001
 
         // Add the string in front and higher up the number.
-        // the %05d part makes sure that there are always 6 numbers in the string.
+        // the %06d part makes sure that there are always 6 numbers in the string.
         // so it adds the missing zero's when needed.
 
         return sprintf('%06d', intval($number) + 1);
@@ -143,10 +147,15 @@ class Invoice extends Model
 
     public function getInvoiceNumAttribute()
     {
-        $position = $this->strposX($this->invoice_number, "-", 2) + 1;
+        $position = $this->strposX($this->invoice_number, "-", 1) + 1;
         return substr($this->invoice_number, $position);
     }
 
+    public function getInvoicePrefixAttribute () {
+        $prefix = explode("-", $this->invoice_number)[0];
+        return $prefix;
+    }
+
     public function getFormattedCreatedAtAttribute($value)
     {
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $this->company_id);

app/InvoiceItem.php

@@ -30,6 +30,7 @@ class InvoiceItem extends Model
         'price' => 'integer',
         'total' => 'integer',
         'discount' => 'float',
+        'quantity' => 'float',
         'discount_val' => 'integer',
         'tax' => 'integer'
     ];

app/Item.php

@@ -24,19 +24,24 @@ class Item extends Model
         'formattedCreatedAt'
     ];
 
+    public function unit()
+    {
+        return $this->belongsTo(Unit::class);
+    }
+
     public function scopeWhereSearch($query, $search)
     {
-        return $query->where('name', 'LIKE', '%'.$search.'%');
+        return $query->where('items.name', 'LIKE', '%'.$search.'%');
     }
 
     public function scopeWherePrice($query, $price)
     {
-        return $query->where('price', $price);
+        return $query->where('items.price', $price);
     }
 
-    public function scopeWhereUnit($query, $unit)
+    public function scopeWhereUnit($query, $unit_id)
     {
-        return $query->where('unit', $unit);
+        return $query->where('items.unit_id', $unit_id);
     }
 
     public function scopeWhereOrder($query, $orderByField, $orderBy)
@@ -56,8 +61,8 @@ class Item extends Model
             $query->wherePrice($filters->get('price'));
         }
 
-        if ($filters->get('unit')) {
-            $query->whereUnit($filters->get('unit'));
+        if ($filters->get('unit_id')) {
+            $query->whereUnit($filters->get('unit_id'));
         }
 
         if ($filters->get('orderByField') || $filters->get('orderBy')) {
@@ -80,7 +85,7 @@ class Item extends Model
 
     public function scopeWhereCompany($query, $company_id)
     {
-        $query->where('company_id', $company_id);
+        $query->where('items.company_id', $company_id);
     }
 
     public function invoiceItems()

app/Listeners/Updates/Listener.php

@@ -2,6 +2,7 @@
 
 namespace Crater\Listeners\Updates;
 
+// Implementation taken from Akaunting - https://github.com/akaunting/akaunting
 class Listener
 {
     const VERSION = '';
@@ -15,7 +16,7 @@ class Listener
     protected function isListenerFired($event)
     {
         // Do not apply to the same or newer versions
-        if (version_compare(static::VERSION, $event->old, '<')) {
+        if (version_compare(static::VERSION, $event->old, '<=')) {
             return true;
         }
 

app/Listeners/Updates/v2/Version200.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace Crater\Listeners\Updates\v2;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Database\Schema\Blueprint;
+use Crater\Listeners\Updates\Listener;
+use Crater\Events\UpdateFinished;
+use Crater\Setting;
+use Crater\Address;
+
+class Version200 extends Listener
+{
+    const VERSION = '2.0.0';
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        // Replace state and city id to name
+        $this->replaceStateAndCityName();
+
+        // Drop states and cities foreign key
+        $this->dropForeignKey();
+
+        // Remove states and cities tables
+        $this->dropSchemas();
+
+        // Delete state & city models, migrations & seeders
+        $this->deleteFiles();
+
+        // Update Crater app version
+        $this->updateVersion();
+    }
+
+    private function replaceStateAndCityName() {
+        \Schema::table('addresses', function (Blueprint $table) {
+            $table->string('state')->nullable();
+            $table->string('city')->nullable();
+        });
+
+        $addresses = \Crater\Address::all();
+        foreach ($addresses as $add) {
+            $city = \Crater\City::find($add->city_id);
+            if($city) {
+                $add->city = $city->name;
+            }
+
+            $state = \Crater\State::find($add->state_id);
+            if($state) {
+                $add->state = $state->name;
+            }
+
+            $add->save();
+        }
+    }
+
+    private function dropForeignKey() {
+        \Schema::table('addresses', function (Blueprint $table) {
+            $table->dropForeign('addresses_state_id_foreign');
+            $table->dropForeign('addresses_city_id_foreign');
+            $table->dropColumn('state_id');
+            $table->dropColumn('city_id');
+        });
+    }
+
+    private function dropSchemas() {
+        \Schema::disableForeignKeyConstraints();
+
+        \Schema::dropIfExists('states');
+        \Schema::dropIfExists('cities');
+
+        \Schema::enableForeignKeyConstraints();
+    }
+
+    private function deleteFiles() {
+        \File::delete(
+            database_path('migrations/2017_05_06_172817_create_cities_table.php'),
+            database_path('migrations/2017_05_06_173711_create_states_table.php'),
+            database_path('seeds/StatesTableSeeder.php'),
+            database_path('seeds/CitiesTableSeeder.php'),
+            app_path('City.php'),
+            app_path('State.php')
+        );
+    }
+
+    private function updateVersion() {
+        Setting::setSetting('version', static::VERSION);
+    }
+}

app/Listeners/Updates/v2/Version201.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Crater\Listeners\Updates\v2;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Database\Schema\Blueprint;
+use Crater\Events\UpdateFinished;
+use Crater\Listeners\Updates\Listener;
+use Crater\Setting;
+
+class Version201 extends Listener
+{
+    const VERSION = '2.0.1';
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        // Remove the language files
+        $this->removeLanguageFiles();
+
+        // Change estimate & invoice migrations
+        $this->changeMigrations();
+
+        // Update Crater app version
+        Setting::setSetting('version', static::VERSION);
+    }
+
+    private function removeLanguageFiles() {
+        $en = resource_path('assets/js/plugins/en.js');
+        $es = resource_path('assets/js/plugins/es.js');
+        $fr = resource_path('assets/js/plugins/fr.js');
+
+        if(file_exists($en)) {
+            unlink($en);
+        }
+
+        if(file_exists($es)) {
+            unlink($es);
+        }
+
+        if(file_exists($fr)) {
+            unlink($fr);
+        }
+    }
+
+    private function changeMigrations()
+    {
+        \Schema::table('invoices', function (Blueprint $table) {
+            $table->decimal('discount', 15, 2)->nullable()->change();
+        });
+
+        \Schema::table('estimates', function (Blueprint $table) {
+            $table->decimal('discount', 15, 2)->nullable()->change();
+        });
+
+        \Schema::table('invoice_items', function (Blueprint $table) {
+            $table->decimal('quantity', 15, 2)->change();
+            $table->decimal('discount', 15, 2)->nullable()->change();
+        });
+
+        \Schema::table('estimate_items', function (Blueprint $table) {
+            $table->decimal('quantity', 15, 2)->change();
+            $table->decimal('discount', 15, 2)->nullable()->change();
+            $table->unsignedBigInteger('discount_val')->nullable()->change();
+        });
+    }
+}

app/Listeners/Updates/v2/Version202.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Crater\Listeners\Updates\v2;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Crater\Events\UpdateFinished;
+use Crater\Listeners\Updates\Listener;
+use Crater\Setting;
+
+class Version202 extends Listener
+{
+    const VERSION = '2.0.2';
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        // Update Crater app version
+        Setting::setSetting('version', static::VERSION);
+    }
+}

app/Listeners/Updates/v2/Version210.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Crater\Listeners\Updates\v2;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Crater\Events\UpdateFinished;
+use Crater\Listeners\Updates\Listener;
+use Crater\Setting;
+use Crater\CompanySetting;
+
+class Version210 extends Listener
+{
+    const VERSION = '2.1.0';
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        // Add initial auto generate value
+        $this->addAutoGenerateSettings();
+
+        // Update Crater app version
+        Setting::setSetting('version', static::VERSION);
+    }
+
+    private function addAutoGenerateSettings()
+    {
+        $settings = [
+            'invoice_auto_generate' => 'YES',
+            'invoice_prefix' => 'INV',
+            'estimate_prefix' => 'EST',
+            'estimate_auto_generate' => 'YES',
+            'payment_prefix' => 'PAY',
+            'payment_auto_generate' => 'YES'
+        ];
+
+        foreach ($settings as $key => $value) {
+            CompanySetting::setSetting(
+                $key,
+                $value,
+                auth()->user()->company->id
+            );
+        }
+    }
+}

app/Listeners/Updates/v3/Version300.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace Crater\Listeners\Updates\v3;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Crater\Setting;
+use Crater\Unit;
+use Crater\PaymentMethod;
+use Crater\Currency;
+use Crater\Payment;
+use Crater\Item;
+use Crater\User;
+use Crater\Listeners\Updates\Listener;
+use Illuminate\Database\Schema\Blueprint;
+
+class Version300 extends Listener
+{
+    const VERSION = '3.0.0';
+
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     * @return void
+     */
+    public function handle($event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        $this->changeMigrations();
+
+        $this->addSeederData();
+
+        $this->databaseChanges();
+
+        $this->changeMigrations(true);
+
+        Setting::setSetting('version', static::VERSION);
+    }
+
+    public function changeMigrations($removeColumn = false)
+    {
+        if ($removeColumn) {
+            \Schema::table('items', function (Blueprint $table) {
+                $table->dropColumn('unit');
+            });
+
+            \Schema::table('payments', function (Blueprint $table) {
+                $table->dropColumn('payment_mode');
+            });
+
+            return true;
+        }
+
+        \Schema::create('units', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+            $table->timestamps();
+        });
+
+        \Schema::table('items', function (Blueprint $table) {
+            $table->integer('unit_id')->unsigned()->nullable();
+            $table->foreign('unit_id')->references('id')->on('units')->onDelete('cascade');
+        });
+
+        \Schema::create('payment_methods', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->foreign('company_id')->references('id')->on('companies');
+            $table->timestamps();
+        });
+
+        \Schema::table('payments', function (Blueprint $table) {
+            $table->string('unique_hash')->nullable();
+            $table->integer('payment_method_id')->unsigned()->nullable();
+            $table->foreign('payment_method_id')->references('id')->on('payment_methods')->onDelete('cascade');
+        });
+
+        return true;
+    }
+
+    public function addSeederData()
+    {
+        $company_id = User::where('role', 'admin')->first()->company_id;
+
+        Unit::create(['name' => 'box', 'company_id' => $company_id]);
+        Unit::create(['name' => 'cm', 'company_id' => $company_id]);
+        Unit::create(['name' => 'dz', 'company_id' => $company_id]);
+        Unit::create(['name' => 'ft', 'company_id' => $company_id]);
+        Unit::create(['name' => 'g', 'company_id' => $company_id]);
+        Unit::create(['name' => 'in', 'company_id' => $company_id]);
+        Unit::create(['name' => 'kg', 'company_id' => $company_id]);
+        Unit::create(['name' => 'km', 'company_id' => $company_id]);
+        Unit::create(['name' => 'lb', 'company_id' => $company_id]);
+        Unit::create(['name' => 'mg', 'company_id' => $company_id]);
+        Unit::create(['name' => 'pc', 'company_id' => $company_id]);
+
+        PaymentMethod::create(['name' => 'Cash', 'company_id' => $company_id]);
+        PaymentMethod::create(['name' => 'Check', 'company_id' => $company_id]);
+        PaymentMethod::create(['name' => 'Credit Card', 'company_id' => $company_id]);
+        PaymentMethod::create(['name' => 'Bank Transfer', 'company_id' => $company_id]);
+
+        Currency::create([
+            'name' => 'Serbian Dinar',
+            'code' => 'RSD',
+            'symbol' => 'RSD',
+            'precision' => '2',
+            'thousand_separator' => '.',
+            'decimal_separator' => ','
+        ]);
+    }
+
+    public function databaseChanges()
+    {
+        $payments = Payment::all();
+
+        if ($payments) {
+            foreach ($payments as $payment) {
+                $payment->unique_hash = str_random(60);
+                $payment->save();
+
+                $paymentMethod = PaymentMethod::where('name', $payment->payment_mode)
+                    ->first();
+
+                if ($paymentMethod) {
+                    $payment->payment_method_id = $paymentMethod->id;
+                    $payment->save();
+                }
+            }
+        }
+
+        $items = Item::all();
+
+        if ($items) {
+            foreach ($items as $item) {
+                $unit = Unit::where('name', $item->unit)
+                    ->first();
+
+                if ($unit) {
+                    $item->unit_id = $unit->id;
+                    $item->save();
+                }
+            }
+        }
+    }
+}

app/Listeners/Updates/v3/Version310.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Crater\Listeners\Updates\v3;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Crater\Listeners\Updates\Listener;
+use Illuminate\Database\Schema\Blueprint;
+use Crater\Events\UpdateFinished;
+use Crater\Setting;
+use Crater\Currency;
+use Schema;
+use Artisan;
+
+class Version310 extends Listener
+{
+    const VERSION = '3.1.0';
+
+
+    /**
+     * Handle the event.
+     *
+     * @param UpdateFinished $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        Currency::firstOrCreate(
+            [
+                'name' => 'Kyrgyzstani som',
+                'code' => 'KGS'
+            ],
+            [
+                'name' => 'Kyrgyzstani som',
+                'code' => 'KGS',
+                'symbol' => 'С̲ ',
+                'precision' => '2',
+                'thousand_separator' => '.',
+                'decimal_separator' => ','
+            ]
+        );
+
+        Artisan::call('migrate', ['--force' => true]);
+
+        // Update Crater app version
+        Setting::setSetting('version', static::VERSION);
+    }
+}

app/Listeners/Updates/v3/Version311.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Crater\Listeners\Updates\v3;
+
+use Crater\Listeners\Updates\Listener;
+use Crater\Events\UpdateFinished;
+use Crater\Setting;
+use Crater\Currency;
+use Artisan;
+
+class Version311 extends Listener
+{
+    const VERSION = '3.1.1';
+
+    /**
+     * Handle the event.
+     *
+     * @param UpdateFinished $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        if ($this->isListenerFired($event)) {
+            return;
+        }
+
+        Artisan::call('migrate', ['--force' => true]);
+
+        // Update Crater app version
+        Setting::setSetting('version', static::VERSION);
+    }
+}

app/Mail/EstimatePdf.php

@@ -12,17 +12,14 @@ class EstimatePdf extends Mailable
 
     public $data = [];
 
-    public $notificationEmail = '';
-
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($data, $notificationEmail)
+    public function __construct($data)
     {
         $this->data = $data;
-        $this->notificationEmail = $notificationEmail;
     }
 
     /**
@@ -32,6 +29,9 @@ class EstimatePdf extends Mailable
      */
     public function build()
     {
-        return $this->from($this->notificationEmail)->markdown('emails.send.estimate', ['data', $this->data]);
+        $company = $this->data['company']['name'];
+
+        return $this->subject("Estimate from $company")
+                    ->markdown('emails.send.estimate', ['data', $this->data]);
     }
 }

app/Mail/EstimateViewed.php

@@ -31,6 +31,8 @@ class EstimateViewed extends Mailable
     public function build()
     {
         $email = $this->data['user']['email'];
-        return $this->from($email)->markdown('emails.viewed.estimate', ['data', $this->data]);
+        $name = $this->data['user']['name'];
+        return $this->from($email, $name)
+                    ->markdown('emails.viewed.estimate', ['data', $this->data]);
     }
 }

app/Mail/InvoicePdf.php

@@ -6,23 +6,20 @@ use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Contracts\Queue\ShouldQueue;
 
-class invoicePdf extends Mailable
+class InvoicePdf extends Mailable
 {
     use Queueable, SerializesModels;
 
     public $data = [];
 
-    public $notificationEmail = '';
-
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($data, $notificationEmail)
+    public function __construct($data)
     {
         $this->data = $data;
-        $this->notificationEmail = $notificationEmail;
     }
 
     /**
@@ -32,6 +29,9 @@ class invoicePdf extends Mailable
      */
     public function build()
     {
-        return $this->from($this->notificationEmail)->markdown('emails.send.invoice', ['data', $this->data]);
+        $company = $this->data['company']['name'];
+
+        return $this->subject("Invoice from $company")
+                    ->markdown('emails.send.invoice', ['data', $this->data]);
     }
 }

app/Mail/InvoiceViewed.php

@@ -31,6 +31,8 @@ class InvoiceViewed extends Mailable
     public function build()
     {
         $email = $this->data['user']['email'];
-        return $this->from($email)->markdown('emails.viewed.invoice', ['data', $this->data]);
+        $name = $this->data['user']['name'];
+        return $this->from($email, $name)
+                    ->markdown('emails.viewed.invoice', ['data', $this->data]);
     }
 }

app/Mail/PaymentPdf.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Crater\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class PaymentPdf extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $data = [];
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        $company = $this->data['company']['name'];
+
+        return $this->subject("Payment from $company")
+                    ->markdown('emails.send.payment', ['data', $this->data]);
+    }
+}

app/Mail/TestMail.php

@@ -0,0 +1,38 @@
+<?php
+namespace Crater\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class TestMail extends Mailable
+{
+    use Queueable, SerializesModels;
+    public $subject;
+    public $message;
+
+    /**
+     * Create a new message instance.
+     *
+     * @param $subject
+     * @param $message
+     */
+    public function __construct($subject, $message)
+    {
+        $this->subject = $subject;
+        $this->message = $message;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->subject($this->subject)->markdown('emails.test')->with([
+            'my_message' => $this->message
+        ]);
+    }
+}

app/Payment.php

@@ -5,6 +5,7 @@ use Crater\User;
 use Crater\Invoice;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
+use Crater\PaymentMethod;
 
 class Payment extends Model
 {
@@ -19,9 +20,11 @@ class Payment extends Model
     protected $fillable = [
         'user_id',
         'invoice_id',
+        'payment_method_id',
         'payment_date',
         'company_id',
         'notes',
+        'unique_hash',
         'payment_number',
         'payment_mode',
         'amount'
@@ -32,10 +35,34 @@ class Payment extends Model
         'formattedPaymentDate'
     ];
 
-    public static function getNextPaymentNumber()
+
+    private function strposX($haystack, $needle, $number)
+    {
+        if ($number == '1') {
+            return strpos($haystack, $needle);
+        } elseif ($number > '1') {
+            return strpos(
+                $haystack,
+                $needle,
+                $this->strposX($haystack, $needle, $number - 1) + strlen($needle)
+            );
+        } else {
+            return error_log('Error: Value for parameter $number is out of range');
+        }
+    }
+
+    public function getPaymentNumAttribute()
+    {
+        $position = $this->strposX($this->payment_number, "-", 1) + 1;
+        return substr($this->payment_number, $position);
+    }
+
+    public static function getNextPaymentNumber($value)
     {
         // Get the last created order
-        $payment = Payment::orderBy('created_at', 'desc')->first();
+        $payment = Payment::where('payment_number', 'LIKE', $value . '-%')
+                    ->orderBy('created_at', 'desc')
+                    ->first();
         if (!$payment) {
             // We get here if there is no order at all
             // If there is no number set it to 0, which will be 1 at the end.
@@ -54,6 +81,12 @@ class Payment extends Model
         return sprintf('%06d', intval($number) + 1);
     }
 
+    public function getPaymentPrefixAttribute ()
+    {
+        $prefix= explode("-",$this->payment_number)[0];
+        return $prefix;
+    }
+
     public function invoice()
     {
         return $this->belongsTo(Invoice::class);
@@ -64,6 +97,11 @@ class Payment extends Model
         return $this->belongsTo(User::class);
     }
 
+    public function paymentMethod()
+    {
+        return $this->belongsTo(PaymentMethod::class);
+    }
+
     public function getFormattedCreatedAtAttribute($value)
     {
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $this->company_id);
@@ -92,9 +130,9 @@ class Payment extends Model
         return $query->where('payments.payment_number', 'LIKE', '%'.$paymentNumber.'%');
     }
 
-    public function scopePaymentMode($query, $paymentMode)
+    public function scopePaymentMethod($query, $paymentMethodId)
     {
-        return $query->where('payments.payment_mode', $paymentMode);
+        return $query->where('payments.payment_method_id', $paymentMethodId);
     }
 
     public function scopeApplyFilters($query, array $filters)
@@ -109,8 +147,8 @@ class Payment extends Model
             $query->paymentNumber($filters->get('payment_number'));
         }
 
-        if ($filters->get('payment_mode')) {
-            $query->paymentMode($filters->get('payment_mode'));
+        if ($filters->get('payment_method_id')) {
+            $query->paymentMethod($filters->get('payment_method_id'));
         }
 
         if ($filters->get('customer_id')) {

app/PaymentMethod.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Crater;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentMethod extends Model
+{
+    protected $fillable = ['name', 'company_id'];
+
+    public function payments()
+    {
+        return $this->hasMany(Payment::class);
+    }
+
+    public function company()
+    {
+        return $this->belongsTo(Company::class);
+    }
+
+    public function scopeWhereCompany($query, $company_id)
+    {
+        $query->where('company_id', $company_id);
+    }
+}

app/Providers/EventServiceProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Providers;
 
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -6,6 +7,13 @@ use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Crater\Events\UpdateFinished;
 use Crater\Listeners\Updates\v1\Version110;
+use Crater\Listeners\Updates\v2\Version200;
+use Crater\Listeners\Updates\v2\Version201;
+use Crater\Listeners\Updates\v2\Version202;
+use Crater\Listeners\Updates\v2\Version210;
+use Crater\Listeners\Updates\v3\Version300;
+use Crater\Listeners\Updates\v3\Version310;
+use Crater\Listeners\Updates\v3\Version311;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -15,8 +23,15 @@ class EventServiceProvider extends ServiceProvider
      * @var array
      */
     protected $listen = [
-        UpdateFinished::class=> [
+        UpdateFinished::class => [
             Version110::class,
+            Version200::class,
+            Version201::class,
+            Version202::class,
+            Version210::class,
+            Version300::class,
+            Version310::class,
+            Version311::class,
         ],
         Registered::class => [
             SendEmailVerificationNotification::class,

app/Space/EnvironmentManager.php

@@ -38,7 +38,7 @@ class EnvironmentManager
             'DB_PORT='.config('database.connections.'.config('database.default').'.port')."\n".
             'DB_DATABASE='.config('database.connections.'.config('database.default').'.database')."\n".
             'DB_USERNAME='.config('database.connections.'.config('database.default').'.username')."\n".
-            'DB_PASSWORD='.config('database.connections.'.config('database.default').'.password')."\n\n";
+            'DB_PASSWORD="'.config('database.connections.'.config('database.default').'.password')."\"\n\n";
 
         $newDatabaseData =
             'DB_CONNECTION='.$request->database_connection."\n".
@@ -46,19 +46,23 @@ class EnvironmentManager
             'DB_PORT='.$request->database_port."\n".
             'DB_DATABASE='.$request->database_name."\n".
             'DB_USERNAME='.$request->database_username."\n".
-            'DB_PASSWORD='.$request->database_password."\n\n";
+            'DB_PASSWORD="'.$request->database_password."\"\n\n";
 
-        if (! $this->checkDatabaseConnection($request)) {
+        try {
+
+            $this->checkDatabaseConnection($request);
 
-            return [
-                'error' => 'connection_failed'
-            ];
-        } else {
             if(\Schema::hasTable('users') ) {
                 return [
                     'error' => 'database_should_be_empty'
                 ];
             }
+
+        } catch (Exception $e) {
+
+            return [
+                'error_message' => $e->getMessage()
+            ];
         }
 
         try {
@@ -118,8 +122,6 @@ class EnvironmentManager
                 );
             }
 
-
-
         } catch (Exception $e) {
             return [
                 'error' => 'mail_variables_save_error'
@@ -316,12 +318,6 @@ class EnvironmentManager
             ],
         ]);
 
-        try {
-            DB::connection()->getPdo();
-
-            return true;
-        } catch (Exception $e) {
-            return false;
-        }
+        return DB::connection()->getPdo();
     }
 }

app/Space/SiteApi.php

@@ -6,6 +6,7 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Exception\RequestException;
 use Crater\Setting;
 
+// Implementation taken from Akaunting - https://github.com/akaunting/akaunting
 trait SiteApi
 {
 

app/Space/Updater.php

@@ -2,24 +2,45 @@
 namespace Crater\Space;
 
 use File;
-use ZipArchive;
 use Artisan;
 use GuzzleHttp\Exception\RequestException;
-use Crater\Space\SiteApi;
 use Crater\Events\UpdateFinished;
-use Crater\Setting;
-use Illuminate\Http\Request;
+use ZipArchive;
 
+// Implementation taken from Akaunting - https://github.com/akaunting/akaunting
 class Updater
 {
     use SiteApi;
 
-    public static function update($installed, $version)
+    public static function checkForUpdate($installed_version)
+    {
+        $data = null;
+        if(env('APP_ENV') === 'development')
+        {
+            $url = 'https://craterapp.com/downloads/check/latest/'. $installed_version . '?type=update&is_dev=1';
+        } else {
+            $url = 'https://craterapp.com/downloads/check/latest/'. $installed_version . '?type=update';
+        }
+
+        $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
+
+        if ($response && ($response->getStatusCode() == 200)) {
+            $data = $response->getBody()->getContents();
+        }
+
+        return json_decode($data);
+    }
+
+    public static function download($new_version)
     {
         $data = null;
         $path = null;
 
-        $url = 'https://craterapp.com/downloads/file/'.$version.'?type=update';
+        if (env('APP_ENV') === 'development') {
+            $url = 'https://craterapp.com/downloads/file/' . $new_version . '?type=update&is_dev=1';
+        } else {
+            $url = 'https://craterapp.com/downloads/file/' . $new_version . '?type=update';
+        }
 
         $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
 
@@ -39,66 +60,68 @@ class Updater
         }
 
         // Create temp directory
-        $path = 'temp-' . md5(mt_rand());
-        $path2 = 'temp2-' . md5(mt_rand());
-        $temp_path = storage_path('app') . '/' . $path;
-        $temp_path2 = storage_path('app') . '/' . $path2;
+        $temp_dir = storage_path('app/temp-' . md5(mt_rand()));
 
-        if (!File::isDirectory($temp_path)) {
-            File::makeDirectory($temp_path);
-            File::makeDirectory($temp_path2);
+        if (!File::isDirectory($temp_dir)) {
+            File::makeDirectory($temp_dir);
         }
 
-        try {
+        $zip_file_path = $temp_dir . '/upload.zip';
 
-            $file = $temp_path . '/upload.zip';
+        // Add content to the Zip file
+        $uploaded = is_int(file_put_contents($zip_file_path, $data)) ? true : false;
 
-            // Add content to the Zip file
-            $uploaded = is_int(file_put_contents($file, $data)) ? true : false;
-
-            if (!$uploaded) {
-                return false;
-            }
-
-            // Unzip the file
-            $zip = new ZipArchive();
-
-            if ($zip->open($file)) {
-                $zip->extractTo($temp_path2);
-            }
-
-            $zip->close();
-
-            // Delete zip file
-            File::delete($file);
-
-            if (!File::copyDirectory($temp_path2.'/Crater', base_path())) {
-                return false;
-            }
-
-            // Delete temp directory
-            File::deleteDirectory($temp_path);
-            File::deleteDirectory($temp_path2);
-
-            return [
-                'success' => true,
-                'error' => false,
-                'data' => []
-            ];
-        } catch (\Exception $e) {
-
-            if (File::isDirectory($temp_path)) {
-                // Delete temp directory
-                File::deleteDirectory($temp_path);
-                File::deleteDirectory($temp_path2);
-            }
-
-            return [
-                'success' => false,
-                'error' => 'Update error',
-                'data' => []
-            ];
+        if (!$uploaded) {
+            return false;
         }
+
+        return $zip_file_path;
+    }
+
+    public static function unzip($zip_file_path)
+    {
+        if(!file_exists($zip_file_path)) {
+            throw new \Exception('Zip file not found');
+        }
+
+        $temp_extract_dir = storage_path('app/temp2-' . md5(mt_rand()));
+
+        if (!File::isDirectory($temp_extract_dir)) {
+            File::makeDirectory($temp_extract_dir);
+        }
+        // Unzip the file
+        $zip = new ZipArchive();
+
+        if ($zip->open($zip_file_path)) {
+            $zip->extractTo($temp_extract_dir);
+        }
+
+        $zip->close();
+
+        // Delete zip file
+        File::delete($zip_file_path);
+
+        return $temp_extract_dir;
+    }
+
+    public static function copyFiles($temp_extract_dir)
+    {
+
+        if (!File::copyDirectory($temp_extract_dir . '/Crater', base_path())) {
+            return false;
+        }
+
+        // Delete temp directory
+        File::deleteDirectory($temp_extract_dir);
+
+        return true;
+    }
+
+    public static function migrateUpdate()
+    {
+        Artisan::call('migrate --force');
+
+        return true;
     }
 
     public static function finishUpdate($installed, $version)
@@ -112,17 +135,4 @@ class Updater
         ];
     }
 
-    public static function checkForUpdate()
-    {
-        $data = null;
-        $url = 'https://craterapp.com/downloads/check/latest/'. Setting::getSetting('version') . '?type=update';
-
-        $response = static::getRemote($url, ['timeout' => 100, 'track_redirects' => true]);
-
-        if ($response && ($response->getStatusCode() == 200)) {
-            $data = $response->getBody()->getContents();
-        }
-
-        return json_decode($data);
-    }
 }

app/Space/helpers.php

@@ -41,10 +41,14 @@ function clean_slug($string)
  * @param $money
  * @return formated_money
  */
-function format_money_pdf($money)
+function format_money_pdf($money, $currency = null)
 {
     $money = $money / 100;
-    $currency = Currency::findOrFail(CompanySetting::getSetting('currency', 1));
+
+    if (!$currency) {
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', 1));
+    }
+
     $format_money = number_format(
         $money,
         $currency->precision,

app/State.php

@@ -1,25 +0,0 @@
-<?php
-namespace Crater;
-
-use Illuminate\Database\Eloquent\Model;
-use Crater\City;
-use Crater\Country;
-use Crater\Address;
-
-class State extends Model
-{
-    public function cities()
-    {
-        return $this->hasMany(City::class);
-    }
-
-    public function country()
-    {
-        return $this->belongsTo(Country::class);
-    }
-
-    public function address()
-    {
-        return $this->hasMany(Address::class);
-    }
-}

app/Unit.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Crater;
+
+use Illuminate\Database\Eloquent\Model;
+use Crater\Item;
+
+class Unit extends Model
+{
+    protected $fillable = ['name', 'company_id'];
+
+    public function items()
+    {
+        return $this->hasMany(Item::class);
+    }
+
+    public function company()
+    {
+        return $this->belongsTo(Company::class);
+    }
+
+    public function scopeWhereCompany($query, $company_id)
+    {
+        $query->where('company_id', $company_id);
+    }
+}

app/User.php

@@ -9,6 +9,7 @@ use carbon\carbon;
 use Crater\MemberLoan;
 use Crater\Address;
 use Crater\Payment;
+use Crater\Expense;
 use Crater\Company;
 use Crater\Notifications\MailResetPasswordNotification;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
@@ -105,6 +106,11 @@ class User extends Authenticatable implements HasMedia
         return $this->hasMany(Address::class);
     }
 
+    public function expenses()
+    {
+        return $this->hasMany(Expense::class);
+    }
+
     public function billingAddress()
     {
         return $this->hasOne(Address::class)->where('type', Address::BILLING_TYPE);

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "laravel/laravel",
-    "description": "The Laravel Framework.",
+    "name": "bytefury/crater",
+    "description": "Free & Open Source Invoice App for Freelancers & Small Businesses. https://craterapp.com",
     "keywords": [
         "framework",
         "laravel"
@@ -9,7 +9,9 @@
     "type": "project",
     "require": {
         "php": "^7.2",
+        "aws/aws-sdk-php": "^3.137",
         "barryvdh/laravel-dompdf": "^0.8.1",
+        "doctrine/dbal": "^2.10",
         "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^6.3",
         "intervention/image": "^2.3",

config/app.php

@@ -1,4 +1,4 @@
- <?php
+<?php
 
 return [
 

config/crater.php

@@ -9,6 +9,6 @@ return [
     |
     */
 
-    'version' => '1.1.0',
+    'version' => '3.1.1',
 
 ];

config/database.php

@@ -51,7 +51,7 @@ return [
             'collation' => 'utf8_unicode_ci',
             'prefix' => '',
             'prefix_indexes' => true,
-            'strict' => true,
+            'strict' => false,
             'engine' => null,
         ],
 

config/dompdf.php

@@ -0,0 +1,244 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Settings
+    |--------------------------------------------------------------------------
+    |
+    | Set some default values. It is possible to add all defines that can be set
+    | in dompdf_config.inc.php. You can also override the entire config file.
+    |
+    */
+    'show_warnings' => false,   // Throw an Exception on warnings from dompdf
+    'orientation' => 'portrait',
+    'defines' => array(
+        /**
+         * The location of the DOMPDF font directory
+         *
+         * The location of the directory where DOMPDF will store fonts and font metrics
+         * Note: This directory must exist and be writable by the webserver process.
+         * *Please note the trailing slash.*
+         *
+         * Notes regarding fonts:
+         * Additional .afm font metrics can be added by executing load_font.php from command line.
+         *
+         * Only the original "Base 14 fonts" are present on all pdf viewers. Additional fonts must
+         * be embedded in the pdf file or the PDF may not display correctly. This can significantly
+         * increase file size unless font subsetting is enabled. Before embedding a font please
+         * review your rights under the font license.
+         *
+         * Any font specification in the source HTML is translated to the closest font available
+         * in the font directory.
+         *
+         * The pdf standard "Base 14 fonts" are:
+         * Courier, Courier-Bold, Courier-BoldOblique, Courier-Oblique,
+         * Helvetica, Helvetica-Bold, Helvetica-BoldOblique, Helvetica-Oblique,
+         * Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic,
+         * Symbol, ZapfDingbats.
+         */
+        "font_dir" => storage_path('fonts/'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
+
+        /**
+         * The location of the DOMPDF font cache directory
+         *
+         * This directory contains the cached font metrics for the fonts used by DOMPDF.
+         * This directory can be the same as DOMPDF_FONT_DIR
+         *
+         * Note: This directory must exist and be writable by the webserver process.
+         */
+        "font_cache" => storage_path('fonts/'),
+
+        /**
+         * The location of a temporary directory.
+         *
+         * The directory specified must be writeable by the webserver process.
+         * The temporary directory is required to download remote images and when
+         * using the PFDLib back end.
+         */
+        "temp_dir" => sys_get_temp_dir(),
+
+        /**
+         * ==== IMPORTANT ====
+         *
+         * dompdf's "chroot": Prevents dompdf from accessing system files or other
+         * files on the webserver.  All local files opened by dompdf must be in a
+         * subdirectory of this directory.  DO NOT set it to '/' since this could
+         * allow an attacker to use dompdf to read any files on the server.  This
+         * should be an absolute path.
+         * This is only checked on command line call by dompdf.php, but not by
+         * direct class use like:
+         * $dompdf = new DOMPDF();	$dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
+         */
+        "chroot" => realpath(base_path()),
+
+        /**
+         * Whether to enable font subsetting or not.
+         */
+        "enable_font_subsetting" => false,
+
+        /**
+         * The PDF rendering backend to use
+         *
+         * Valid settings are 'PDFLib', 'CPDF' (the bundled R&OS PDF class), 'GD' and
+         * 'auto'. 'auto' will look for PDFLib and use it if found, or if not it will
+         * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link
+         * Canvas_Factory} ultimately determines which rendering class to instantiate
+         * based on this setting.
+         *
+         * Both PDFLib & CPDF rendering backends provide sufficient rendering
+         * capabilities for dompdf, however additional features (e.g. object,
+         * image and font support, etc.) differ between backends.  Please see
+         * {@link PDFLib_Adapter} for more information on the PDFLib backend
+         * and {@link CPDF_Adapter} and lib/class.pdf.php for more information
+         * on CPDF. Also see the documentation for each backend at the links
+         * below.
+         *
+         * The GD rendering backend is a little different than PDFLib and
+         * CPDF. Several features of CPDF and PDFLib are not supported or do
+         * not make any sense when creating image files.  For example,
+         * multiple pages are not supported, nor are PDF 'objects'.  Have a
+         * look at {@link GD_Adapter} for more information.  GD support is
+         * experimental, so use it at your own risk.
+         *
+         * @link http://www.pdflib.com
+         * @link http://www.ros.co.nz/pdf
+         * @link http://www.php.net/image
+         */
+        "pdf_backend" => "CPDF",
+
+        /**
+         * PDFlib license key
+         *
+         * If you are using a licensed, commercial version of PDFlib, specify
+         * your license key here.  If you are using PDFlib-Lite or are evaluating
+         * the commercial version of PDFlib, comment out this setting.
+         *
+         * @link http://www.pdflib.com
+         *
+         * If pdflib present in web server and auto or selected explicitely above,
+         * a real license code must exist!
+         */
+        //"DOMPDF_PDFLIB_LICENSE" => "your license key here",
+
+        /**
+         * html target media view which should be rendered into pdf.
+         * List of types and parsing rules for future extensions:
+         * http://www.w3.org/TR/REC-html40/types.html
+         *   screen, tty, tv, projection, handheld, print, braille, aural, all
+         * Note: aural is deprecated in CSS 2.1 because it is replaced by speech in CSS 3.
+         * Note, even though the generated pdf file is intended for print output,
+         * the desired content might be different (e.g. screen or projection view of html file).
+         * Therefore allow specification of content here.
+         */
+        "default_media_type" => "screen",
+
+        /**
+         * The default paper size.
+         *
+         * North America standard is "letter"; other countries generally "a4"
+         *
+         * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.)
+         */
+        "default_paper_size" => "a4",
+
+        /**
+         * The default font family
+         *
+         * Used if no suitable fonts can be found. This must exist in the font folder.
+         * @var string
+         */
+        "default_font" => "DejaVu Sans",
+
+        /**
+         * Image DPI setting
+         *
+         * This setting determines the default DPI setting for images and fonts.  The
+         * DPI may be overridden for inline images by explictly setting the
+         * image's width & height style attributes (i.e. if the image's native
+         * width is 600 pixels and you specify the image's width as 72 points,
+         * the image will have a DPI of 600 in the rendered PDF.  The DPI of
+         * background images can not be overridden and is controlled entirely
+         * via this parameter.
+         *
+         * For the purposes of DOMPDF, pixels per inch (PPI) = dots per inch (DPI).
+         * If a size in html is given as px (or without unit as image size),
+         * this tells the corresponding size in pt.
+         * This adjusts the relative sizes to be similar to the rendering of the
+         * html page in a reference browser.
+         *
+         * In pdf, always 1 pt = 1/72 inch
+         *
+         * Rendering resolution of various browsers in px per inch:
+         * Windows Firefox and Internet Explorer:
+         *   SystemControl->Display properties->FontResolution: Default:96, largefonts:120, custom:?
+         * Linux Firefox:
+         *   about:config *resolution: Default:96
+         *   (xorg screen dimension in mm and Desktop font dpi settings are ignored)
+         *
+         * Take care about extra font/image zoom factor of browser.
+         *
+         * In images, <img> size in pixel attribute, img css style, are overriding
+         * the real image dimension in px for rendering.
+         *
+         * @var int
+         */
+        "dpi" => 96,
+
+        /**
+         * Enable inline PHP
+         *
+         * If this setting is set to true then DOMPDF will automatically evaluate
+         * inline PHP contained within <script type="text/php"> ... </script> tags.
+         *
+         * Enabling this for documents you do not trust (e.g. arbitrary remote html
+         * pages) is a security risk.  Set this option to false if you wish to process
+         * untrusted documents.
+         *
+         * @var bool
+         */
+        "enable_php" => false,
+
+        /**
+         * Enable inline Javascript
+         *
+         * If this setting is set to true then DOMPDF will automatically insert
+         * JavaScript code contained within <script type="text/javascript"> ... </script> tags.
+         *
+         * @var bool
+         */
+        "enable_javascript" => true,
+
+        /**
+         * Enable remote file access
+         *
+         * If this setting is set to true, DOMPDF will access remote sites for
+         * images and CSS files as required.
+         * This is required for part of test case www/test/image_variants.html through www/examples.php
+         *
+         * Attention!
+         * This can be a security risk, in particular in combination with DOMPDF_ENABLE_PHP and
+         * allowing remote access to dompdf.php or on allowing remote html code to be passed to
+         * $dompdf = new DOMPDF(, $dompdf->load_html(...,
+         * This allows anonymous users to download legally doubtful internet content which on
+         * tracing back appears to being downloaded by your server, or allows malicious php code
+         * in remote html pages to be executed by your server with your account privileges.
+         *
+         * @var bool
+         */
+        "enable_remote" => true,
+
+        /**
+         * A ratio applied to the fonts height to be more like browsers' line height
+         */
+        "font_height_ratio" => 1.1,
+
+        /**
+         * Use the more-than-experimental HTML5 Lib parser
+         */
+        "enable_html5_parser" => true,
+    ),
+
+
+);

database/factories/AddressFactory.php

@@ -10,9 +10,9 @@ $factory->define(Address::class, function (Faker $faker) {
         'name' => $faker->name,
         'address_street_1' => $faker->streetAddress,
         'address_street_2' => $faker->streetAddress,
-        'city_id' => 5909,
-        'state_id' => 42,
-        'country_id' => 1,
+        'city' => $faker->city,
+        'state' => $faker->state,
+        'country_id' => 231,
         'zip' => $faker->postcode,
         'phone' => $faker->phoneNumber,
         'fax' => $faker->phoneNumber,

database/migrations/2017_04_11_064308_create_units_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUnitsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable('units')) {
+            Schema::create('units', function (Blueprint $table) {
+                $table->increments('id');
+                $table->string('name');
+                $table->integer('company_id')->unsigned()->nullable();
+                $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+                $table->timestamps();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('units');
+    }
+}

database/migrations/2017_04_11_081227_create_items_table.php

@@ -21,6 +21,8 @@ class CreateItemsTable extends Migration
             $table->unsignedBigInteger('price');
             $table->integer('company_id')->unsigned()->nullable();
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+            $table->integer('unit_id')->unsigned()->nullable();
+            $table->foreign('unit_id')->references('id')->on('units')->onDelete('cascade');
             $table->timestamps();
         });
     }

database/migrations/2017_04_12_090759_create_invoices_table.php

@@ -25,7 +25,7 @@ class CreateInvoicesTable extends Migration
             $table->string('discount_per_item');
             $table->text('notes')->nullable();
             $table->string('discount_type')->nullable();
-            $table->unsignedBigInteger('discount')->nullable();
+            $table->decimal('discount', 15, 2)->nullable();
             $table->unsignedBigInteger('discount_val')->nullable();
             $table->unsignedBigInteger('sub_total');
             $table->unsignedBigInteger('total');

database/migrations/2017_04_12_091015_create_invoice_items_table.php

@@ -18,10 +18,10 @@ class CreateInvoiceItemsTable extends Migration
             $table->string('name');
             $table->string('description')->nullable();
             $table->string('discount_type');
-            $table->unsignedBigInteger('quantity');
             $table->unsignedBigInteger('price');
+            $table->decimal('quantity', 15, 2);
+            $table->decimal('discount', 15, 2)->nullable();
             $table->unsignedBigInteger('discount_val');
-            $table->unsignedBigInteger('discount');
             $table->unsignedBigInteger('tax');
             $table->unsignedBigInteger('total');
             $table->integer('invoice_id')->unsigned();

database/migrations/2017_05_05_055609_create_estimates_table.php

@@ -23,8 +23,8 @@ class CreateEstimatesTable extends Migration
             $table->string('tax_per_item');
             $table->string('discount_per_item');
             $table->string('notes')->nullable();
+            $table->decimal('discount', 15, 2)->nullable();
             $table->string('discount_type')->nullable();
-            $table->unsignedBigInteger('discount')->nullable();
             $table->unsignedBigInteger('discount_val')->nullable();
             $table->unsignedBigInteger('sub_total');
             $table->unsignedBigInteger('total');

database/migrations/2017_05_06_172817_create_cities_table.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateCitiesTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-       Schema::create('cities', function (Blueprint $table) {
-        $table->engine = 'InnoDB';
-        $table->increments('id')->index();
-        $table->string('name');
-        $table->integer('state_id');            
-    });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('cities');
-    }
-}

database/migrations/2017_05_06_173711_create_states_table.php

@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateStatesTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('states', function (Blueprint $table) {
-            $table->increments('id')->index();
-            $table->string('name');
-            $table->integer('country_id');            
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('states');
-    }
-}

database/migrations/2017_10_02_123501_create_estimate_items_table.php

@@ -18,9 +18,9 @@ class CreateEstimateItemsTable extends Migration
             $table->string('name');
             $table->string('description')->nullable();
             $table->string('discount_type');
-            $table->unsignedBigInteger('quantity');
-            $table->unsignedBigInteger('discount');
-            $table->unsignedBigInteger('discount_val');
+            $table->decimal('quantity', 15, 2);
+            $table->decimal('discount', 15, 2)->nullable();
+            $table->unsignedBigInteger('discount_val')->nullable();
             $table->unsignedBigInteger('price');
             $table->unsignedBigInteger('tax');
             $table->unsignedBigInteger('total');

database/migrations/2018_11_02_133825_create_ expense_categories_table.php

@@ -30,6 +30,6 @@ class CreateExpenseCategoriesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('expenses_categories');
+        Schema::dropIfExists('expense_categories');
     }
 }

database/migrations/2019_08_30_072639_create_addresses_table.php

@@ -18,10 +18,8 @@ class CreateAddressesTable extends Migration
             $table->string('name')->nullable();
             $table->string('address_street_1')->nullable();
             $table->string('address_street_2')->nullable();
-            $table->integer('city_id')->unsigned()->nullable();
-            $table->foreign('city_id')->references('id')->on('cities');
-            $table->integer('state_id')->unsigned()->nullable();
-            $table->foreign('state_id')->references('id')->on('states');
+            $table->string('city')->nullable();
+            $table->string('state')->nullable();
             $table->integer('country_id')->unsigned()->nullable();
             $table->foreign('country_id')->references('id')->on('countries');
             $table->string('zip')->nullable();
@@ -41,6 +39,6 @@ class CreateAddressesTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('address');
+        Schema::dropIfExists('addresses');
     }
 }

database/migrations/2019_09_02_053155_create_payment_methods_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePaymentMethodsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        if (!Schema::hasTable('payment_methods')) {
+            Schema::create('payment_methods', function (Blueprint $table) {
+                $table->increments('id');
+                $table->string('name');
+                $table->integer('company_id')->unsigned()->nullable();
+                $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+                $table->timestamps();
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('payment_methods');
+    }
+}

database/migrations/2019_09_03_135234_create_payments_table.php

@@ -16,16 +16,18 @@ class CreatePaymentsTable extends Migration
         Schema::create('payments', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('payment_number');
-            $table->string('payment_mode')->nullable();
             $table->date('payment_date');
             $table->text('notes')->nullable();
             $table->unsignedBigInteger('amount');
+            $table->string('unique_hash')->nullable();
             $table->integer('user_id')->unsigned();
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->integer('invoice_id')->unsigned()->nullable();
             $table->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
             $table->integer('company_id')->unsigned()->nullable();
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+            $table->integer('payment_method_id')->unsigned()->nullable();
+            $table->foreign('payment_method_id')->references('id')->on('payment_methods')->onDelete('cascade');
             $table->timestamps();
         });
     }

database/migrations/2019_09_14_120124_create_media_table.php

@@ -20,9 +20,9 @@ class CreateMediaTable extends Migration
             $table->string('mime_type')->nullable();
             $table->string('disk');
             $table->unsignedInteger('size');
-            $table->json('manipulations');
-            $table->json('custom_properties');
-            $table->json('responsive_images');
+            $table->text('manipulations');
+            $table->text('custom_properties');
+            $table->text('responsive_images');
             $table->unsignedInteger('order_column')->nullable();
             $table->nullableTimestamps();
         });

database/migrations/2020_05_12_154129_add_user_id_to_expenses_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUserIdToExpensesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('expenses', function (Blueprint $table) {
+            $table->integer('user_id')->unsigned()->nullable();
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('expenses', function (Blueprint $table) {
+            $table->dropColumn('paid');
+        });
+    }
+}

database/seeds/CurrenciesTableSeeder.php

@@ -524,6 +524,22 @@ class CurrenciesTableSeeder extends Seeder
                 'thousand_separator' => '.',
                 'decimal_separator' => ','
             ],
+            [
+                'name' => 'Serbian Dinar',
+                'code' => 'RSD',
+                'symbol' => 'RSD',
+                'precision' => '2',
+                'thousand_separator' => '.',
+                'decimal_separator' => ','
+            ],
+            [
+                'name' => 'Kyrgyzstani som',
+                'code' => 'KGS',
+                'symbol' => 'С̲ ',
+                'precision' => '2',
+                'thousand_separator' => '.',
+                'decimal_separator' => ','
+            ],
         ];
 
         foreach ($currencies as $currency) {

database/seeds/DatabaseSeeder.php

@@ -14,8 +14,6 @@ class DatabaseSeeder extends Seeder
         $this->call(CurrenciesTableSeeder::class);
         $this->call(RoleSeeder::class);
         $this->call(CountriesTableSeeder::class);
-        $this->call(StatesTableSeeder::class);
-        $this->call(CitiesTableSeeder::class);
         $this->call(EstimateTemplateSeeder::class);
         $this->call(InvoiceTemplateSeeder::class);
     }

database/seeds/PaymentMethodSeeder.php

@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use Crater\PaymentMethod;
+
+class PaymentMethodSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        PaymentMethod::create(['name' => 'Cash', 'company_id' => 1]);
+        PaymentMethod::create(['name' => 'Check', 'company_id' => 1]);
+        PaymentMethod::create(['name' => 'Credit Card', 'company_id' => 1]);
+        PaymentMethod::create(['name' => 'Bank Transfer', 'company_id' => 1]);
+    }
+}

database/seeds/UnitSeeder.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use Crater\Unit;
+
+class UnitSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        Unit::create(['name' => 'box', 'company_id' => 1]);
+        Unit::create(['name' => 'cm', 'company_id' => 1]);
+        Unit::create(['name' => 'dz', 'company_id' => 1]);
+        Unit::create(['name' => 'ft', 'company_id' => 1]);
+        Unit::create(['name' => 'g', 'company_id' => 1]);
+        Unit::create(['name' => 'in', 'company_id' => 1]);
+        Unit::create(['name' => 'kg', 'company_id' => 1]);
+        Unit::create(['name' => 'km', 'company_id' => 1]);
+        Unit::create(['name' => 'lb', 'company_id' => 1]);
+        Unit::create(['name' => 'mg', 'company_id' => 1]);
+        Unit::create(['name' => 'pc', 'company_id' => 1]);
+    }
+}

docker-compose.yml

@@ -0,0 +1,50 @@
+version: '3.7'
+
+services:
+  app:
+    build:
+      args:
+        user: crater-user
+        uid: 1000
+      context: ./
+      dockerfile: Dockerfile
+    image: crater-php
+    restart: unless-stopped
+    working_dir: /var/www/
+    volumes:
+      - ./:/var/www
+    networks:
+      - crater
+
+  db:
+    image: mariadb
+    restart: always
+    volumes:
+      - db:/var/lib/mysql
+    environment:
+      MYSQL_USER: crater
+      MYSQL_PASSWORD: crater
+      MYSQL_DATABASE: crater
+      MYSQL_ROOT_PASSWORD: crater
+    ports:
+      - '33006:3306'
+    networks:
+      - crater
+
+  nginx:
+    image: nginx:1.17-alpine
+    restart: unless-stopped
+    ports:
+      - 80:80
+    volumes:
+      - ./:/var/www
+      - ./docker-compose/nginx:/etc/nginx/conf.d/
+    networks:
+      - crater
+
+volumes:
+  db:
+
+networks:
+  crater:
+    driver: bridge

docker-compose/nginx/nginx.conf

@@ -0,0 +1,20 @@
+server {
+    listen 80;
+    index index.php index.html;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /var/www/public;
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass app:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+    }
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+        gzip_static on;
+    }
+}

docker-compose/setup.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+docker-compose exec app composer install --no-interaction --prefer-dist --optimize-autoloader
+
+docker-compose exec app php artisan storage:link || true
+docker-compose exec app php artisan key:generate
+docker-compose exec app php artisan passport:keys || true

package.json

@@ -8,19 +8,16 @@
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
   },
   "devDependencies": {
-    "babel-eslint": "^8.2.3",
-    "browser-sync": "^2.26.7",
-    "browser-sync-webpack-plugin": "^2.0.1",
+    "babel-eslint": "^8.2.6",
     "cross-env": "^5.1",
     "css-loader": "^0.28.8",
-    "eslint": "^4.14.0",
-    "eslint-config-standard": "^11.0.0-beta.0",
-    "eslint-plugin-import": "^2.11.0",
-    "eslint-plugin-node": "^5.2.1",
-    "eslint-plugin-promise": "^3.6.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eslint-plugin-vue": "^4.0.1",
+    "eslint": "^4.19.1",
+    "eslint-config-prettier": "^6.10.1",
+    "eslint-loader": "^3.0.3",
+    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-vue": "^4.7.1",
     "laravel-mix": "^5.0.0",
+    "prettier": "^2.0.2",
     "resolve-url-loader": "3.1.0",
     "sass": "^1.22.9",
     "sass-loader": "7.*",
@@ -35,19 +32,14 @@
     "axios": "^0.19",
     "bootstrap": "^4.1.0",
     "chart.js": "^2.7.3",
-    "cross-env": "^5.1.4",
-    "easy-pie-chart": "^2.1.7",
-    "fs": "0.0.1-security",
     "guid": "0.0.12",
     "lodash": "^4.17.13",
     "moment": "^2.18.1",
-    "npm": "^6.4.1",
-    "popper.js": "^1.12.9",
     "sweet-modal-vue": "^2.0.0",
     "sweetalert": "^2.1.2",
     "toastr": "^2.1.4",
-    "upgrade": "^1.1.0",
     "v-money": "^0.8.1",
+    "v-tooltip": "^2.0.2",
     "vue": "^2.5.17",
     "vue-avatar-cropper": "^1.0.5",
     "vue-i18n": "^8.14.0",