update dompdf version

Don't capitalize address on invoice

.github/workflows/ci.yaml

@@ -0,0 +1,34 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.4', '8.0']
+
+    name: PHP ${{ matrix.php }}
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install dependencies
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: exif
+
+    - name: Install PHP 7 dependencies
+      run: composer update --no-interaction --no-progress
+      if: "matrix.php < 8"
+
+    - name: Install PHP 8 dependencies
+      run: composer update --ignore-platform-req=php --no-interaction --no-progress
+      if: "matrix.php >= 8"
+
+    - name: Unit Tests
+      run: php ./vendor/bin/pest

app/Mail/SendEstimateMail.php

@@ -40,9 +40,16 @@ class SendEstimateMail extends Mailable
             'mailable_id' => $this->data['estimate']['id']
         ]);
 
-        return $this->from($this->data['from'])
+        $mailContent = $this->from($this->data['from'], config('mail.from.name'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.estimate', ['data', $this->data]);
 
+        if ($this->data['attach']['data'])
+            $mailContent->attachData(
+                $this->data['attach']['data']->output(), 
+                $this->data['estimate']['estimate_number'] . '.pdf'
+            );
+        
+        return $mailContent;
     }
 }

app/Mail/SendInvoiceMail.php

@@ -1,6 +1,7 @@
 <?php
 namespace Crater\Mail;
 
+use Config;
 use Crater\Models\EmailLog;
 use Crater\Models\Invoice;
 use Illuminate\Bus\Queueable;
@@ -39,9 +40,17 @@ class SendInvoiceMail extends Mailable
             'mailable_type' => Invoice::class,
             'mailable_id' => $this->data['invoice']['id']
         ]);
+        
+        $mailContent = $this->from($this->data['from'], config('mail.from.name'))
+            ->subject($this->data['subject'])
+            ->markdown('emails.send.invoice', ['data', $this->data]);
 
-        return $this->from($this->data['from'])
+        if ($this->data['attach']['data'])
-                    ->subject($this->data['subject'])
+            $mailContent->attachData(
-                    ->markdown('emails.send.invoice', ['data', $this->data]);
+                $this->data['attach']['data']->output(), 
+                $this->data['invoice']['invoice_number'] . '.pdf'
+            );
+        
+        return $mailContent;
     }
 }

app/Mail/SendPaymentMail.php

@@ -41,9 +41,16 @@ class SendPaymentMail extends Mailable
             'mailable_id' => $this->data['payment']['id']
         ]);
 
-        return $this->from($this->data['from'])
+        $mailContent = $this->from($this->data['from'], config('mail.from.name'))
                     ->subject($this->data['subject'])
                     ->markdown('emails.send.payment', ['data', $this->data]);
 
+        if ($this->data['attach']['data'])
+            $mailContent->attachData(
+                $this->data['attach']['data']->output(), 
+                $this->data['payment']['payment_number'] . '.pdf'
+            );
+        
+        return $mailContent;
     }
 }

app/Models/Company.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Crater\Models;
 
 use Crater\Models\Address;
@@ -17,15 +18,34 @@ class Company extends Model implements HasMedia
 
     protected $fillable = ['name', 'logo', 'unique_hash'];
 
-    protected $appends=['logo'];
+    protected $appends = ['logo', 'logo_path'];
+
+    public function getLogoPathAttribute()
+    {
+        $logo = $this->getMedia('logo')->first();
+
+        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
+
+        if ($logo) {
+            if ($isSystem) {
+                return $logo->getPath();
+            } else {
+                return $logo->getFullUrl();
+            }
+        }
+
+        return null;
+    }
 
     public function getLogoAttribute()
     {
         $logo = $this->getMedia('logo')->first();
+
         if ($logo) {
-            return  asset($logo->getUrl());
+            return $logo->getFullUrl();
         }
-        return ;
+
+        return null;
     }
 
     public function user()

app/Models/Estimate.php

@@ -33,9 +33,7 @@ class Estimate extends Model implements HasMedia
     protected $dates = [
         'created_at',
         'updated_at',
-        'deleted_at',
+        'deleted_at'
-        'estimate_date',
-        'expiry_date'
     ];
 
     protected $appends = [
@@ -381,6 +379,7 @@ class Estimate extends Model implements HasMedia
         $data['user'] = $this->user->toArray();
         $data['company'] = $this->company->toArray();
         $data['body'] = $this->getEmailBody($data['body']);
+        $data['attach']['data'] = ($this->getEmailAttachmentSetting()) ? $this->getPDFData() : null;  
 
         \Mail::to($data['to'])->send(new SendEstimateMail($data));
 
@@ -428,16 +427,7 @@ class Estimate extends Model implements HasMedia
         $estimateTemplate = EstimateTemplate::find($this->estimate_template_id);
 
         $company = Company::find($this->company_id);
-        $logo = $company->getMedia('logo')->first();
+        $logo = $company->logo_path;
-
-        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
-        $isLocalhost = config('session.domain') === 'localhost';
-
-        if ($logo && $isLocalhost && $isSystem) {
-            $logo = $logo->getPath();
-        } else if ($logo) {
-            $logo = $logo->getFullUrl();
-        }
 
         view()->share([
             'estimate' => $this,
@@ -479,6 +469,17 @@ class Estimate extends Model implements HasMedia
         return $this->getFormattedString($this->notes);
     }
 
+    public function getEmailAttachmentSetting()
+    {
+        $estimateAsAttachment = CompanySetting::getSetting('estimate_email_attachment', $this->company_id);
+
+        if($estimateAsAttachment == 'NO') {
+            return false;
+        }
+
+        return true;
+    }
+
     public function getEmailBody($body)
     {
         $values = array_merge($this->getFieldsArray(), $this->getExtraFields());

app/Models/EstimateItem.php

@@ -22,7 +22,8 @@ class EstimateItem extends Model
         'discount_val',
         'tax',
         'total',
-        'discount'
+        'discount',
+        'unit_name',
     ];
 
     protected $casts = [

app/Models/Invoice.php

@@ -39,9 +39,7 @@ class Invoice extends Model implements HasMedia
     protected $dates = [
         'created_at',
         'updated_at',
-        'deleted_at',
+        'deleted_at'
-        'invoice_date',
-        'due_date'
     ];
 
     protected $casts = [
@@ -431,6 +429,7 @@ class Invoice extends Model implements HasMedia
         $data['user'] = $this->user->toArray();
         $data['company'] = Company::find($this->company_id);
         $data['body'] = $this->getEmailBody($data['body']);
+        $data['attach']['data'] = ($this->getEmailAttachmentSetting()) ? $this->getPDFData() : null;  
 
         if ($this->status == Invoice::STATUS_DRAFT) {
             $this->status = Invoice::STATUS_SENT;
@@ -512,16 +511,7 @@ class Invoice extends Model implements HasMedia
 
         $company = Company::find($this->company_id);
 
-        $logo = $company->getMedia('logo')->first();
+        $logo = $company->logo_path;
-
-        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
-        $isLocalhost = config('session.domain') === 'localhost';
-
-        if ($logo && $isLocalhost && $isSystem) {
-            $logo = $logo->getPath();
-        } else if ($logo) {
-            $logo = $logo->getFullUrl();
-        }
 
         view()->share([
             'invoice' => $this,
@@ -537,6 +527,17 @@ class Invoice extends Model implements HasMedia
         return PDF::loadView('app.pdf.invoice.' . $invoiceTemplate->view);
     }
 
+    public function getEmailAttachmentSetting()
+    {
+        $invoiceAsAttachment = CompanySetting::getSetting('invoice_email_attachment', $this->company_id);
+
+        if($invoiceAsAttachment == 'NO') {
+            return false;
+        }
+
+        return true;
+    }
+
     public function getCompanyAddress()
     {
         $format = CompanySetting::getSetting('invoice_company_address_format', $this->company_id);

app/Models/InvoiceItem.php

@@ -25,7 +25,8 @@ class InvoiceItem extends Model
         'discount_val',
         'total',
         'tax',
-        'discount'
+        'discount',
+        'unit_name',
     ];
 
     protected $casts = [

app/Models/Payment.php

@@ -31,7 +31,7 @@ class Payment extends Model implements HasMedia
     const PAYMENT_MODE_CREDIT_CARD = 'CREDIT_CARD';
     const PAYMENT_MODE_BANK_TRANSFER = 'BANK_TRANSFER';
 
-    protected $dates = ['created_at', 'updated_at', 'payment_date'];
+    protected $dates = ['created_at', 'updated_at'];
 
     protected $guarded = ['id'];
 
@@ -124,6 +124,7 @@ class Payment extends Model implements HasMedia
         $data['user'] = $this->user->toArray();
         $data['company'] = Company::find($this->company_id);
         $data['body'] = $this->getEmailBody($data['body']);
+        $data['attach']['data'] = ($this->getEmailAttachmentSetting()) ? $this->getPDFData() : null;  
 
         \Mail::to($data['to'])->send(new SendPaymentMail($data));
 
@@ -216,10 +217,10 @@ class Payment extends Model implements HasMedia
         }
 
         $payment = Payment::with([
-                'user',
+            'user',
-                'invoice',
+            'invoice',
-                'paymentMethod',
+            'paymentMethod',
-            ])
+        ])
             ->find($this->id);
 
         return $payment;
@@ -268,7 +269,7 @@ class Payment extends Model implements HasMedia
     {
         // Get the last created order
         $payment = Payment::where('payment_number', 'LIKE', $value . '-%')
-            ->orderBy('created_at', 'desc')
+            ->orderBy('payment_number', 'desc')
             ->first();
         if (!$payment) {
             // We get here if there is no order at all
@@ -373,16 +374,7 @@ class Payment extends Model implements HasMedia
     {
         $company = Company::find($this->company_id);
 
-        $logo = $company->getMedia('logo')->first();
+        $logo = $company->logo_path;
-
-        $isSystem = FileDisk::whereSetAsDefault(true)->first()->isSystem();
-        $isLocalhost = config('session.domain') === 'localhost';
-
-        if ($logo && $isLocalhost && $isSystem) {
-            $logo = $logo->getPath();
-        } else if($logo) {
-            $logo = $logo->getFullUrl();
-        }
 
         view()->share([
             'payment' => $this,
@@ -409,6 +401,17 @@ class Payment extends Model implements HasMedia
         return $this->getFormattedString($format);
     }
 
+    public function getEmailAttachmentSetting()
+    {
+        $paymentAsAttachment = CompanySetting::getSetting('payment_email_attachment', $this->company_id);
+
+        if($paymentAsAttachment == 'NO') {
+            return false;
+        }
+
+        return true;
+    }
+
     public function getNotes()
     {
         return $this->getFormattedString($this->notes);

composer.json

@@ -8,9 +8,9 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4 || ^8.0",
         "aws/aws-sdk-php": "^3.142",
-        "barryvdh/laravel-dompdf": "^0.8.1",
+        "barryvdh/laravel-dompdf": "^0.9.0",
         "doctrine/dbal": "^2.10",
         "fideloper/proxy": "^4.0",
         "fruitcake/laravel-cors": "^1.0",

database/migrations/2021_01_22_085644_update_crater_version_404.php

@@ -0,0 +1,29 @@
+<?php
+
+use Crater\Models\Setting;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class UpdateCraterVersion404 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Setting::setSetting('version', '4.0.4');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2021_03_03_155223_add_unit_name_to_pdf.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUnitNameToPdf extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('invoice_items', function (Blueprint $table) {
+            $table->string('unit_name')->nullable()->after('quantity');
+        });
+        Schema::table('estimate_items', function (Blueprint $table) {
+            $table->string('unit_name')->nullable()->after('quantity');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('invoice_items', function (Blueprint $table) {
+            $table->dropColumn('unit_name');
+        });
+        Schema::table('estimate_items', function (Blueprint $table) {
+            $table->dropColumn('unit_name');
+        });
+    }
+}

database/seeders/CurrenciesTableSeeder.php

@@ -37,7 +37,8 @@ class CurrenciesTableSeeder extends Seeder
                 'symbol' => '€',
                 'precision' => '2',
                 'thousand_separator' => '.',
-                'decimal_separator' => ','
+                'decimal_separator' => ',',
+                'swap_currency_symbol' => true
             ],
             [
                 'name' => 'South African Rand',
@@ -550,6 +551,22 @@ class CurrenciesTableSeeder extends Seeder
                 'thousand_separator' => ',',
                 'decimal_separator' => '.'
             ],
+            [
+                'name' => 'Peruvian Soles',
+                'code' => 'PEN',
+                'symbol' => 'S/',
+                'precision' => '2',
+                'thousand_separator' => ',',
+                'decimal_separator' => '.'
+            ],
+            [
+                'name' => 'Moroccan Dirham',
+                'code' => 'MAD',
+                'symbol' => 'DH',
+                'precision' => '2',
+                'thousand_separator' => ',',
+                'decimal_separator' => '.'
+            ],
         ];
 
         foreach ($currencies as $currency) {

database/seeders/DefaultSettingsSeeder.php

@@ -60,6 +60,9 @@ class DefaultSettingsSeeder extends Seeder
             'payment_prefix' => 'PAY',
             'payment_auto_generate' => 'YES',
             'save_pdf_to_disk' => 'NO',
+            'invoice_email_attachment' => 'NO',
+            'estimate_email_attachment' => 'NO',
+            'payment_email_attachment' => 'NO',
         ];
 
         CompanySetting::setSettings($settings, $user->company_id);

package.json

@@ -1,49 +1,50 @@
 {
-  "private": true,
+    "private": true,
-  "scripts": {
+    "scripts": {
-    "dev": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "dev": "mix",
-    "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch": "mix watch",
-    "watch-poll": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --watch-poll --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
-    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "hot": "mix watch --hot",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "production": "mix --production"
-  },
+    },
-  "devDependencies": {
+    "devDependencies": {
-    "babel-eslint": "^8.2.6",
+        "babel-eslint": "^8.2.6",
-    "cross-env": "^5.1",
+        "cross-env": "^5.1",
-    "eslint": "^4.19.1",
+        "eslint": "^4.19.1",
-    "eslint-config-prettier": "^6.15.0",
+        "eslint-config-prettier": "^6.15.0",
-    "eslint-loader": "^3.0.4",
+        "eslint-loader": "^3.0.4",
-    "eslint-plugin-prettier": "^3.3.0",
+        "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-vue": "^4.7.1",
+        "eslint-plugin-vue": "^4.7.1",
-    "laravel-mix": "^5.0.7",
+        "laravel-mix": "^6.0.6",
-    "prettier": "^2.2.1",
+        "postcss": "^8.1",
-    "resolve-url-loader": "3.1.0",
+        "prettier": "^2.2.1",
-    "sass": "^1.29.0",
+        "resolve-url-loader": "3.1.0",
-    "sass-loader": "^8.0.2",
+        "sass": "^1.29.0",
-    "tailwindcss-plugins": "^0.3.0",
+        "sass-loader": "^8.0.2",
-    "vue-template-compiler": "^2.6.10"
+        "tailwindcss-plugins": "^0.3.0",
-  },
+        "vue-template-compiler": "^2.6.10"
-  "dependencies": {
+    },
-    "@bytefury/spacewind": "^0.3.3",
+    "dependencies": {
-    "@vue-hero-icons/outline": "^1.6.3",
+        "@bytefury/spacewind": "^0.5.0",
-    "@vue-hero-icons/solid": "^1.6.3",
+        "@vue-hero-icons/outline": "^1.6.3",
-    "axios": "^0.19",
+        "@vue-hero-icons/solid": "^1.6.3",
-    "chart.js": "^2.7.3",
+        "axios": "^0.19",
-    "guid": "0.0.12",
+        "chart.js": "^2.7.3",
-    "lodash": "^4.17.13",
+        "guid": "0.0.12",
-    "moment": "^2.29.1",
+        "lodash": "^4.17.13",
-    "sweet-modal-vue": "^2.0.0",
+        "moment": "^2.29.1",
-    "sweetalert": "^2.1.2",
+        "sweet-modal-vue": "^2.0.0",
-    "tailwindcss": "^1.9.1",
+        "sweetalert": "^2.1.2",
-    "toastr": "^2.1.4",
+        "tailwindcss": "^2.0.1",
-    "v-tooltip": "^2.0.2",
+        "toastr": "^2.1.4",
-    "vue": "^2.6.10",
+        "v-tooltip": "^2.0.2",
-    "vue-i18n": "^8.22.0",
+        "vue": "^2.6.10",
-    "vue-loader": "^15.9.3",
+        "vue-i18n": "^8.22.0",
-    "vue-router": "2.7.0",
+        "vue-loader": "^15.9.3",
-    "vue2-transitions": "^0.3.0",
+        "vue-router": "2.7.0",
-    "vuedraggable": "^2.24.2",
+        "vue2-transitions": "^0.3.0",
-    "vuelidate": "^0.6.2",
+        "vuedraggable": "^2.24.2",
-    "vuex": "^3.0.1"
+        "vuelidate": "^0.6.2",
-  }
+        "vuex": "^3.0.1"
+    }
 }

public/assets/js/app.js.LICENSE.txt

@@ -67,13 +67,6 @@
  * Date: 2020-03-14
  */
 
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <http://feross.org>
- * @license  MIT
- */
-
 /*!
  * Vue.js v2.6.12
  * (c) 2014-2020 Evan You
@@ -94,6 +87,12 @@
  * Date: 2020-05-04T22:49Z
  */
 
+/*!
+ * vue-i18n v8.22.2 
+ * (c) 2020 kazuya kawaguchi
+ * Released under the MIT License.
+ */
+
 /*!
  * vue2-transitions v0.3.0
  * (c) 2019-present cristij <joracristi@gmail.com>
@@ -108,18 +107,6 @@
 
 /*! For license information please see index.js.LICENSE.txt */
 
-/*! https://mths.be/punycode v1.4.1 by @mathias */
-
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/**
-  * vue-router v2.7.0
-  * (c) 2017 Evan You
-  * @license MIT
-  */
-
 /**
  * @license
  * Lodash <https://lodash.com/>

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/assets/js/app.js": "/assets/js/app.js?id=311e432a0e58e62c984f",
+    "/assets/js/app.js": "/assets/js/app.js?id=abd09b4669350c773e19",
-    "/assets/css/crater.css": "/assets/css/crater.css?id=912348e74f68a41a1b35"
+    "/assets/css/crater.css": "/assets/css/crater.css?id=56e62ddcc9434f8f3fe5"
 }

readme.md

@@ -70,6 +70,8 @@ Crater is a product of [Bytefury](https://bytefury.com)
 - [Birkhoff Lee](https://github.com/BirkhoffLee)
 - [Akaunting](https://github.com/akaunting/akaunting)
 - [MakerLab](https://github.com/MakerLab-Dev)
+- [Sebastian Cretu](https://github.com/sebastiancretu)
+- [Florian Gareis](https://github.com/TheZoker)
 
 ## Translate
 

resources/assets/js/app.js

@@ -3,6 +3,7 @@
  * include Vue and Vue Resource. This gives a great starting point for
  * building robust, powerful web applications using Vue and Laravel.
  */
+import Vue from 'vue'
 import router from './router.js'
 import store from './store/index'
 import utils from './helpers/utilities'
@@ -11,7 +12,7 @@ import swal from 'sweetalert'
 
 require('./bootstrap')
 
-window.Vue.prototype.$utils = utils
+Vue.prototype.$utils = utils
 
 /**
  * Next, we will create a fresh Vue application instance and attach it to

resources/assets/js/bootstrap.js

@@ -25,13 +25,6 @@ Vue.use(Vuelidate)
 Vue.use(Transitions)
 
 window._ = require('lodash')
-/**
- * Vue is a modern JavaScript library for building interactive web interfaces
- * using reactive data binding and reusable components. Vue's API is clean
- * and simple, leaving you to focus on building your next great project.
- */
-
-window.Vue = require('vue')
 
 /**
  * Custom Directives
@@ -97,7 +90,8 @@ global.axios.interceptors.response.use(undefined, function (err) {
   }
   if (!err.response) {
     window.toastr['error'](
-      'Please check your internet connection or wait until servers are back online', 'Network Error'
+      'Please check your internet connection or wait until servers are back online',
+      'Network Error'
     )
   } else {
     if (
@@ -121,7 +115,8 @@ global.axios.interceptors.response.use(undefined, function (err) {
       window.toastr['error'](
         err.response.data.message
           ? err.response.data.message
-          : err.response.data || 'Unknown error occurred', 'Error'
+          : err.response.data || 'Unknown error occurred',
+        'Error'
       )
     }
   }

resources/assets/js/components/base/index.js

@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 import BaseModal from './modal/BaseModal.vue'
 import BaseLoader from './BaseLoader.vue'
 import BaseCustomerSelect from './BaseCustomerSelect.vue'

resources/assets/js/components/base/modal/ItemUnitModal.vue

@@ -68,6 +68,14 @@ export default {
       if (!this.$v.formData.name.required) {
         return this.$tc('validation.required')
       }
+
+      if (!this.$v.formData.name.minLength) {
+        return this.$tc(
+          'validation.name_min_length',
+          this.$v.formData.name.$params.minLength.min,
+          { count: this.$v.formData.name.$params.minLength.min }
+        )
+      }
     },
   },
   validations: {

resources/assets/js/components/base/modal/NoteModal.vue

@@ -105,6 +105,14 @@ export default {
       if (!this.$v.formData.name.required) {
         return this.$tc('validation.required')
       }
+
+      if (!this.$v.formData.name.minLength) {
+        return this.$tc(
+          'validation.name_min_length',
+          this.$v.formData.name.$params.minLength.min,
+          { count: this.$v.formData.name.$params.minLength.min }
+        )
+      }
     },
     noteError() {
       if (!this.$v.formData.notes.$error) {

resources/assets/js/components/base/modal/PaymentModeModal.vue

@@ -62,6 +62,14 @@ export default {
       if (!this.$v.formData.name.required) {
         return this.$tc('validation.required')
       }
+
+      if (!this.$v.formData.name.minLength) {
+        return this.$tc(
+          'validation.name_min_length',
+          this.$v.formData.name.$params.minLength.min,
+          { count: this.$v.formData.name.$params.minLength.min }
+        )
+      }
     },
   },
   validations: {

resources/assets/js/components/base/theme/BaseSelect.js

@@ -12,7 +12,7 @@ export default {
   disabledMultiSelectTags: 'bg-gray-200 text-gray-400',
   multiselectTagsWrap: 'multiselect__tags-wrap inline',
   multiselectTag:
-    'multiselect__tag relative inline-block pt-1 pr-6 pb-1 pl-2 rounded mr-2 text-white leading-none mb-1 whitespace-no-wrap overflow-hidden max-w-full',
+    'multiselect__tag relative inline-block pt-1 pr-6 pb-1 pl-2 rounded mr-2 text-white leading-none mb-1 whitespace-nowrap overflow-hidden max-w-full',
   multiselectTagIcon:
     'multiselect__tag-icon cursor-pointer ml-2 absolute right-0 top-0 bottom-0 font-bold w-5 text-center leading-5 delay-200 transition-all ease-linear rounded',
   multiselectStrong: 'mb-2 leading-5 inline-block align-top',
@@ -26,6 +26,6 @@ export default {
   multiselectContent:
     'multiselect__content list-none inline-block p-0 m-0 min-w-full align-top',
   multiselectOption:
-    'multiselect__option block p-3 no-underline leading-4 normal-case align-middle relative cursor-pointer whitespace-no-wrap text-sm',
+    'multiselect__option block p-3 no-underline leading-4 normal-case align-middle relative cursor-pointer whitespace-nowrap text-sm',
   multiselectElement: 'multiselect__element block',
 }

resources/assets/js/components/theme/SwButton.js

@@ -13,4 +13,10 @@ export default {
         'inline-flex items-center justify-center text-black transition px-2 duration-150 ease-in-out border border-gray-300 border-solid focus:outline-none bg-white',
     },
   },
+  sizes: {
+    discount: {
+      button: 'py-2 px-2 text-sm leading-5 rounded',
+      loadingIcon: 'w-4 h-4 -ml-2',
+    },
+  },
 }

resources/assets/js/components/theme/SwDropdown.js

@@ -6,7 +6,7 @@ export default {
     itemContainer:
       'z-10 p-2 max-h-60 text-base text-left list-none rounded border-0 shadow bg-white text-black overflow-auto sw-scroll',
     item:
-      'flex p-2 text-sm font-light text-left text-black bg-transparent rounded cursor-pointer none hover:bg-gray-200 whitespace-no-wrap',
+      'flex p-2 text-sm font-light text-left text-black bg-transparent rounded cursor-pointer none hover:bg-gray-200 whitespace-nowrap',
     itemIcon: 'w-5 h-5 mr-3 text-secondary',
   },
   variants: {
@@ -16,7 +16,7 @@ export default {
       divider:
         'border-t border-solid border-gray-200 my-2 mx-0 overflow-hidden',
       item:
-        'flex p-0 text-sm font-light text-left text-black bg-transparent rounded cursor-pointer none hover:bg-gray-200 whitespace-no-wrap',
+        'flex p-0 text-sm font-light text-left text-black bg-transparent rounded cursor-pointer none hover:bg-gray-200 whitespace-nowrap',
       itemContainer:
         'z-10 p-2 text-base text-left list-none rounded border-0 shadow bg-white text-black',
       itemIcon: 'w-5 h-5 mr-3 text-secondary',

resources/assets/js/helpers/directives.js

@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 Vue.directive('click-outside', {
   bind: function (el, binding, vnode) {
     el.event = function (event) {
@@ -17,7 +19,9 @@ Vue.directive('click-outside', {
 Vue.directive('autoresize', {
   inserted: function (el) {
     el.style.height = el.scrollHeight + 'px'
-    el.style.overflow.y = 'hidden'
+    if (el.style.overflow && el.style.overflow.y) {
+      el.style.overflow.y = 'hidden'
+    }
     el.style.resize = 'none'
     function OnInput() {
       this.style.height = 'auto'

resources/assets/js/helpers/utilities.js

@@ -1,3 +1,5 @@
+import i18n from '../plugins/i18n';
+
 export default {
   addClass(el, className) {
     if (el.classList) el.classList.add(className)
@@ -23,7 +25,13 @@ export default {
 
     amount = amount / 100
 
-    let { precision, decimal_separator, thousand_separator, symbol } = currency
+    let {
+      precision,
+      decimal_separator,
+      thousand_separator,
+      symbol,
+      swap_currency_symbol,
+    } = currency
 
     try {
       precision = Math.abs(precision)
@@ -37,20 +45,22 @@ export default {
       let j = i.length > 3 ? i.length % 3 : 0
 
       let moneySymbol = `<span style="font-family: sans-serif">${symbol}</span>`
+      let thousandText = j ? i.substr(0, j) + thousand_separator : ''
+      let amountText = i
+        .substr(j)
+        .replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator)
+      let precisionText = precision
+        ? decimal_separator +
+          Math.abs(amount - i)
+            .toFixed(precision)
+            .slice(2)
+        : ''
+      let combinedAmountText =
+        negativeSign + thousandText + amountText + precisionText
 
-      return (
+      return swap_currency_symbol
-        moneySymbol +
+        ? combinedAmountText + ' ' + moneySymbol
-        ' ' +
+        : moneySymbol + ' ' + combinedAmountText
-        negativeSign +
-        (j ? i.substr(0, j) + thousand_separator : '') +
-        i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator) +
-        (precision
-          ? decimal_separator +
-            Math.abs(amount - i)
-              .toFixed(precision)
-              .slice(2)
-          : '')
-      )
     } catch (e) {
       console.log(e)
     }
@@ -68,7 +78,13 @@ export default {
 
     amount = amount / 100
 
-    let { precision, decimal_separator, thousand_separator, symbol } = currency
+    let {
+      precision,
+      decimal_separator,
+      thousand_separator,
+      symbol,
+      swap_currency_symbol,
+    } = currency
 
     try {
       precision = Math.abs(precision)
@@ -82,20 +98,22 @@ export default {
       let j = i.length > 3 ? i.length % 3 : 0
 
       let moneySymbol = `${symbol}`
+      let thousandText = j ? i.substr(0, j) + thousand_separator : ''
+      let amountText = i
+        .substr(j)
+        .replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator)
+      let precisionText = precision
+        ? decimal_separator +
+          Math.abs(amount - i)
+            .toFixed(precision)
+            .slice(2)
+        : ''
+      let combinedAmountText =
+        negativeSign + thousandText + amountText + precisionText
 
-      return (
+      return swap_currency_symbol
-        moneySymbol +
+        ? combinedAmountText + ' ' + moneySymbol
-        ' ' +
+        : moneySymbol + ' ' + combinedAmountText
-        negativeSign +
-        (j ? i.substr(0, j) + thousand_separator : '') +
-        i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand_separator) +
-        (precision
-          ? decimal_separator +
-            Math.abs(amount - i)
-              .toFixed(precision)
-              .slice(2)
-          : '')
-      )
     } catch (e) {
       console.log(e)
     }
@@ -245,6 +263,36 @@ export default {
         }
     }
   },
+  getStatusTranslation(status) {
+    switch (status) {
+      case 'DRAFT':
+        return i18n.t('general.draft')
+      case 'PAID':
+        return i18n.t('invoices.paid')
+      case 'UNPAID':
+        return i18n.t('invoices.unpaid')
+      case 'SENT':
+        return i18n.t('general.sent')
+      case 'REJECTED':
+        return i18n.t('estimates.rejected')
+      case 'ACCEPTED':
+        return i18n.t('estimates.accepted')
+      case 'VIEWED':
+        return i18n.t('invoices.viewed')
+      case 'EXPIRED':
+        return i18n.t('estimates.expired')
+      case 'PARTIALLY PAID':
+        return i18n.t('estimates.partially_paid')
+      case 'OVERDUE':
+        return i18n.t('invoices.overdue')
+      case 'COMPLETED':
+        return i18n.t('invoices.completed')
+      case 'DUE':
+        return i18n.t('general.due')
+      default:
+        return status
+    }
+  },
   compareVersion(v1, v2, options) {
     const lexicographical = options && options.lexicographical
     const zeroExtend = options && options.zeroExtend
@@ -280,5 +328,5 @@ export default {
       return -1
     }
     return 0
-  }
+  },
 }

resources/assets/js/plugins/ar.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "نسخ من عنوان الفوترة",
     "no_customers": "لا يوجد عملاء حتى الآن!",
     "no_customers_found": "لم يتم الحصول على عملاء!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "سوف يحتوي هذا القسم على قائمة العملاء.",
     "primary_display_name": "اسم العرض الرئيسي",
     "select_currency": "اختر العملة",
@@ -200,6 +202,7 @@
     "added_on": "أضيف في",
     "price": "السعر",
     "date_of_creation": "تاريخ الإنشاء",
+    "not_selected": "No item selected",
     "action": "إجراء",
     "add_item": "إضافة صنف",
     "save_item": "حفظ الصنف",
@@ -270,6 +273,7 @@
       "required": "حقل مطلوب"
     },
     "accepted": "مقبول",
+    "rejected": "Rejected",
     "sent": "مرسل",
     "draft": "مسودة",
     "declined": "مرفوض",
@@ -316,6 +320,9 @@
     "all": "الكل",
     "paid": "مدفوع",
     "unpaid": "غير مدفوع",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "العميل",
     "paid_status": "حالة الدفع",
     "ref_no": "رقم المرجع.",
@@ -434,6 +441,8 @@
     "update_payment": "تحديث الدفعة",
     "payment": "دفعة | مدفوعات",
     "no_payments": "لا يوجد مدفوعات حتى الآن!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "لا توجد مدفوعات مطابقة!",
     "list_of_payments": "سوف تحتوي هذه القائمة على مدفوعات الفواتير.",
     "select_payment_mode": "اختر طريقة الدفع",
@@ -463,6 +472,7 @@
     "receipt": "سند القبض",
     "amount": "المبلغ المطلوب",
     "action": "إجراء",
+    "not_selected": "Not selected",
     "note": "ملاحظة",
     "category_id": "رمز الفئة",
     "date": "تاريخ النفقات",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "المبلغ المطلوب",
   "pdf_subtotal": "Subtotal",
   "pdf_total": "الإجمالي",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "PAYMENT RECEIPT",
   "pdf_payment_date": "Payment Date",
   "pdf_payment_number": "رقم الدفعة",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "EXPENSES REPORT",
   "pdf_total_expenses_label": "TOTAL EXPENSE",
   "pdf_profit_loss_label": "PROFIT & LOSS REPORT",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INCOME",
   "pdf_net_profit_label": "NET PROFIT",
   "pdf_customer_sales_report": "Sales Report: By Customer",

resources/assets/js/plugins/de.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Rechnungsadresse kopieren",
     "no_customers": "Noch keine Kunden!",
     "no_customers_found": "Keine Kunden gefunden!",
+    "no_contact": "Kein Kontakt",
+    "no_contact_name": "Kein Kontaktname",
     "list_of_customers": "Dieser Abschnitt enthält die Liste der Kunden.",
     "primary_display_name": "Primärer Anzeige Name",
     "select_currency": "Währung wählen",
@@ -200,6 +202,7 @@
     "added_on": "Hinzugefügt am",
     "price": "Preis",
     "date_of_creation": "Erstellt am",
+    "not_selected": "Keine ausgewählt",
     "action": "Aktion",
     "add_item": "Artikel hinzufügen",
     "save_item": "Artikel speichern",
@@ -270,6 +273,7 @@
       "required": "Feld ist erforderlich"
     },
     "accepted": "Angenommen",
+    "rejected": "Abgelehnt",
     "sent": "Gesendet",
     "draft": "Entwurf",
     "declined": "Abgelehnt",
@@ -315,7 +319,10 @@
     "years": "{years} Jahre",
     "all": "Alle",
     "paid": "Bezahlt",
-    "unpaid": "Unbezahlte",
+    "unpaid": "Unbezahlt",
+    "viewed": "Gesehen",
+    "overdue": "Überfällig",
+    "completed": "Abgeschlossen",
     "customer": "KUNDEN",
     "paid_status": "BEZAHLT-STATUS",
     "ref_no": "REF. - NR.",
@@ -434,6 +441,8 @@
     "update_payment": "Zahlung ändern",
     "payment": "Zahlung | Zahlungen",
     "no_payments": "Keine Zahlungen vorhanden!",
+    "not_selected": "Nicht ausgewählt",
+    "no_invoice": "Keine Rechnung",
     "no_matching_payments": "Es gibt keine passenden Zahlungen!",
     "list_of_payments": "Dieser Abschnitt enthält die Liste der Zahlungen.",
     "select_payment_mode": "Wählen Sie den Zahlungsmodus",
@@ -462,6 +471,7 @@
     "description": "Beschreibung",
     "receipt": "Eingang",
     "amount": "Summe",
+    "not_selected": "Nicht ausgewählt",
     "action": "Aktion",
     "note": "Hinweis",
     "category_id": "Kategorie-Id",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Summe",
   "pdf_subtotal": "Zwischensumme",
   "pdf_total": "Gesamt",
+  "pdf_payment_label": "Zahlung",
   "pdf_payment_receipt_label": "Zahlungsbeleg",
   "pdf_payment_date": "Zahlungsdatum",
   "pdf_payment_number": "Zahlungsnummer",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "Ausgaben Bericht",
   "pdf_total_expenses_label": "Gesamtausgaben",
   "pdf_profit_loss_label": "Gewinn & Verlust Bericht",
+  "pdf_sales_customers_label": "Kundenverkaufs Bericht",
+  "pdf_sales_items_label": "Artikelverkaufs Bericht",
+  "pdf_tax_summery_label": "Steuer Bericht",
   "pdf_income_label": "Einkommen",
   "pdf_net_profit_label": "Nettogewinn",
   "pdf_customer_sales_report": "Umsatzbericht: Nach Kunde",

resources/assets/js/plugins/en.json

@@ -178,6 +178,8 @@
     "copy_billing_address": "Copy from Billing",
     "no_customers": "No customers yet!",
     "no_customers_found": "No customers found!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "This section will contain the list of customers.",
     "primary_display_name": "Primary Display Name",
     "select_currency": "Select currency",
@@ -201,6 +203,7 @@
     "added_on": "Added On",
     "price": "Price",
     "date_of_creation": "Date Of Creation",
+    "not_selected": "No item selected",
     "action": "Action",
     "add_item": "Add Item",
     "save_item": "Save Item",
@@ -271,6 +274,7 @@
       "required": "Field is required"
     },
     "accepted": "Accepted",
+    "rejected": "Rejected",
     "sent": "Sent",
     "draft": "Draft",
     "declined": "Declined",
@@ -317,6 +321,9 @@
     "all": "All",
     "paid": "Paid",
     "unpaid": "Unpaid",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CUSTOMER",
     "paid_status": "PAID STATUS",
     "ref_no": "REF NO.",
@@ -435,6 +442,8 @@
     "update_payment": "Update Payment",
     "payment": "Payment | Payments",
     "no_payments": "No payments yet!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "There are no matching payments!",
     "list_of_payments": "This section will contain the list of payments.",
     "select_payment_mode": "Select payment mode",
@@ -464,6 +473,7 @@
     "receipt": "Receipt",
     "amount": "Amount",
     "action": "Action",
+    "not_selected": "Not selected",
     "note": "Note",
     "category_id": "Category Id",
     "date": "Date",
@@ -745,6 +755,8 @@
         "invoice_settings": "Invoice Settings",
         "autogenerate_invoice_number": "Auto-generate Invoice Number",
         "invoice_setting_description": "Disable this, If you don't wish to auto-generate invoice numbers each time you create a new invoice.",
+        "invoice_email_attachment": "Send invoices as attachments",
+        "invoice_email_attachment_setting_description": "Enable this if you want to send invoices as email attachment. Please note that 'View Invoice' button in emails will not be displayed anymore when enabled.",
         "enter_invoice_prefix": "Enter invoice prefix",
         "terms_and_conditions": "Terms and Conditions",
         "company_address_format": "Company Address Format",
@@ -759,6 +771,8 @@
         "estimate_settings": "Estimate Settings",
         "autogenerate_estimate_number": "Auto-generate Estimate Number",
         "estimate_setting_description": "Disable this, If you don't wish to auto-generate estimate numbers each time you create a new estimate.",
+        "estimate_email_attachment": "Send estimates as attachments",
+        "estimate_email_attachment_setting_description": "Enable this if you want to send the estimates as an email attachment. Please note that 'View Estimate' button in emails will not be displayed anymore when enabled.",
         "enter_estimate_prefix": "Enter estmiate prefix",
         "estimate_setting_updated": "Estimate Setting updated successfully",
         "company_address_format": "Company Address Format",
@@ -773,6 +787,8 @@
         "payment_settings": "Payment Settings",
         "autogenerate_payment_number": "Auto-generate Payment Number",
         "payment_setting_description": "Disable this, If you don't wish to auto-generate payment numbers each time you create a new payment.",
+        "payment_email_attachment": "Send payments as attachments",
+        "payment_email_attachment_setting_description": "Enable this if you want to send the payment receipts as an email attachment. Please note that 'View Payment' button in emails will not be displayed anymore when enabled.",
         "enter_payment_prefix": "Enter Payment Prefix",
         "payment_setting_updated": "Payment Setting updated successfully",
         "payment_modes": "Payment Modes",
@@ -1150,6 +1166,7 @@
   "pdf_amount_label": "Amount",
   "pdf_subtotal": "Subtotal",
   "pdf_total": "Total",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "PAYMENT RECEIPT",
   "pdf_payment_date": "Payment Date",
   "pdf_payment_number": "Payment Number",
@@ -1158,6 +1175,9 @@
   "pdf_expense_report_label": "EXPENSES REPORT",
   "pdf_total_expenses_label": "TOTAL EXPENSE",
   "pdf_profit_loss_label": "PROFIT & LOSS REPORT",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INCOME",
   "pdf_net_profit_label": "NET PROFIT",
   "pdf_customer_sales_report": "Sales Report: By Customer",

resources/assets/js/plugins/es.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Copia de facturación",
     "no_customers": "¡Aún no hay clientes!",
     "no_customers_found": "¡No se encontraron clientes!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Esta sección contendrá la lista de clientes.",
     "primary_display_name": "Nombre de visualización principal",
     "select_currency": "Seleccione el tipo de moneda",
@@ -200,6 +202,7 @@
     "added_on": "Añadido",
     "price": "Precio",
     "date_of_creation": "Fecha de creación",
+    "not_selected": "No item selected",
     "action": "Acción",
     "add_item": "Añadir artículo",
     "save_item": "Guardar artículo",
@@ -270,6 +273,7 @@
       "required": "Se requiere campo"
     },
     "accepted": "Aceptado",
+    "rejected": "Rejected",
     "sent": "Enviado",
     "draft": "Borrador",
     "declined": "Rechazado",
@@ -316,6 +320,9 @@
     "all": "Todas",
     "paid": "Pagada",
     "unpaid": "No pagado",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CLIENTE",
     "paid_status": "ESTADO PAGADO",
     "ref_no": "NÚMERO DE REFERENCIA.",
@@ -434,6 +441,8 @@
     "update_payment": "Actualizar pago",
     "payment": "Pago | Pagos",
     "no_payments": "¡Aún no hay pagos!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "¡No hay pagos equivalentes!",
     "list_of_payments": "Esta sección contendrá la lista de pagos.",
     "select_payment_mode": "Seleccionar modo de pago",
@@ -463,6 +472,7 @@
     "receipt": "Recibo",
     "amount": "Cantidad",
     "action": "Acción",
+    "not_selected": "Not selected",
     "note": "Nota",
     "category_id": "Categoria ID",
     "date": "Fecha de gastos",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Cantidad",
   "pdf_subtotal": "Subtotal",
   "pdf_total": "Total",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "RECIBO DE PAGO",
   "pdf_payment_date": "Fecha de pago",
   "pdf_payment_number": "Numero de pago",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "INFORME DE GASTOS",
   "pdf_total_expenses_label": "GASTO TOTAL",
   "pdf_profit_loss_label": "INFORME PERDIDAS & GANANCIAS",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INGRESO",
   "pdf_net_profit_label": "GANANCIA NETA",
   "pdf_customer_sales_report": "Informe de ventas: Por cliente",

resources/assets/js/plugins/fr.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Copier depuis l'adresse de facturation",
     "no_customers": "Vous n’avez pas encore de clients !",
     "no_customers_found": "Aucun client !",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Cette section contiendra la liste des clients.",
     "primary_display_name": "Nom d'affichage principal",
     "select_currency": "Sélectionnez la devise",
@@ -200,6 +202,7 @@
     "added_on": "Ajouté le",
     "price": "Prix",
     "date_of_creation": "Date de création",
+    "not_selected": "No item selected",
     "action": "action",
     "add_item": "Ajouter un article",
     "save_item": "Enregistrer l'article",
@@ -270,6 +273,7 @@
       "required": "Champ requis"
     },
     "accepted": "Accepté",
+    "rejected": "Rejected",
     "sent": "Envoyé",
     "draft": "Brouillon",
     "declined": "Refusé",
@@ -316,6 +320,9 @@
     "all": "Toutes",
     "paid": "Payé",
     "unpaid": "Non payé",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CLIENT",
     "paid_status": "STATUT DU PAIEMENT",
     "ref_no": "Réf.",
@@ -434,6 +441,8 @@
     "update_payment": "Mettre à jour le paiement",
     "payment": "Paiement | Paiements",
     "no_payments": "Aucun paiement pour le moment !",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Il n'y a aucun paiement correspondant !",
     "list_of_payments": "Cette section contiendra la liste des paiements",
     "select_payment_mode": "Sélectionnez le moyen de paiement",
@@ -463,6 +472,7 @@
     "receipt": "Reçu",
     "amount": "Montant",
     "action": "action",
+    "not_selected": "Not selected",
     "note": "Remarque",
     "category_id": "Identifiant de catégorie",
     "date": "Date",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Montant",
   "pdf_subtotal": "Sous-total",
   "pdf_total": "Total",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "Reçu de paiement",
   "pdf_payment_date": "Date de paiement",
   "pdf_payment_number": "N°",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "RAPPORT DE DÉPENSES",
   "pdf_total_expenses_label": "TOTAL DES DÉPENSES",
   "pdf_profit_loss_label": "RAPPORT DES BÉNÉFICES ET DES PERTES",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "REVENU",
   "pdf_net_profit_label": "BÉNÉFICE NET",
   "pdf_customer_sales_report": "Rapport de ventes : par client",

resources/assets/js/plugins/hi.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Copy from Billing",
     "no_customers": "No customers yet!",
     "no_customers_found": "No customers found!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "This section will contain the list of customers.",
     "primary_display_name": "Primary Display Name",
     "select_currency": "Select currency",
@@ -200,6 +202,7 @@
     "added_on": "Added On",
     "price": "Price",
     "date_of_creation": "Date Of Creation",
+    "not_selected": "No item selected",
     "action": "Action",
     "add_item": "Add Item",
     "save_item": "Save Item",
@@ -270,6 +273,7 @@
       "required": "Field is required"
     },
     "accepted": "Accepted",
+    "rejected": "Rejected",
     "sent": "Sent",
     "draft": "Draft",
     "declined": "Declined",
@@ -316,6 +320,9 @@
     "all": "All",
     "paid": "Paid",
     "unpaid": "Unpaid",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CUSTOMER",
     "paid_status": "PAID STATUS",
     "ref_no": "REF NO.",
@@ -434,6 +441,8 @@
     "update_payment": "Update Payment",
     "payment": "Payment | Payments",
     "no_payments": "No payments yet!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "There are no matching payments!",
     "list_of_payments": "This section will contain the list of payments.",
     "select_payment_mode": "Select payment mode",
@@ -463,6 +472,7 @@
     "receipt": "Receipt",
     "amount": "Amount",
     "action": "Action",
+    "not_selected": "Not selected",
     "note": "Note",
     "category_id": "Category Id",
     "date": "Date",
@@ -1148,6 +1158,7 @@
   "pdf_amount_label": "Amount",
   "pdf_subtotal": "Subtotal",
   "pdf_total": "Total",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "PAYMENT RECEIPT",
   "pdf_payment_date": "Payment Date",
   "pdf_payment_number": "Payment Number",
@@ -1156,6 +1167,9 @@
   "pdf_expense_report_label": "EXPENSES REPORT",
   "pdf_total_expenses_label": "TOTAL EXPENSE",
   "pdf_profit_loss_label": "PROFIT & LOSS REPORT",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INCOME",
   "pdf_net_profit_label": "NET PROFIT",
   "pdf_customer_sales_report": "Sales Report: By Customer",

resources/assets/js/plugins/it.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Copia da Fatturazione",
     "no_customers": "Ancora nessun Cliente!",
     "no_customers_found": "Nessun cliente trovato!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Qui ci sarà la lista dei tuoi clienti",
     "primary_display_name": "Mostra il Nome Principale",
     "select_currency": "Selezione Valùta",
@@ -200,6 +202,7 @@
     "added_on": "Aggiunto il",
     "price": "Prezzo",
     "date_of_creation": "Data di creazione",
+    "not_selected": "No item selected",
     "action": "Azione",
     "add_item": "Aggiungi Commessa",
     "save_item": "Salva",
@@ -270,6 +273,7 @@
       "required": "Campo obbligatorio"
     },
     "accepted": "Accettato",
+    "rejected": "Rejected",
     "sent": "Inviato",
     "draft": "Bozza",
     "declined": "Rifiutato",
@@ -316,6 +320,9 @@
     "all": "Tutti",
     "paid": "Pagato",
     "unpaid": "Insoluto",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CLIENTE",
     "paid_status": "STATO DI PAGAMENTO",
     "ref_no": "RIF N.",
@@ -434,6 +441,8 @@
     "update_payment": "Aggiorna pagamento",
     "payment": "Pagamento | Pagamenti",
     "no_payments": "Ancora nessun pagamento!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Non ci sono pagamenti!",
     "list_of_payments": "Questa sezione conterrà la lista dei pagamenti.",
     "select_payment_mode": "Seleziona modalità di pagamento",
@@ -463,6 +472,7 @@
     "receipt": "Ricevuta",
     "amount": "Ammontare",
     "action": "Azione",
+    "not_selected": "Not selected",
     "note": "Nota",
     "category_id": "Id categoria",
     "date": "Data Spesa",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Ammontare",
   "pdf_subtotal": "Subtotal",
   "pdf_total": "Totale",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "PAYMENT RECEIPT",
   "pdf_payment_date": "Payment Date",
   "pdf_payment_number": "Numero di pagamento",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "EXPENSES REPORT",
   "pdf_total_expenses_label": "TOTAL EXPENSE",
   "pdf_profit_loss_label": "PROFIT & LOSS REPORT",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INCOME",
   "pdf_net_profit_label": "NET PROFIT",
   "pdf_customer_sales_report": "Sales Report: By Customer",

resources/assets/js/plugins/lv.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Kopēt no juridiskās adreses",
     "no_customers": "Pagaidām nav klientu!",
     "no_customers_found": "Klienti netika atrasti!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Šajā sadaļā būs klientu saraksts.",
     "primary_display_name": "Klienta nosaukums",
     "select_currency": "Izvēlieties valūtu",
@@ -200,6 +202,7 @@
     "added_on": "Pievienots",
     "price": "Cena",
     "date_of_creation": "Izveidošanas datums",
+    "not_selected": "No item selected",
     "action": "Darbība",
     "add_item": "Pievienot",
     "save_item": "Saglabāt",
@@ -270,6 +273,7 @@
       "required": "Šis lauks ir obligāts"
     },
     "accepted": "Apstiprināts",
+    "rejected": "Rejected",
     "sent": "Nosūtīts",
     "draft": "Melnraksts",
     "declined": "Noraidīts",
@@ -316,6 +320,9 @@
     "all": "Visi",
     "paid": "Apmaksāts",
     "unpaid": "Neapmaksāts",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "KLIENTS",
     "paid_status": "APMAKSAS STATUS",
     "ref_no": "REF NR.",
@@ -434,6 +441,8 @@
     "update_payment": "Labot maksājumu",
     "payment": "Maksājums | Maksājumi",
     "no_payments": "Nav pievienotu maksājumu!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Netika atrasts neviens maksājums!",
     "list_of_payments": "Šajā sadaļā būs maksājumu saraksts.",
     "select_payment_mode": "Izvēlēties maksājuma veidu",
@@ -463,6 +472,7 @@
     "receipt": "Čeks",
     "amount": "Summa",
     "action": "Darbība",
+    "not_selected": "Not selected",
     "note": "Piezīme",
     "category_id": "Kategorijas Id",
     "date": "Datums",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Summa",
   "pdf_subtotal": "Starpsumma",
   "pdf_total": "Kopā",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "MAKSĀJUMA IZDRUKA",
   "pdf_payment_date": "Maksājuma datums",
   "pdf_payment_number": "Maksājuma numurs",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "IZDEVUMU ATSKAITE",
   "pdf_total_expenses_label": "KOPĀ IZDEVUMI",
   "pdf_profit_loss_label": "PEĻŅAS & IZDEVUMU ATSKAITE",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "IENĀKUMI",
   "pdf_net_profit_label": "PEĻŅA",
   "pdf_customer_sales_report": "Atskaite par pārdoto: Pēc lietotāja",

resources/assets/js/plugins/nl.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Kopiëren van facturering",
     "no_customers": "Nog geen klanten!",
     "no_customers_found": "Geen klanten gevonden!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Hier vind je jouw klanten terug.",
     "primary_display_name": "Primaire weergavenaam",
     "select_currency": "Selecteer valuta",
@@ -200,6 +202,7 @@
     "added_on": "Toegevoegd",
     "price": "Prijs",
     "date_of_creation": "Datum van creatie",
+    "not_selected": "No item selected",
     "action": "Actie",
     "add_item": "Voeg item toe",
     "save_item": "Item opslaan",
@@ -270,6 +273,7 @@
       "required": "Veld is vereist"
     },
     "accepted": "Geaccepteerd",
+    "rejected": "Rejected",
     "sent": "Verzonden",
     "draft": "Concept",
     "declined": "Geweigerd",
@@ -316,6 +320,9 @@
     "all": "Allemaal",
     "paid": "Betaald",
     "unpaid": "Onbetaald",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "Klant",
     "paid_status": "Betaling",
     "ref_no": "REF NR.",
@@ -434,6 +441,8 @@
     "update_payment": "Betaling bijwerken",
     "payment": "Betaling | Betalingen",
     "no_payments": "Nog geen betalingen!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Er zijn geen overeenkomende betalingen!",
     "list_of_payments": "Hier vind je jouw betalingen terug.",
     "select_payment_mode": "Selecteer betalingswijze",
@@ -463,6 +472,7 @@
     "receipt": "Bon",
     "amount": "Bedrag",
     "action": "Actie",
+    "not_selected": "Not selected",
     "note": "Notitie",
     "category_id": "Categorie ID",
     "date": "Uitgavendatum",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Bedrag",
   "pdf_subtotal": "Subtotaal",
   "pdf_total": "Totaal",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "Betalingsafschrift",
   "pdf_payment_date": "Betalingsdatum",
   "pdf_payment_number": "Betalingsnummer",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "UITGAVEN RAPPORT",
   "pdf_total_expenses_label": "TOTALE UITGAVEN",
   "pdf_profit_loss_label": "WINST & VERLIES RAPPORT",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INKOMEN",
   "pdf_net_profit_label": "NETTO WINST",
   "pdf_customer_sales_report": "Verkooprapport: per klant",

resources/assets/js/plugins/pt-br.json

@@ -158,6 +158,8 @@
     "copy_billing_address": "Cópia de faturamento",
     "no_customers": "Ainda não há clientes!",
     "no_customers_found": "Clientes não encontrados!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Esta seção conterá a lista de clientes.",
     "primary_display_name": "Nome de exibição principal",
     "select_currency": "Selecione o tipo de moeda",
@@ -181,6 +183,7 @@
     "added_on": "Adicionado",
     "price": "Preço",
     "date_of_creation": "Data de criação",
+    "not_selected": "No item selected",
     "action": "Ação",
     "add_item": "Adicionar item",
     "save_item": "Salvar item",
@@ -250,6 +253,7 @@
       "required": "Campo obrigatório"
     },
     "accepted": "Aceito",
+    "rejected": "Rejected",
     "sent": "Enviado",
     "draft": "Rascunho",
     "declined": "Rejeitado",
@@ -296,6 +300,9 @@
     "all": "Todas",
     "paid": "Paga",
     "unpaid": "Não Paga",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CLIENTE",
     "paid_status": "STATUS PAGAMENTO",
     "ref_no": "REFERÊNCIA",
@@ -413,6 +420,8 @@
     "update_payment": "Atualizar Pagamento",
     "payment": "Pagamento | Pagamentos",
     "no_payments": "Ainda sem pagamentos!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Não há pagamentos correspondentes!",
     "list_of_payments": "Esta seção conterá a lista de pagamentos.",
     "select_payment_mode": "Selecione a forma de pagamento",
@@ -436,6 +445,7 @@
     "receipt": "Receita",
     "amount": "Montante",
     "action": "Ação",
+    "not_selected": "Not selected",
     "note": "Observação",
     "category_id": "Categoria",
     "date": "Data da Despesa",

resources/assets/js/plugins/pt.json

@@ -177,6 +177,8 @@
     "copy_billing_address": "Cópia de faturamento",
     "no_customers": "Ainda não há clientes!",
     "no_customers_found": "Clientes não encontrados!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Esta seção conterá a lista de clientes.",
     "primary_display_name": "Nome de exibição principal",
     "select_currency": "Selecione o tipo de moeda",
@@ -200,6 +202,7 @@
     "added_on": "Adicionado",
     "price": "Preço",
     "date_of_creation": "Data de criação",
+    "not_selected": "No item selected",
     "action": "Ação",
     "add_item": "Adicionar item",
     "save_item": "Salvar item",
@@ -270,6 +273,7 @@
       "required": "Campo obrigatório"
     },
     "accepted": "Aceito",
+    "rejected": "Rejected",
     "sent": "Enviado",
     "draft": "Rascunho",
     "declined": "Rejeitado",
@@ -316,6 +320,9 @@
     "all": "Todas",
     "paid": "Paga",
     "unpaid": "Não Paga",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "CLIENTE",
     "paid_status": "STATUS PAGAMENTO",
     "ref_no": "REFERÊNCIA",
@@ -434,6 +441,8 @@
     "update_payment": "Atualizar Pagamento",
     "payment": "Pagamento | Pagamentos",
     "no_payments": "Ainda sem pagamentos!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Não há pagamentos correspondentes!",
     "list_of_payments": "Esta seção conterá a lista de pagamentos.",
     "select_payment_mode": "Selecione a forma de pagamento",
@@ -463,6 +472,7 @@
     "receipt": "Receita",
     "amount": "Montante",
     "action": "Ação",
+    "not_selected": "Not selected",
     "note": "Observação",
     "category_id": "Categoria",
     "date": "Data da Despesa",
@@ -1147,6 +1157,7 @@
   "pdf_amount_label": "Montante",
   "pdf_subtotal": "Subtotal",
   "pdf_total": "Total",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "PAYMENT RECEIPT",
   "pdf_payment_date": "Payment Date",
   "pdf_payment_number": "Número do Pagamento",
@@ -1155,6 +1166,9 @@
   "pdf_expense_report_label": "EXPENSES REPORT",
   "pdf_total_expenses_label": "TOTAL EXPENSE",
   "pdf_profit_loss_label": "PROFIT & LOSS REPORT",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "INCOME",
   "pdf_net_profit_label": "NET PROFIT",
   "pdf_customer_sales_report": "Sales Report: By Customer",

resources/assets/js/plugins/sr.json

@@ -178,6 +178,8 @@
     "copy_billing_address": "Kopiraj iz adrese za naplatu",
     "no_customers": "Još uvek nema klijenata!",
     "no_customers_found": "Klijenti nisu pronađeni!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Ova sekcija će da sadrži spisak klijenata.",
     "primary_display_name": "Primarni naziv koji se prikazuje",
     "select_currency": "Odaberi valutu",
@@ -201,6 +203,7 @@
     "added_on": "Datum dodavanja",
     "price": "Cena",
     "date_of_creation": "Datum kreiranja",
+    "not_selected": "No item selected",
     "action": "Akcije",
     "add_item": "Dodaj Stavku",
     "save_item": "Sačuvaj Stavku",
@@ -271,6 +274,7 @@
       "required": "Polje je obavezno"
     },
     "accepted": "Prihvaćeno",
+    "rejected": "Rejected",
     "sent": "Poslato",
     "draft": "U izradi",
     "declined": "Odbijeno",
@@ -317,6 +321,9 @@
     "all": "Sve",
     "paid": "Plaćeno",
     "unpaid": "Neplaćeno",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "KLIJENT",
     "paid_status": "STATUS UPLATE",
     "ref_no": "POZIV NA BROJ",
@@ -435,6 +442,8 @@
     "update_payment": "Ažuriraj Uplatu",
     "payment": "Uplata | Uplate",
     "no_payments": "Još uvek nema uplata!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Ne postoje uplate koje odgovaraju pretrazi!",
     "list_of_payments": "Ova sekcija će da sadrži listu uplata.",
     "select_payment_mode": "Odaberi način plaćanja",
@@ -464,6 +473,7 @@
     "receipt": "Račun",
     "amount": "Iznos",
     "action": "Akcija",
+    "not_selected": "Not selected",
     "note": "Napomena",
     "category_id": "ID kategorije",
     "date": "Datum",
@@ -1150,6 +1160,7 @@
   "pdf_amount_label": "Iznos",
   "pdf_subtotal": "Osnovica za obračun PDV-a",
   "pdf_total": "Ukupan iznos",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "POTVRDA O UPLATI",
   "pdf_payment_date": "Datum Uplate",
   "pdf_payment_number": "Broj Uplate",
@@ -1158,6 +1169,9 @@
   "pdf_expense_report_label": "IZVEŠTAJ O RASHODIMA",
   "pdf_total_expenses_label": "RASHODI UKUPNO",
   "pdf_profit_loss_label": "IZVEŠTAJ O PRIHODIMA I RASHODIMA",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "PRIHOD",
   "pdf_net_profit_label": "NETO PROFIT",
   "pdf_customer_sales_report": "Izveštaj o Prodaji: Po Klijentu",

resources/assets/js/plugins/sv.json

@@ -178,6 +178,8 @@
     "copy_billing_address": "Kopiera från faktura",
     "no_customers": "Inga kunder än!",
     "no_customers_found": "Hittade inga kunder!",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
     "list_of_customers": "Här kommer det finnas en lista med kunder.",
     "primary_display_name": "Visningsnamn",
     "select_currency": "Välj valuta",
@@ -201,6 +203,7 @@
     "added_on": "Tillagd den",
     "price": "Pris",
     "date_of_creation": "Skapandedatum",
+    "not_selected": "No item selected",
     "action": "Handling",
     "add_item": "Skapa artikel",
     "save_item": "Spara artikel",
@@ -271,6 +274,7 @@
       "required": "Fältet är tvingande"
     },
     "accepted": "Accepterad",
+    "rejected": "Rejected",
     "sent": "Skickat",
     "draft": "Utkast",
     "declined": "Avvisad",
@@ -317,6 +321,9 @@
     "all": "Alla",
     "paid": "Betalda",
     "unpaid": "Obetalda",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "completed": "Completed",
     "customer": "KUNDER",
     "paid_status": "BETALSTATUS",
     "ref_no": "REF NR.",
@@ -435,6 +442,8 @@
     "update_payment": "Uppdatera betalning",
     "payment": "Betalning | Betalningar",
     "no_payments": "Inga betalningar än!",
+    "not_selected": "Not selected",
+    "no_invoice": "No invoice",
     "no_matching_payments": "Inga matchande betalningar!",
     "list_of_payments": "Här kommer listan med betalningar finnas.",
     "select_payment_mode": "Välj betalningssätt",
@@ -464,6 +473,7 @@
     "receipt": "Kvitto",
     "amount": "Summa",
     "action": "Handling",
+    "not_selected": "Not selected",
     "note": "Notering",
     "category_id": "Kategorins ID",
     "date": "Datum",
@@ -1149,6 +1159,7 @@
   "pdf_amount_label": "Belopp",
   "pdf_subtotal": "Delsumma",
   "pdf_total": "Summa",
+  "pdf_payment_label": "Payment",
   "pdf_payment_receipt_label": "Betalningskvitto",
   "pdf_payment_date": "Betalningsdatum",
   "pdf_payment_number": "Betalningsnummer",
@@ -1157,6 +1168,9 @@
   "pdf_expense_report_label": "Kostnadsrapport",
   "pdf_total_expenses_label": "Totalkostnad",
   "pdf_profit_loss_label": "Resultat- och förlustrapport",
+  "pdf_sales_customers_label": "Sales Customer Report",
+  "pdf_sales_items_label": "Sales Item Report",
+  "pdf_tax_summery_label": "Tax Summary Report",
   "pdf_income_label": "Inkomst",
   "pdf_net_profit_label": "Nettoförtjänst",
   "pdf_customer_sales_report": "Försäljningsrapport: Per kund",

resources/assets/js/views/customers/Index.vue

@@ -2,10 +2,10 @@
   <base-page class="customer-create">
     <sw-page-header :title="$t('customers.title')">
       <sw-breadcrumb slot="breadcrumbs">
-        <sw-breadcrumb-item to="dashboard" :title="$t('general.home')" />
+        <sw-breadcrumb-item :title="$t('general.home')" to="dashboard" />
         <sw-breadcrumb-item
-          to="#"
           :title="$tc('customers.customer', 2)"
+          to="#"
           active
         />
       </sw-breadcrumb>
@@ -159,7 +159,7 @@
           :filterable="false"
           cell-class="no-click"
         >
-          <div class="relative block" slot-scope="row">
+          <div slot-scope="row" class="relative block">
             <sw-checkbox
               :id="row.id"
               v-model="selectField"
@@ -195,7 +195,7 @@
           <template slot-scope="row">
             <span>{{ $t('customers.contact_name') }}</span>
             <span>
-              {{ row.contact_name ? row.contact_name : 'No Contact Name' }}
+              {{ row.contact_name ? row.contact_name : $t('customers.no_contact_name') }}
             </span>
           </template>
         </sw-table-column>
@@ -208,7 +208,7 @@
           <template slot-scope="row">
             <span>{{ $t('customers.phone') }}</span>
             <span>
-              {{ row.phone ? row.phone : 'No Contact' }}
+              {{ row.phone ? row.phone : $t('customers.no_contact') }}
             </span>
           </template>
         </sw-table-column>
@@ -243,16 +243,16 @@
               <dot-icon slot="activator" />
 
               <sw-dropdown-item
-                tag-name="router-link"
                 :to="`customers/${row.id}/edit`"
+                tag-name="router-link"
               >
                 <pencil-icon class="h-5 mr-3 text-gray-600" />
                 {{ $t('general.edit') }}
               </sw-dropdown-item>
 
               <sw-dropdown-item
-                tag-name="router-link"
                 :to="`customers/${row.id}/view`"
+                tag-name="router-link"
               >
                 <eye-icon class="h-5 mr-3 text-gray-600" />
                 {{ $t('general.view') }}
@@ -281,7 +281,6 @@ import {
   EyeIcon,
 } from '@vue-hero-icons/solid'
 import AstronautIcon from '../../components/icon/AstronautIcon'
-import { request } from 'http'
 
 export default {
   components: {

resources/assets/js/views/customers/partials/CustomerViewSidebar.vue

@@ -35,10 +35,10 @@
           <sw-dropdown-item class="flex cursor-pointer">
             <sw-input-group class="-mt-3 font-normal">
               <sw-radio
-                :label="$t('customers.create_date')"
-                size="sm"
                 id="filter_create_date"
+                :label="$t('customers.create_date')"
                 v-model="searchData.orderByField"
+                size="sm"
                 name="filter"
                 value="invoices.created_at"
                 @change="onSearch"
@@ -49,10 +49,10 @@
           <sw-dropdown-item class="flex cursor-pointer">
             <sw-input-group class="-mt-3 font-normal">
               <sw-radio
-                :label="$t('customers.display_name')"
-                size="sm"
                 id="filter_display_name"
+                :label="$t('customers.display_name')"
                 v-model="searchData.orderByField"
+                size="sm"
                 name="filter"
                 value="users.name"
                 @change="onSearch"
@@ -62,8 +62,8 @@
         </sw-dropdown>
 
         <sw-button
-          class="ml-1"
           v-tooltip.top-center="{ content: getOrderName }"
+          class="ml-1"
           size="md"
           variant="gray-light"
           @click="sortData"
@@ -102,13 +102,13 @@
             {{ customer.name }}
           </div>
           <div
-            class="mt-1 text-xs not-italic font-medium leading-5 text-gray-600"
             v-if="customer.contact_name"
+            class="mt-1 text-xs not-italic font-medium leading-5 text-gray-600"
           >
             {{ customer.contact_name }}
           </div>
         </div>
-        <div class="flex-1 whitespace-no-wrap right">
+        <div class="flex-1 whitespace-nowrap right">
           <div
             class="text-xl not-italic font-semibold leading-8 text-right text-gray-900"
             v-html="$utils.formatMoney(customer.due_amount, customer.currency)"

resources/assets/js/views/dashboard/DashboardTable.vue

@@ -65,9 +65,11 @@
                 :color="$utils.getBadgeStatusColor(row.status).color"
               >
                 {{
-                  row.status != 'PARTIALLY_PAID'
+                  $utils.getStatusTranslation(
-                    ? row.status
+                    row.status != 'PARTIALLY_PAID'
-                    : row.status.replace('_', ' ')
+                      ? row.status
+                      : row.status.replace('_', ' ')
+                  )
                 }}
               </sw-badge>
             </template>

resources/assets/js/views/errors/404.vue

@@ -9,7 +9,7 @@
           {{ $t('general.you_got_lost') }}
         </h5>
         <router-link
-          class="flex items-center w-32 h-12 px-2 py-1 text-base font-medium leading-none text-center text-white whitespace-no-wrap rounded bg-primary-500 btn-lg hover:text-white"
+          class="flex items-center w-32 h-12 px-2 py-1 text-base font-medium leading-none text-center text-white whitespace-nowrap rounded bg-primary-500 btn-lg hover:text-white"
           to="/admin/dashboard"
         >
           <arrow-left-icon class="mr-2 text-white icon" />

resources/assets/js/views/estimates/Create.vue

@@ -218,7 +218,7 @@
           <div class="mb-6">
             <sw-popup
               ref="notePopup"
-              class="text-sm font-semibold leading-5 text-primary-400"
+              class="z-10 text-sm font-semibold leading-5 text-primary-400"
             >
               <div slot="activator" class="float-right mt-1">
                 + {{ $t('general.insert_note') }}
@@ -322,8 +322,8 @@
                 <sw-button
                   slot="activator"
                   type="button"
-                  class="flex items-center justify-center w-12 border border-gray-300 border-solid rounded-tl-none rounded-bl-none font-base"
                   data-toggle="dropdown"
+                  size="discount"
                   aria-haspopup="true"
                   aria-expanded="false"
                   style="height: 43px"
@@ -469,7 +469,6 @@ export default {
       isLoadingEstimate: false,
       isLoadingData: false,
       isLoading: false,
-      maxDiscount: 0,
       estimateNumAttribute: null,
       estimatePrefix: null,
       EstimateFields: [
@@ -954,12 +953,15 @@ export default {
       let amount = 0
 
       if (selectedTax.compound_tax && this.subtotalWithDiscount) {
-        amount =
+        amount = Math.round(
           ((this.subtotalWithDiscount + this.totalSimpleTax) *
             selectedTax.percent) /
-          100
+            100
+        )
       } else if (this.subtotalWithDiscount && selectedTax.percent) {
-        amount = (this.subtotalWithDiscount * selectedTax.percent) / 100
+        amount = Math.round(
+          (this.subtotalWithDiscount * selectedTax.percent) / 100
+        )
       }
 
       this.newEstimate.taxes.push({
@@ -972,7 +974,7 @@ export default {
         amount,
       })
 
-      if (this.$$refs) {
+      if (this.$refs) {
         this.$refs.taxModal.close()
       }
     },

resources/assets/js/views/estimates/CustomerSelect.vue

@@ -25,7 +25,7 @@
         <div v-if="selectedCustomer.billing_address">
           <div class="flex flex-col">
             <label
-              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-no-wrap"
+              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-nowrap"
             >
               {{ $t('general.bill_to') }}
             </label>
@@ -77,7 +77,7 @@
         <div v-if="selectedCustomer.shipping_address">
           <div class="flex flex-col">
             <label
-              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-no-wrap"
+              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-nowrap"
             >
               {{ $t('general.ship_to') }}
             </label>

resources/assets/js/views/estimates/EstimateTax.vue

@@ -45,11 +45,13 @@ export default {
   computed: {
     taxAmount() {
       if (this.tax.compound_tax && this.total) {
-        return ((this.total + this.totalTax) * this.tax.percent) / 100
+        return Math.round(
+          ((this.total + this.totalTax) * this.tax.percent) / 100
+        )
       }
 
       if (this.total && this.tax.percent) {
-        return (this.total * this.tax.percent) / 100
+        return Math.round((this.total * this.tax.percent) / 100)
       }
 
       return 0

resources/assets/js/views/estimates/Index.vue

@@ -254,7 +254,7 @@
               :color="$utils.getBadgeStatusColor(row.status).color"
               class="px-3 py-1"
             >
-              {{ row.status }}
+              {{ $utils.getStatusTranslation(row.status) }}
             </sw-badge>
           </template>
         </sw-table-column>

resources/assets/js/views/estimates/Item.vue

@@ -85,9 +85,10 @@
                       slot="activator"
                       type="button"
                       data-toggle="dropdown"
+                      size="discount"
                       aria-haspopup="true"
                       aria-expanded="false"
-                      style="height: 43px; padding: 6px"
+                      style="height: 43px"
                       variant="white"
                     >
                       <span class="flex">
@@ -266,22 +267,26 @@ export default {
       return this.subtotal - this.item.discount_val
     },
     totalSimpleTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
+      return Math.round(
-        if (!tax.compound_tax) {
+        window._.sumBy(this.item.taxes, function (tax) {
-          return tax.amount
+          if (!tax.compound_tax) {
-        }
+            return tax.amount
+          }
 
-        return 0
+          return 0
-      })
+        })
+      )
     },
     totalCompoundTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
+      return Math.round(
-        if (tax.compound_tax) {
+        window._.sumBy(this.item.taxes, function (tax) {
-          return tax.amount
+          if (tax.compound_tax) {
-        }
+            return tax.amount
+          }
 
-        return 0
+          return 0
-      })
+        })
+      )
     },
     totalTax() {
       return this.totalSimpleTax + this.totalCompoundTax
@@ -297,7 +302,7 @@ export default {
       set: function (newValue) {
         if (parseFloat(newValue) > 0) {
           this.item.price = Math.round(newValue * 100)
-          this.maxDiscount = this.item.price
+          this.maxDiscount = this.item.price * this.item.quantity
         } else {
           this.item.price = newValue
         }

resources/assets/js/views/estimates/View.vue

@@ -32,8 +32,8 @@
           </sw-dropdown-item>
 
           <sw-dropdown-item
-            tag-name="router-link"
             :to="`/admin/estimates/${$route.params.id}/edit`"
+            tag-name="router-link"
           >
             <pencil-icon class="h-5 mr-3 text-primary-800" />
             {{ $t('general.edit') }}
@@ -96,8 +96,8 @@
                 <sw-radio
                   id="filter_due_date"
                   v-model="searchData.orderByField"
-                  value="expiry_date"
                   :label="$t('estimates.due_date')"
+                  value="expiry_date"
                   size="sm"
                   name="filter"
                   @change="onSearched"
@@ -110,8 +110,8 @@
                 <sw-radio
                   id="filter_estimate_number"
                   v-model="searchData.orderByField"
-                  value="estimate_number"
                   :label="$t('estimates.estimate_number')"
+                  value="estimate_number"
                   size="sm"
                   name="filter"
                   @change="onSearched"
@@ -121,8 +121,8 @@
           </sw-dropdown>
 
           <sw-button
-            class="ml-1"
             v-tooltip.top-center="{ content: getOrderName }"
+            class="ml-1"
             size="md"
             variant="gray-light"
             @click="sortData"
@@ -168,15 +168,15 @@
             </div>
 
             <sw-badge
-              class="px-1 text-xs"
               :bg-color="$utils.getBadgeStatusColor(estimate.status).bgColor"
               :color="$utils.getBadgeStatusColor(estimate.status).color"
+              class="px-1 text-xs"
             >
-              {{ estimate.status }}
+              {{ $utils.getStatusTranslation(estimate.status) }}
             </sw-badge>
           </div>
 
-          <div class="flex-1 whitespace-no-wrap right">
+          <div class="flex-1 whitespace-nowrap right">
             <div
               class="mb-2 text-xl not-italic font-semibold leading-8 text-right text-gray-900"
               v-html="

resources/assets/js/views/expenses/Index.vue

@@ -208,7 +208,7 @@
         >
           <template slot-scope="row">
             <span>{{ $t('expenses.customer') }}</span>
-            <span> {{ row.user_name ? row.user_name : 'Not selected' }} </span>
+            <span> {{ row.user_name ? row.user_name : $t('expenses.not_selected') }} </span>
           </template>
         </sw-table-column>
 

resources/assets/js/views/invoices/Create.vue

@@ -15,7 +15,7 @@
             to="/admin/invoices"
           />
           <sw-breadcrumb-item
-            v-if="$route.name === 'invoice.edit'"
+            v-if="$route.name === 'invoices.edit'"
             :title="$t('invoices.edit_invoice')"
             to="#"
             active
@@ -211,7 +211,7 @@
           <div class="mb-6">
             <sw-popup
               ref="notePopup"
-              class="text-sm font-semibold leading-5 text-primary-400"
+              class="z-10 text-sm font-semibold leading-5 text-primary-400"
             >
               <div slot="activator" class="float-right mt-1">
                 + {{ $t('general.insert_note') }}
@@ -315,8 +315,8 @@
                 <sw-button
                   slot="activator"
                   type="button"
-                  class="flex items-center justify-center w-12 border border-gray-300 border-solid rounded-tl-none rounded-bl-none font-base"
                   data-toggle="dropdown"
+                  size="discount"
                   aria-haspopup="true"
                   aria-expanded="false"
                   style="height: 43px"
@@ -565,23 +565,27 @@ export default {
     },
 
     totalSimpleTax() {
-      return window._.sumBy(this.newInvoice.taxes, function (tax) {
+      return Math.round(
-        if (!tax.compound_tax) {
+        window._.sumBy(this.newInvoice.taxes, function (tax) {
-          return tax.amount
+          if (!tax.compound_tax) {
-        }
+            return tax.amount
+          }
 
-        return 0
+          return 0
-      })
+        })
+      )
     },
 
     totalCompoundTax() {
-      return window._.sumBy(this.newInvoice.taxes, function (tax) {
+      return Math.round(
-        if (tax.compound_tax) {
+        window._.sumBy(this.newInvoice.taxes, function (tax) {
-          return tax.amount
+          if (tax.compound_tax) {
-        }
+            return tax.amount
+          }
 
-        return 0
+          return 0
-      })
+        })
+      )
     },
 
     totalTax() {
@@ -589,9 +593,11 @@ export default {
         return this.totalSimpleTax + this.totalCompoundTax
       }
 
-      return window._.sumBy(this.newInvoice.items, function (tax) {
+      return Math.round(
-        return tax.tax
+        window._.sumBy(this.newInvoice.items, function (tax) {
-      })
+          return tax.tax
+        })
+      )
     },
 
     allTaxes() {
@@ -951,12 +957,15 @@ export default {
       let amount = 0
 
       if (selectedTax.compound_tax && this.subtotalWithDiscount) {
-        amount =
+        amount = Math.round(
           ((this.subtotalWithDiscount + this.totalSimpleTax) *
             selectedTax.percent) /
-          100
+            100
+        )
       } else if (this.subtotalWithDiscount && selectedTax.percent) {
-        amount = (this.subtotalWithDiscount * selectedTax.percent) / 100
+        amount = Math.round(
+          (this.subtotalWithDiscount * selectedTax.percent) / 100
+        )
       }
 
       this.newInvoice.taxes.push({

resources/assets/js/views/invoices/CustomerSelect.vue

@@ -27,7 +27,7 @@
         <div v-if="selectedCustomer.billing_address">
           <div class="flex flex-col">
             <label
-              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-no-wrap"
+              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-nowrap"
             >
               {{ $t('general.bill_to') }}
             </label>
@@ -79,7 +79,7 @@
         <div v-if="selectedCustomer.shipping_address" class="col col-6">
           <div class="flex flex-col">
             <label
-              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-no-wrap"
+              class="mb-1 text-sm font-medium text-gray-500 uppercase whitespace-nowrap"
             >
               {{ $t('general.ship_to') }}
             </label>

resources/assets/js/views/invoices/Index.vue

@@ -241,7 +241,7 @@
               :bg-color="$utils.getBadgeStatusColor(row.status).bgColor"
               :color="$utils.getBadgeStatusColor(row.status).color"
             >
-              {{ row.status.replace('_', ' ') }}
+              {{ $utils.getStatusTranslation(row.status.replace('_', ' ')) }}
             </sw-badge>
           </template>
         </sw-table-column>
@@ -258,7 +258,7 @@
               :bg-color="$utils.getBadgeStatusColor(row.status).bgColor"
               :color="$utils.getBadgeStatusColor(row.status).color"
             >
-              {{ row.paid_status.replace('_', ' ') }}
+              {{ $utils.getStatusTranslation(row.paid_status.replace('_', ' ')) }}
             </sw-badge>
           </template>
         </sw-table-column>

resources/assets/js/views/invoices/InvoiceTax.vue

@@ -45,11 +45,13 @@ export default {
   computed: {
     taxAmount() {
       if (this.tax.compound_tax && this.total) {
-        return ((this.total + this.totalTax) * this.tax.percent) / 100
+        return Math.round(
+          ((this.total + this.totalTax) * this.tax.percent) / 100
+        )
       }
 
       if (this.total && this.tax.percent) {
-        return (this.total * this.tax.percent) / 100
+        return Math.round((this.total * this.tax.percent) / 100)
       }
 
       return 0

resources/assets/js/views/invoices/Item.vue

@@ -83,8 +83,8 @@
                     <sw-button
                       slot="activator"
                       type="button"
-                      class="flex items-center px-5 py-1 text-sm font-medium leading-none text-center text-gray-500 whitespace-no-wrap border border-gray-300 border-solid rounded rounded-tl-none rounded-bl-none dropdown-toggle"
                       data-toggle="dropdown"
+                      size="discount"
                       aria-haspopup="true"
                       aria-expanded="false"
                       style="height: 43px"
@@ -266,22 +266,26 @@ export default {
       return this.subtotal - this.item.discount_val
     },
     totalSimpleTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
+      return Math.round(
-        if (!tax.compound_tax) {
+        window._.sumBy(this.item.taxes, function (tax) {
-          return tax.amount
+          if (!tax.compound_tax) {
-        }
+            return tax.amount
+          }
 
-        return 0
+          return 0
-      })
+        })
+      )
     },
     totalCompoundTax() {
-      return window._.sumBy(this.item.taxes, function (tax) {
+      return Math.round(
-        if (tax.compound_tax) {
+        window._.sumBy(this.item.taxes, function (tax) {
-          return tax.amount
+          if (tax.compound_tax) {
-        }
+            return tax.amount
+          }
 
-        return 0
+          return 0
-      })
+        })
+      )
     },
     totalTax() {
       return this.totalSimpleTax + this.totalCompoundTax
@@ -297,7 +301,7 @@ export default {
       set: function (newValue) {
         if (parseFloat(newValue) > 0) {
           this.item.price = Math.round(newValue * 100)
-          this.maxDiscount = this.item.price
+          this.maxDiscount = this.item.price * this.item.quantity
         } else {
           this.item.price = newValue
         }

resources/assets/js/views/invoices/Tax.vue

@@ -105,11 +105,13 @@ export default {
     },
     taxAmount() {
       if (this.tax.compound_tax && this.total) {
-        return ((this.total + this.totalTax) * this.tax.percent) / 100
+        return Math.round(
+          ((this.total + this.totalTax) * this.tax.percent) / 100
+        )
       }
 
       if (this.total && this.tax.percent) {
-        return (this.total * this.tax.percent) / 100
+        return Math.round((this.total * this.tax.percent) / 100)
       }
 
       return 0

resources/assets/js/views/invoices/View.vue

@@ -27,8 +27,8 @@
             invoice.status === 'OVERDUE' ||
             invoice.status === 'VIEWED'
           "
-          tag-name="router-link"
           :to="`/admin/payments/${$route.params.id}/create`"
+          tag-name="router-link"
           variant="primary"
           class="text-sm"
         >
@@ -45,8 +45,8 @@
           </sw-dropdown-item>
 
           <sw-dropdown-item
-            tag-name="router-link"
             :to="`/admin/invoices/${$route.params.id}/edit`"
+            tag-name="router-link"
           >
             <pencil-icon class="h-5 mr-3 text-gray-600" />
             {{ $t('general.edit') }}
@@ -125,10 +125,10 @@
                 <sw-radio
                   id="filter_invoice_number"
                   v-model="searchData.orderByField"
+                  :label="$t('invoices.invoice_number')"
                   size="sm"
                   type="radio"
                   name="filter"
-                  :label="$t('invoices.invoice_number')"
                   value="invoice_number"
                   @change="onSearch"
                 />
@@ -137,8 +137,8 @@
           </sw-dropdown>
 
           <sw-button
-            class="ml-1"
             v-tooltip.top-center="{ content: getOrderName }"
+            class="ml-1"
             size="md"
             variant="gray-light"
             @click="sortData"
@@ -184,16 +184,16 @@
             </div>
 
             <sw-badge
-              class="px-1 text-xs"
               :bg-color="$utils.getBadgeStatusColor(invoice.status).bgColor"
               :color="$utils.getBadgeStatusColor(invoice.status).color"
               :font-size="$utils.getBadgeStatusColor(invoice.status).fontSize"
+              class="px-1 text-xs"
             >
-              {{ invoice.status }}
+              {{ $utils.getStatusTranslation(invoice.status) }}
             </sw-badge>
           </div>
 
-          <div class="flex-1 whitespace-no-wrap right">
+          <div class="flex-1 whitespace-nowrap right">
             <div
               class="mb-2 text-xl not-italic font-semibold leading-8 text-right text-gray-900"
               v-html="

resources/assets/js/views/items/Index.vue

@@ -189,7 +189,7 @@
             <span>{{ $t('items.unit') }}</span>
 
             <span>
-              {{ row.unit_name ? row.unit_name : 'Not selected' }}
+              {{ row.unit_name ? row.unit_name : $t('items.not_selected') }}
             </span>
           </template>
         </sw-table-column>

resources/assets/js/views/payments/Index.vue

@@ -202,7 +202,7 @@
           <template slot-scope="row">
             <span>{{ $t('payments.payment_mode') }}</span>
             <span>
-              {{ row.payment_mode ? row.payment_mode : 'Not selected' }}
+              {{ row.payment_mode ? row.payment_mode : $t('payments.not_selected') }}
             </span>
           </template>
         </sw-table-column>
@@ -216,7 +216,7 @@
           <template slot-scope="row">
             <span>{{ $t('invoices.invoice_number') }}</span>
             <span>
-              {{ row.invoice_number ? row.invoice_number : 'No Invoice' }}
+              {{ row.invoice_number ? row.invoice_number : $t('payments.no_invoice') }}
             </span>
           </template>
         </sw-table-column>

resources/assets/js/views/payments/View.vue

@@ -20,8 +20,8 @@
           </sw-dropdown-item>
 
           <sw-dropdown-item
-            tag-name="router-link"
             :to="`/admin/payments/${$route.params.id}/edit`"
+            tag-name="router-link"
           >
             <pencil-icon class="h-5 mr-3 text-gray-600" />
             {{ $t('general.edit') }}
@@ -68,10 +68,10 @@
             <sw-dropdown-item class="flex cursor-pointer">
               <sw-input-group class="-mt-3 font-normal">
                 <sw-radio
-                  :label="$t('invoices.title')"
-                  size="sm"
                   id="filter_invoice_number"
+                  :label="$t('invoices.title')"
                   v-model="searchData.orderByField"
+                  size="sm"
                   name="filter"
                   value="invoice_number"
                   @change="onSearch"
@@ -82,10 +82,10 @@
             <sw-dropdown-item class="flex cursor-pointer">
               <sw-input-group class="-mt-3 font-normal">
                 <sw-radio
-                  :label="$t('payments.date')"
-                  size="sm"
                   id="filter_payment_date"
+                  :label="$t('payments.date')"
                   v-model="searchData.orderByField"
+                  size="sm"
                   name="filter"
                   value="payment_date"
                   @change="onSearch"
@@ -109,8 +109,8 @@
           </sw-dropdown>
 
           <sw-button
-            class="ml-1"
             v-tooltip.top-center="{ content: getOrderName }"
+            class="ml-1"
             size="md"
             variant="gray-light"
             @click="sortData"
@@ -162,7 +162,7 @@
             </div>
           </div>
 
-          <div class="flex-1 whitespace-no-wrap right">
+          <div class="flex-1 whitespace-nowrap right">
             <div
               class="mb-2 text-xl not-italic font-semibold leading-8 text-right text-gray-900"
               v-html="$utils.formatMoney(payment.amount, payment.user.currency)"

resources/assets/js/views/reports/ExpensesReport.vue

@@ -65,7 +65,7 @@
       />
 
       <a
-        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-no-wrap rounded md:hidden bg-primary-500"
+        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-nowrap rounded md:hidden bg-primary-500"
         @click="viewReportsPDF"
       >
         <document-text-icon />

resources/assets/js/views/reports/ProfitLossReport.vue

@@ -67,7 +67,7 @@
       />
 
       <a
-        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-no-wrap rounded md:hidden bg-primary-500"
+        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-nowrap rounded md:hidden bg-primary-500"
         @click="viewReportsPDF"
       >
         <document-text-icon />

resources/assets/js/views/reports/SalesReports.vue

@@ -79,7 +79,7 @@
         class="hidden w-full h-screen border-gray-100 border-solid rounded md:flex"
       />
       <a
-        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-no-wrap rounded md:hidden bg-primary-500"
+        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-nowrap rounded md:hidden bg-primary-500"
         @click="viewReportsPDF"
       >
         <document-text-icon />

resources/assets/js/views/reports/TaxReport.vue

@@ -61,7 +61,7 @@
         class="hidden w-full h-screen border-gray-100 border-solid rounded md:flex"
       />
       <a
-        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-no-wrap rounded md:hidden bg-primary-500"
+        class="flex items-center justify-center h-10 px-5 py-1 text-sm font-medium leading-none text-center text-white whitespace-nowrap rounded md:hidden bg-primary-500"
         @click="viewReportsPDF"
       >
         <document-text-icon />

resources/assets/js/views/settings/BackupSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="relative setting-main-container backup">
     <sw-card variant="setting-card">
-      <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+      <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
         <div>
           <h6 class="sw-section-title">
             {{ $tc('settings.backup.title', 1) }}

resources/assets/js/views/settings/CustomFieldsSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <sw-card variant="setting-card">
-    <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+    <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
       <div>
         <h6 class="sw-section-title">
           {{ $t('settings.menu_title.custom_fields') }}

resources/assets/js/views/settings/CustomizationSetting.vue

@@ -59,12 +59,15 @@ export default {
       this.isRequestOnGoing = true
       let res = await this.fetchCompanySettings([
         'payment_auto_generate',
+        'payment_email_attachment',
         'payment_prefix',
         'payment_mail_body',
         'invoice_auto_generate',
+        'invoice_email_attachment',
         'invoice_prefix',
         'invoice_mail_body',
         'estimate_auto_generate',
+        'estimate_email_attachment',
         'estimate_prefix',
         'estimate_mail_body',
         'invoice_billing_address_format',

resources/assets/js/views/settings/ExpenseCategorySetting.vue

@@ -1,6 +1,6 @@
 <template>
   <sw-card variant="setting-card">
-    <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+    <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
       <div>
         <h6 class="sw-section-title">
           {{ $t('settings.expense_category.title') }}
@@ -51,7 +51,7 @@
           }}</span>
           <div class="w-48 overflow-hidden notes">
             <div
-              class="overflow-hidden whitespace-no-wrap"
+              class="overflow-hidden whitespace-nowrap"
               style="text-overflow: ellipsis"
             >
               {{ row.description }}

resources/assets/js/views/settings/FileDiskSetting.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="setting-main-container backup">
     <sw-card variant="setting-card">
-      <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+      <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
         <div>
           <h6 class="sw-section-title">
             {{ $tc('settings.disk.title', 1) }}

resources/assets/js/views/settings/NotesSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <sw-card variant="setting-card">
-    <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+    <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
       <div>
         <h6 class="sw-section-title">
           {{ $t('settings.customization.notes.title') }}

resources/assets/js/views/settings/PaymentsModeSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <sw-card variant="setting-card">
-    <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+    <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
       <div>
         <h6 class="sw-section-title">
           {{ $t('settings.customization.payments.payment_modes') }}

resources/assets/js/views/settings/TaxTypesSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <sw-card variant="setting-card">
-    <div slot="header" class="flex flex-wrap justify-between lg:flex-no-wrap">
+    <div slot="header" class="flex flex-wrap justify-between lg:flex-nowrap">
       <div>
         <h6 class="sw-section-title">
           {{ $t('settings.tax_types.title') }}

resources/assets/js/views/settings/UserProfileSetting.vue

@@ -1,5 +1,5 @@
 <template>
-  <form @submit.prevent="updateUserData" class="relative h-full">
+  <form class="relative h-full" @submit.prevent="updateUserData">
     <base-loader v-if="isRequestOnGoing" :show-bg-overlay="true" />
     <sw-card variant="setting-card">
       <template slot="header">
@@ -17,7 +17,7 @@
       <div class="grid mb-4 md:grid-cols-6">
         <div>
           <label
-            class="text-sm not-italic font-medium leading-4 text-black whitespace-no-wrap"
+            class="text-sm not-italic font-medium leading-4 text-black whitespace-nowrap"
           >
             {{ $tc('settings.account_settings.profile_picture') }}
           </label>
@@ -114,9 +114,9 @@
       </div>
 
       <sw-button
-        class="mt-6"
         :loading="isLoading"
         :disabled="isLoading"
+        class="mt-6"
         variant="primary"
       >
         <save-icon v-if="!isLoading" class="mr-2 -ml-1" />

resources/assets/js/views/settings/customization-tabs/EstimatesTab.vue

@@ -70,7 +70,7 @@
 
     <sw-divider class="mt-6 mb-8" />
 
-    <div class="flex">
+    <div class="flex mt-3 mb-4">
       <div class="relative w-12">
         <sw-switch
           v-model="estimateAutogenerate"
@@ -96,6 +96,32 @@
         </p>
       </div>
     </div>
+    <div class="flex mb-2">
+      <div class="relative w-12">
+        <sw-switch
+          v-model="estimateAsAttachment"
+          class="absolute"
+          style="top: -20px"
+          @change="setEstimateSetting"
+        />
+      </div>
+      <div class="ml-4">
+        <p class="p-0 mb-1 text-base leading-snug text-black">
+          {{
+            $t('settings.customization.estimates.estimate_email_attachment')
+          }}
+        </p>
+
+        <p
+          class="p-0 m-0 text-xs leading-tight text-gray-500"
+          style="max-width: 480px"
+        >
+          {{
+            $t('settings.customization.estimates.estimate_email_attachment_setting_description')
+          }}
+        </p>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -115,6 +141,7 @@ export default {
   data() {
     return {
       estimateAutogenerate: false,
+      estimateAsAttachment: false,
 
       estimates: {
         estimate_prefix: null,
@@ -204,6 +231,14 @@ export default {
       } else {
         this.estimateAutogenerate = false
       }
+
+      this.estimate_email_attachment = val ? val.estimate_email_attachment : ''
+
+      if (this.estimate_email_attachment === 'YES') {
+        this.estimateAsAttachment = true
+      } else {
+        this.estimateAsAttachment = false
+      }
     },
   },
 
@@ -214,6 +249,7 @@ export default {
       let data = {
         settings: {
           estimate_auto_generate: this.estimateAutogenerate ? 'YES' : 'NO',
+          estimate_email_attachment: this.estimateAsAttachment ? 'YES' : 'NO',
         },
       }
       let response = await this.updateCompanySettings(data)

resources/assets/js/views/settings/customization-tabs/InvoicesTab.vue

@@ -74,7 +74,7 @@
 
     <sw-divider class="mt-6 mb-8" />
 
-    <div class="flex">
+    <div class="flex mt-3 mb-4">
       <div class="relative w-12">
         <sw-switch
           v-model="invoiceAutogenerate"
@@ -101,6 +101,33 @@
         </p>
       </div>
     </div>
+    <div class="flex mb-2">
+      <div class="relative w-12">
+        <sw-switch
+          v-model="invoiceAsAttachment"
+          class="absolute"
+          style="top: -20px"
+          @change="setInvoiceSetting"
+        />
+      </div>
+
+      <div class="ml-4">
+        <p class="p-0 mb-1 text-base leading-snug text-black">
+          {{
+            $t('settings.customization.invoices.invoice_email_attachment')
+          }}
+        </p>
+
+        <p
+          class="p-0 m-0 text-xs leading-tight text-gray-500"
+          style="max-width: 480px"
+        >
+          {{
+            $t('settings.customization.invoices.invoice_email_attachment_setting_description')
+          }}
+        </p>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -120,6 +147,7 @@ export default {
   data() {
     return {
       invoiceAutogenerate: false,
+      invoiceAsAttachment: false,
 
       invoices: {
         invoice_prefix: null,
@@ -189,6 +217,14 @@ export default {
       } else {
         this.invoiceAutogenerate = false
       }
+
+      this.invoice_email_attachment = val ? val.invoice_email_attachment : ''
+
+      if (this.invoice_email_attachment === 'YES') {
+        this.invoiceAsAttachment = true
+      } else {
+        this.invoiceAsAttachment = false
+      }
     },
   },
 
@@ -209,6 +245,7 @@ export default {
       let data = {
         settings: {
           invoice_auto_generate: this.invoiceAutogenerate ? 'YES' : 'NO',
+          invoice_email_attachment: this.invoiceAsAttachment ? 'YES' : 'NO',
         },
       }
 

resources/assets/js/views/settings/customization-tabs/ItemsTab.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="flex flex-wrap justify-end mt-8 lg:flex-no-wrap">
+    <div class="flex flex-wrap justify-end mt-8 lg:flex-nowrap">
       <sw-button size="lg" variant="primary-outline" @click="addItemUnit">
         <plus-icon class="w-6 h-6 mr-1 -ml-2" />
         {{ $t('settings.customization.items.add_item_unit') }}

resources/assets/js/views/settings/customization-tabs/PaymentsTab.vue

@@ -63,7 +63,7 @@
 
     <sw-divider class="mt-6 mb-8" />
 
-    <div class="flex">
+    <div class="flex mt-3 mb-4">
       <div class="relative w-12">
         <sw-switch
           v-model="paymentAutogenerate"
@@ -90,6 +90,33 @@
         </p>
       </div>
     </div>
+    <div class="flex mb-2">
+      <div class="relative w-12">
+        <sw-switch
+          v-model="paymentAsAttachment"
+          class="absolute"
+          style="top: -20px"
+          @change="setPaymentSetting"
+        />
+      </div>
+
+      <div class="ml-4">
+        <p class="p-0 mb-1 text-base leading-snug text-black">
+          {{
+            $t('settings.customization.payments.payment_email_attachment')
+          }}
+        </p>
+
+        <p
+          class="p-0 m-0 text-xs leading-tight text-gray-500"
+          style="max-width: 480px"
+        >
+          {{
+            $t('settings.customization.payments.payment_email_attachment_setting_description')
+          }}
+        </p>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -108,6 +135,7 @@ export default {
   data() {
     return {
       paymentAutogenerate: false,
+      paymentAsAttachment: false,
 
       payments: {
         payment_prefix: null,
@@ -184,6 +212,14 @@ export default {
       } else {
         this.paymentAutogenerate = false
       }
+
+      this.payment_email_attachment = val ? val.payment_email_attachment : ''
+
+      if (this.payment_email_attachment === 'YES') {
+        this.paymentAsAttachment = true
+      } else {
+        this.paymentAsAttachment = false
+      }
     },
   },
 
@@ -203,6 +239,7 @@ export default {
       let data = {
         settings: {
           payment_auto_generate: this.paymentAutogenerate ? 'YES' : 'NO',
+          payment_email_attachment: this.paymentAsAttachment ? 'YES' : 'NO',
         },
       }
       let response = await this.updateCompanySettings(data)

resources/assets/sass/crater.scss

@@ -1,11 +1,9 @@
-// Tailwind
+@tailwind base;
-//----------------------------------
 
-@import 'tailwindcss/base';
+@tailwind components;
 
-@import 'tailwindcss/components';
+@tailwind utilities;
 
-@import 'tailwindcss/utilities';
 
 // Plugins
 //----------------------------------

resources/views/app/pdf/estimate/estimate1.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Estimate</title>
+    <title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">

resources/views/app/pdf/estimate/estimate2.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Estimate</title>
+    <title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <style type="text/css">
         /* -- Base -- */

resources/views/app/pdf/estimate/estimate3.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Estimate</title>
+    <title>@lang('pdf_estimate_label') - {{$estimate->estimate_number}}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">

resources/views/app/pdf/estimate/partials/table.blade.php

@@ -34,7 +34,7 @@
                 class="pr-20 text-right item-cell"
                 style="vertical-align: top;"
             >
-                {{$item->quantity}}
+                {{$item->quantity}} @if($item->unit_name) {{$item->unit_name}} @endif
             </td>
             <td
                 class="pr-20 text-right item-cell"
@@ -94,26 +94,27 @@
                 </tr>
             @endforeach
         @endif
-
+        @if($estimate->discount > 0)
-        @if ($estimate->discount_per_item === 'NO')
+            @if ($estimate->discount_per_item === 'NO')
-            <tr>
+                <tr>
-                <td class="pl-10 border-0 total-table-attribute-label">
+                    <td class="pl-10 border-0 total-table-attribute-label">
-                    @if($estimate->discount_type === 'fixed')
+                        @if($estimate->discount_type === 'fixed')
-                        @lang('pdf_discount_label')
+                            @lang('pdf_discount_label')
-                    @endif
+                        @endif
-                    @if($estimate->discount_type === 'percentage')
+                        @if($estimate->discount_type === 'percentage')
-                        @lang('pdf_discount_label') ({{$estimate->discount}}%)
+                            @lang('pdf_discount_label') ({{$estimate->discount}}%)
-                    @endif
+                        @endif
-                </td>
+                    </td>
-                <td class="text-right border-0 item-cell total-table-attribute-value">
+                    <td class="text-right border-0 item-cell total-table-attribute-value">
-                    @if($estimate->discount_type === 'fixed')
+                        @if($estimate->discount_type === 'fixed')
-                        {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
+                            {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
-                    @endif
+                        @endif
-                    @if($estimate->discount_type === 'percentage')
+                        @if($estimate->discount_type === 'percentage')
-                        {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
+                            {!! format_money_pdf($estimate->discount_val, $estimate->user->currency) !!}
-                    @endif
+                        @endif
-                </td>
+                    </td>
-            </tr>
+                </tr>
+            @endif
         @endif
         <tr>
             <td class="py-3"></td>

resources/views/app/pdf/invoice/invoice1.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Invoice</title>
+    <title>@lang('pdf_invoice_label') - {{$invoice->invoice_number}}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">
@@ -69,7 +69,6 @@
             padding-left: 30px;
             float: left;
             width: 30%;
-            text-transform: capitalize;
             margin-bottom: 2px;
         }
 
@@ -215,7 +214,6 @@
 
         .total-display-table {
             border-top: none;
-            box-sizing: border-box;
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;

resources/views/app/pdf/invoice/invoice2.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Invoice</title>
+    <title>@lang('pdf_invoice_label') - {{$invoice->invoice_number}}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <style type="text/css">
         /* -- Base -- */
@@ -256,7 +256,6 @@
         }
 
         .total-display-table {
-            box-sizing: border-box;
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;

resources/views/app/pdf/invoice/invoice3.blade.php

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-    <title>Invoice</title>
+    <title>@lang('pdf_invoice_label') - {{$invoice->invoice_number}}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">
@@ -42,7 +42,6 @@
         }
         .company-address-container {
             width: 50%;
-            text-transform: capitalize;
             padding-left: 80px;
             margin-bottom: 2px;
         }
@@ -185,7 +184,6 @@
 
 
         .total-display-table {
-            box-sizing: border-box;
             page-break-inside: avoid;
             page-break-before: auto;
             page-break-after: auto;

resources/views/app/pdf/invoice/partials/table.blade.php

@@ -31,7 +31,7 @@
                 class="pr-20 text-right item-cell"
                 style="vertical-align: top;"
             >
-                {{$item->quantity}}
+                {{$item->quantity}} @if($item->unit_name) {{$item->unit_name}} @endif
             </td>
             <td
                 class="pr-20 text-right item-cell"
@@ -39,19 +39,21 @@
             >
                 {!! format_money_pdf($item->price, $invoice->user->currency) !!}
             </td>
+
             @if($invoice->discount_per_item === 'YES')
                 <td
                     class="pl-10 text-right item-cell"
                     style="vertical-align: top;"
                 >
                     @if($item->discount_type === 'fixed')
-                        {!! format_money_pdf($item->discount_val, $invoice->user->currency) !!}
+                            {!! format_money_pdf($item->discount_val, $invoice->user->currency) !!}
-                    @endif
+                        @endif
-                    @if($item->discount_type === 'percentage')
+                        @if($item->discount_type === 'percentage')
-                        {{$item->discount}}%
+                            {{$item->discount}}%
-                    @endif
+                        @endif
                 </td>
             @endif
+
             <td
                 class="text-right item-cell"
                 style="vertical-align: top;"
@@ -100,26 +102,29 @@
             @endforeach
         @endif
 
-        @if ($invoice->discount_per_item === 'NO')
+        @if($invoice->discount > 0)
-            <tr>
+            @if ($invoice->discount_per_item === 'NO')
-                <td class="border-0 total-table-attribute-label">
+                <tr>
-                    @if($invoice->discount_type === 'fixed')
+                    <td class="border-0 total-table-attribute-label">
-                        @lang('pdf_discount_label')
+                        @if($invoice->discount_type === 'fixed')
-                    @endif
+                            @lang('pdf_discount_label')
-                    @if($invoice->discount_type === 'percentage')
+                        @endif
-                        @lang('pdf_discount_label') ({{$invoice->discount}}%)
+                        @if($invoice->discount_type === 'percentage')
-                    @endif
+                            @lang('pdf_discount_label') ({{$invoice->discount}}%)
-                </td>
+                        @endif
-                <td class="py-2 border-0 item-cell total-table-attribute-value" >
+                    </td>
-                    @if($invoice->discount_type === 'fixed')
+                    <td class="py-2 border-0 item-cell total-table-attribute-value" >
-                        {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
+                        @if($invoice->discount_type === 'fixed')
-                    @endif
+                            {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
-                    @if($invoice->discount_type === 'percentage')
+                        @endif
-                        {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
+                        @if($invoice->discount_type === 'percentage')
-                    @endif
+                            {!! format_money_pdf($invoice->discount_val, $invoice->user->currency) !!}
-                </td>
+                        @endif
-            </tr>
+                    </td>
+                </tr>
+            @endif
         @endif
+
         <tr>
             <td class="py-3"></td>
             <td class="py-3"></td>

resources/views/app/pdf/payment/payment.blade.php

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-    <title>Payment</title>
+    <title>@lang('pdf_estimate_label') - {{$payment->payment_number}}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <style type="text/css">
         /* -- Base -- */
@@ -15,13 +16,14 @@
             padding: 0px;
             margin-top: 50px;
         }
+
         table {
             border-collapse: collapse;
         }
 
         hr {
-           color: rgba(0, 0, 0, 0.2);
+            color: rgba(0, 0, 0, 0.2);
-           border: 0.5px solid #EAF1FB;
+            border: 0.5px solid #EAF1FB;
         }
 
         /* -- Heeader -- */
@@ -51,12 +53,14 @@
             color: #817AE3;
             padding-top: 0px;
         }
+
         .company-address-container {
             width: 50%;
             text-transform: capitalize;
             padding-left: 80px;
             margin-bottom: 2px;
         }
+
         /* .header-section-right {
             display:inline-block;
             position: absolute;
@@ -77,7 +81,7 @@
         /* -- Company Address -- */
 
         .company-details h1 {
-            margin:0;
+            margin: 0;
 
             font-weight: bold;
             font-size: 15px;
@@ -87,8 +91,8 @@
             max-width: 220px;
         }
 
-        .company-address{
+        .company-address {
-             /* margin-top: 12px; */
+            /* margin-top: 12px; */
             font-size: 12px;
             line-height: 15px;
             color: #595959;
@@ -96,8 +100,8 @@
         }
 
         .content-wrapper {
-           display: block;
+            display: block;
-           height: 200px;
+            height: 200px;
         }
 
         .main-content {
@@ -108,8 +112,8 @@
         /* -- Customer Address -- */
         .customer-address-container {
             display: block;
-            float:left;
+            float: left;
-            width:40%;
+            width: 40%;
             padding: 0 0 0 30px;
         }
 
@@ -167,7 +171,7 @@
             font-size: 10px;
             line-height: 15px;
             color: #595959;
-            margin:0px;
+            margin: 0px;
             width: 180px;
             word-wrap: break-word;
         }
@@ -226,7 +230,7 @@
 
         p {
             padding: 0 0 0 0;
-            margin:  0 0 0 0;
+            margin: 0 0 0 0;
         }
 
         .content-heading span {
@@ -258,7 +262,7 @@
             color: #595959;
         }
 
-        .total-display-box span {
+        .total-display-box .amount {
             float: right;
             font-weight: bold;
             font-size: 14px;
@@ -268,21 +272,22 @@
         }
     </style>
 </head>
+
 <body>
     <div class="header-container">
         <table width="100%">
             <tr>
                 @if($logo)
-                    <td  width="50%" class="header-section-left">
+                <td width="50%" class="header-section-left">
-                        <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
+                    <img class="header-logo" src="{{ $logo }}" alt="Company Logo">
-                @else
+                    @else
                     @if($payment->user->company)
-                    <td class="header-section-left" style="padding-top:0px;">
+                <td class="header-section-left" style="padding-top:0px;">
-                        <h1 class="header-logo"> {{$payment->user->company->name}} </h1>
+                    <h1 class="header-logo"> {{$payment->user->company->name}} </h1>
+                    @endif
                     @endif
-                @endif
                 </td>
-                <td  width="50%" class="header-section-right company-details company-address">
+                <td width="50%" class="header-section-right company-details company-address">
                     {!! $company_address !!}
                 </td>
             </tr>
@@ -300,8 +305,8 @@
             <div class="customer-address-container">
                 <div class="billing-address-container billing-address">
                     @if($billing_address)
-                        @lang('pdf_received_from')
+                    @lang('pdf_received_from')
-                        {!! $billing_address !!}
+                    {!! $billing_address !!}
                     @endif
                 </div>
                 <div class="billing-address-container--right">
@@ -324,10 +329,10 @@
                         <td class="attribute-value"> &nbsp;{{$payment->paymentMethod ? $payment->paymentMethod->name : '-'}}</td>
                     </tr>
                     @if ($payment->invoice && $payment->invoice->invoice_number)
-                        <tr>
+                    <tr>
-                            <td class="attribute-label">@lang('pdf_invoice_label')</td>
+                        <td class="attribute-label">@lang('pdf_invoice_label')</td>
-                            <td class="attribute-value"> &nbsp;{{$payment->invoice->invoice_number}}</td>
+                        <td class="attribute-value"> &nbsp;{{$payment->invoice->invoice_number}}</td>
-                        </tr>
+                    </tr>
                     @endif
                 </table>
             </div>
@@ -336,7 +341,8 @@
     </div>
     <div class="total-display-box">
         <p class="total-display-label">@lang('pdf_payment_amount_received_label')</p>
-        <span>{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
+        <span class="amount">{!! format_money_pdf($payment->amount, $payment->user->currency) !!}</span>
     </div>
 </body>
+
 </html>

resources/views/app/pdf/reports/expenses.blade.php

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Expenses Report</title>
+    <title>@lang('pdf_expense_report_label')</title>
     <style type="text/css">
         body {
             font-family: "DejaVu Sans";

resources/views/app/pdf/reports/profit-loss.blade.php

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Profit & Loss Report</title>
+    <title>@lang('pdf_profit_loss_label')</title>
     <style type="text/css">
         body {
             font-family: "DejaVu Sans";

resources/views/app/pdf/reports/sales-customers.blade.php

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Sales Customer Report</title>
+    <title>@lang('pdf_sales_customers_label')</title>
     <style type="text/css">
         body {
             font-family: "DejaVu Sans";