build 402

Template Refactor

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

app/Console/Commands/ResetApp.php

@@ -3,17 +3,20 @@
 namespace Crater\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Console\ConfirmableTrait;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Filesystem\Filesystem;
 
 class ResetApp extends Command
 {
+    use ConfirmableTrait;
+
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'reset:app';
+    protected $signature = 'reset:app {--force}';
 
     /**
      * The console command description.
@@ -39,13 +42,28 @@ class ResetApp extends Command
      */
     public function handle()
     {
-        if ($this->confirm('Do you wish to continue? This will delete your tables')) {
+        if (!$this->confirmToProceed()) {
-            Artisan::call('migrate:reset --force');
+            return;
-
-            \Storage::disk('local')->delete('database_created');
-
-            // $file = new Filesystem;
-            // $file->cleanDirectory('public/storage');
         }
+
+        $this->info('Running migrate:fresh');
+
+        Artisan::call('migrate:fresh --seed --force');
+
+        $this->info('Seeding database');
+
+        Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
+
+        $path = base_path('.env');
+
+        if (file_exists($path)) {
+            file_put_contents($path, str_replace(
+                'APP_DEBUG=true',
+                'APP_DEBUG=false',
+                file_get_contents($path)
+            ));
+        }
+
+        $this->info('App has been reset successfully');
     }
 }

config/crater.php

@@ -17,10 +17,11 @@ return [
         ["code"=>"fr", "name" => "French"],
         ["code"=>"de", "name" => "German"],
         ["code"=>"it", "name" => "Italian"],
-        ["code"=>"pt_BR", "name" => "Portuguese (Brazilian)"],
-        ["code"=>"es", "name" => "Spanish"],
         ["code"=>"lv", "name" => "Latvian"],
-        ["code"=>"sr_LA", "name" => "Serbian Latin"],
+        ["code"=>"pt_BR", "name" => "Portuguese (Brazilian)"],
+        ["code"=>"sr", "name" => "Serbian Latin"],
+        ["code"=>"es", "name" => "Spanish"],
+        ["code"=>"sv", "name"=> "Svenska"]
     ],
 
     /*

database/migrations/2020_12_23_061302_update_crater_version_402.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 UpdateCraterVersion402 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Setting::setSetting('version', '4.0.2');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/assets/js/app.js": "/assets/js/app.js?id=bb2c4150e0caffb9f475",
+    "/assets/js/app.js": "/assets/js/app.js?id=1d9cf52055fe7be22fd1",
-    "/assets/css/crater.css": "/assets/css/crater.css?id=180193a313e33aed1712"
+    "/assets/css/crater.css": "/assets/css/crater.css?id=912348e74f68a41a1b35"
 }

readme.md

@@ -68,14 +68,24 @@ Crater is a product of [Bytefury](https://bytefury.com)
 **Special thanks to:**
 
 - [Birkhoff Lee](https://github.com/BirkhoffLee)
-- [Hassan A. Ba Abdullah](https://github.com/hsnapps)
 - [Akaunting](https://github.com/akaunting/akaunting)
+- [MakerLab](https://github.com/MakerLab-Dev)
 
 ## Translate
 
 Help us translate on https://crowdin.com/project/crater-invoice
 
+**Thanks to Translation Contributors:**
+
+- [Hassan A. Ba Abdullah (Arabic)](https://github.com/hsnapps)
+- [Clément de Louvencourt (French)](https://github.com/PHClement)
+- [Robin Delattre (French)](https://github.com/RobinDev)
+- [René Loos (Dutch)](https://github.com/Loosie94)
+- [Stefan Azarić (Serbian)](https://github.com/azaricstefan)
+- [Emmanuel Lampe (German)](https://github.com/rexlManu)
+- [edevrob (Latvian)](https://github.com/edevrob)
+
 ## License
 
 Crater is released under the Attribution Assurance License.
-See [LICENSE](LICENSE) for details.
+See [LICENSE](https://craterapp.com/license) for full details & use-cases.

resources/assets/js/components/base/BaseDatePicker.vue

@@ -18,8 +18,6 @@
 import { mapGetters } from 'vuex'
 import SwDatePicker from '@bytefury/spacewind/src/components/SwDatePicker'
 import moment from 'moment'
-const fromMomentDate = (date, format = 'YYYY-MM-DD') =>
-  moment(new Date(date), format)
 
 export default {
   components: {
@@ -76,13 +74,17 @@ export default {
     }),
   },
   watch: {
-    value(val) {
+    // value(val) {
-      if (val && !this.enableTime) {
+    //   console.log(val)
-        this.date = fromMomentDate(val, 'YYYY-MM-DD').format('YYYY-MM-DD')
+
-      } else {
+    //   if (val && !this.enableTime) {
-        this.date = fromMomentDate(val, 'YYYY-MM-DD').format('YYYY-MM-DD H:m:s')
+    //     this.date = moment(new Date(val), 'YYYY-MM-DD').format('YYYY-MM-DD')
-      }
+    //   } else {
-    },
+    //     this.date = moment(new Date(val), 'YYYY-MM-DD').format(
+    //       'YYYY-MM-DD H:m:s'
+    //     )
+    //   }
+    // },
     enableTime(val) {
       this.$set(this.config, 'enableTime', this.enableTime)
     },
@@ -104,6 +106,7 @@ export default {
   },
   mounted() {
     this.$set(this.config, 'enableTime', this.enableTime)
+
     if (!this.enableTime) {
       this.$set(
         this.config,
@@ -117,12 +120,16 @@ export default {
         this.carbonFormat ? `${this.carbonFormat} H:i ` : 'd M Y H:i'
       )
     }
+
     if (this.value && !this.enableTime) {
-      this.date = fromMomentDate(this.value, 'YYYY-MM-DD').format('YYYY-MM-DD')
+      this.date = moment(new Date(this.value), 'YYYY-MM-DD').format(
+        'YYYY-MM-DD'
+      )
       return true
     }
+
     if (this.value) {
-      this.date = fromMomentDate(this.value, 'YYYY-MM-DD').format(
+      this.date = moment(new Date(this.value), 'YYYY-MM-DD').format(
         'YYYY-MM-DD HH:mm:SS'
       )
     }
@@ -130,7 +137,6 @@ export default {
   methods: {
     onDateChange(date) {
       this.$emit('input', date)
-      this.$emit('change', date)
     },
   },
 }

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

@@ -15,6 +15,7 @@
     </sw-modal>
   </div>
 </template>
+
 <script>
 import { XIcon } from '@vue-hero-icons/solid'
 import { mapActions, mapGetters } from 'vuex'

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

@@ -1,7 +1,7 @@
 <template>
   <div class="template-modal">
     <div class="px-8 py-8 sm:p-6">
-      <div class="flex flex-wrap justify-start p-1 overflow-x-auto sw-scroll">
+      <div class="grid grid-cols-3 gap-2 p-1 overflow-x-auto sw-scroll">
         <div
           v-for="(template, index) in modalData"
           :key="index"
@@ -9,21 +9,28 @@
             'border border-solid border-primary-500':
               selectedTemplate === template.id,
           }"
-          class="relative m-2 border border-gray-200 border-solid"
+          class="relative flex flex-col m-2 border border-gray-200 border-solid cursor-pointer hover:border-primary-300"
+          @click="selectedTemplate = template.id"
         >
-          <img
+          <img :src="template.path" alt="template-image" />
-            :src="template.path"
-            alt="template-image"
-            height="200"
-            width="140"
-            @click="selectedTemplate = template.id"
-          />
           <img
             v-if="selectedTemplate === template.id"
             class="absolute z-10 w-5 h-5 text-primary-500"
             style="top: -6px; right: -5px"
             src="/assets/img/tick.png"
           />
+          <span
+            :class="[
+              'w-full p-1 bg-gray-200 text-sm text-center absolute bottom-0 left-0',
+              {
+                'text-primary-500 bg-primary-100':
+                  selectedTemplate === template.id,
+                'text-gray-600': selectedTemplate != template.id,
+              },
+            ]"
+          >
+            {{ template.name }}
+          </span>
         </div>
       </div>
     </div>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="template-modal">
     <div class="px-8 py-8 sm:p-6">
-      <div class="flex flex-wrap justify-start p-1 overflow-x-auto sw-scroll">
+      <div class="grid grid-cols-3 gap-2 p-1 overflow-x-auto sw-scroll">
         <div
           v-for="(template, index) in modalData"
           :key="index"
@@ -9,21 +9,28 @@
             'border border-solid border-primary-500':
               selectedTemplate === template.id,
           }"
-          class="relative m-2 border border-gray-200 border-solid"
+          class="relative flex flex-col m-2 border border-gray-200 border-solid cursor-pointer hover:border-primary-300"
+          @click="selectedTemplate = template.id"
         >
-          <img
+          <img :src="template.path" alt="template-image" />
-            :src="template.path"
-            alt="template-image"
-            height="200"
-            width="140"
-            @click="selectedTemplate = template.id"
-          />
           <img
             v-if="selectedTemplate === template.id"
             class="absolute z-10 w-5 h-5 text-primary-500"
             style="top: -6px; right: -5px"
             src="/assets/img/tick.png"
           />
+          <span
+            :class="[
+              'w-full p-1 bg-gray-200 text-sm text-center absolute bottom-0 left-0',
+              {
+                'text-primary-500 bg-primary-100':
+                  selectedTemplate === template.id,
+                'text-gray-600': selectedTemplate != template.id,
+              },
+            ]"
+          >
+            {{ template.name }}
+          </span>
         </div>
       </div>
     </div>

resources/assets/js/components/base/popup/NoteSelectPopup.vue

@@ -36,12 +36,12 @@
 
     <button
       type="button"
-      class="flex items-center justify-center w-full px-2 py-3 bg-gray-200 border-none outline-none"
+      class="flex items-center justify-center w-full px-2 py-3 bg-gray-200 border-none outline-none hover:bg-gray-300"
       @click="openNoteModal"
     >
       <check-circle-icon class="h-5" />
       <label
-        class="m-0 ml-3 text-sm leading-none cursor-pointer font-base text-primary-400"
+        class="m-0 ml-1 text-sm leading-none cursor-pointer font-base text-primary-400"
       >
         {{ $t('settings.customization.notes.add_new_note') }}
       </label>

resources/assets/js/plugins/de.json

@@ -10,16 +10,16 @@
     "reports": "Berichte",
     "settings": "Einstellungen",
     "logout": "Abmelden",
-    "users": "Users"
+    "users": "Benutzer"
   },
   "general": {
-    "add_company": "Add Company",
+    "add_company": "Unternehmen hinzufügen",
     "view_pdf": "PDF anzeigen",
-    "copy_pdf_url": "Copy PDF Url",
+    "copy_pdf_url": "PDF Url kopieren",
     "download_pdf": "PDF herunterladen",
     "save": "Speichern",
-    "create": "Create",
+    "create": "Erstellen",
-    "cancel": "Abrechen",
+    "cancel": "Abbrechen",
     "update": "Aktualisieren",
     "deselect": "Entfernen",
     "download": "Herunterladen",
@@ -31,15 +31,15 @@
     "ascending": "Aufsteigend",
     "descending": "Absteigend",
     "subject": "Betreff",
-    "body": "Körper",
+    "body": "Inhalt",
     "message": "Nachricht",
-    "send": "Send",
+    "send": "Absenden",
     "go_back": "zurück",
     "back_to_login": "Zurück zum Login?",
     "home": "Startseite",
     "filter": "Filter",
     "delete": "Löschen",
-    "edit": "Ändern",
+    "edit": "Bearbeiten",
     "view": "Anzeigen",
     "add_new_item": "Artikel hinzufügen",
     "clear_all": "Alle entfernen",
@@ -48,7 +48,7 @@
     "actions": "Aktionen",
     "subtotal": "ZWISCHENSUMME",
     "discount": "RABATT",
-    "fixed": "Behoben",
+    "fixed": "Festsatz",
     "percentage": "Prozentsatz",
     "tax": "Steuer",
     "total_amount": "GESAMTSUMME",
@@ -84,9 +84,9 @@
     "street_2": "Zusatz Strasse",
     "action_failed": "Aktion fehlgeschlagen",
     "retry": "Wiederholen",
-    "choose_note": "Choose Note",
+    "choose_note": "Notiz auswählen",
-    "no_note_found": "No Note Found",
+    "no_note_found": "Keine Notizen gefunden",
-    "insert_note": "Insert Note"
+    "insert_note": "Notiz einfügen"
   },
   "dashboard": {
     "select_year": "Jahr wählen",
@@ -97,9 +97,9 @@
       "estimates": "Kostenvoranschläge"
     },
     "chart_info": {
-      "total_sales": "Verkäufe gesamt",
+      "total_sales": "Aufträge gesamt",
-      "total_receipts": "Eingänge gesamt",
+      "total_receipts": "Zahlungen gesamt",
-      "total_expense": "Gesamtausgaben",
+      "total_expense": "Kosten gesamt",
       "net_income": "Einnahmen Netto",
       "year": "Jahr"
     },
@@ -133,17 +133,17 @@
     "compound_tax": "zusammengesetzte Steuer"
   },
   "global_search": {
-    "search": "Search...",
+    "search": "Suchen...",
     "customers": "Kunden",
-    "users": "Users",
+    "users": "Benutzer",
-    "no_results_found": "No Results Found"
+    "no_results_found": "Keine Ergebnisse gefunden"
   },
   "customers": {
     "title": "Kunden",
     "add_customer": "Kunde hinzufügen",
     "contacts_list": "Kunden-Liste",
     "name": "Name",
-    "mail": "Mail | Mails",
+    "mail": "E-Mail| E-Mails",
     "statement": "Statement",
     "display_name": "Anzeige Name",
     "primary_contact_name": "Ansprechpartner",
@@ -153,8 +153,8 @@
     "address": "Adresse",
     "phone": "Telefon",
     "website": "Webseite",
-    "overview": "Overview",
+    "overview": "Übersicht",
-    "enable_portal": "Enable Portal",
+    "enable_portal": "Kunden-Portal aktivieren",
     "country": "Land",
     "state": "Bundesland",
     "city": "Stadt",
@@ -187,7 +187,7 @@
     "phone_number": "Telefonnummer",
     "create_date": "Erstellungsdatum",
     "confirm_delete": "Sie können diesen Kunden und alle zugehörigen Rechnungen, Schätzungen und Zahlungen nicht wiederherstellen. | Sie können diesen Kunden und alle zugehörigen Rechnungen, Schätzungen und Zahlungen nicht wiederherstellen.",
-    "created_message": "Customer created successfully",
+    "created_message": "Benutzer erfolgreich erstellt",
     "updated_message": "Kunde erfolgreich aktualisiert",
     "deleted_message": "Kunden erfolgreich gelöscht | Kunden erfolgreich gelöscht"
   },
@@ -253,7 +253,7 @@
     "convert_to_invoice": "Konvertieren in Rechnung",
     "mark_as_sent": "Als gesendet markieren",
     "send_estimate": "Kostenvoranschlag senden",
-    "resend_estimate": "Resend Estimate",
+    "resend_estimate": "Kostenvoranschlag erneut senden",
     "record_payment": "Zahlung erfassen",
     "add_estimate": "Kostenvoranschlag hinzufügen",
     "save_estimate": "Kostenvoranschlag speichern",
@@ -339,7 +339,7 @@
     "notes": "Hinweise",
     "view": "Anzeigen",
     "send_invoice": "Rechnung senden",
-    "resend_invoice": "Resend Invoice",
+    "resend_invoice": "Rechnung erneut senden",
     "invoice_template": "Rechnungs-Vorlage",
     "template": "Vorlage",
     "mark_as_sent": "Als gesendet markieren",
@@ -428,7 +428,7 @@
     "edit_payment": "Zahlung bearbeiten",
     "view_payment": "Zahlung anzeigen",
     "add_new_payment": "Neue Zahlung hinzufügen",
-    "send_payment_receipt": "Send Payment Receipt",
+    "send_payment_receipt": "Zahlungsbeleg senden",
     "send_payment": "Senden Sie die Zahlung",
     "save_payment": "Zahlung speichern",
     "update_payment": "Zahlung ändern",
@@ -438,8 +438,8 @@
     "list_of_payments": "Dieser Abschnitt enthält die Liste der Zahlungen.",
     "select_payment_mode": "Wählen Sie den Zahlungsmodus",
     "confirm_mark_as_sent": "Dieser Kostenvoranschlag wird als gesendet markiert",
-    "confirm_send_payment": "This payment will be sent via email to the customer",
+    "confirm_send_payment": "Diese Zahlung wird per E-Mail an den Kunden gesendet",
-    "send_payment_successfully": "Payment sent successfully",
+    "send_payment_successfully": "Zahlung erfolgreich gesendet",
     "user_email_does_not_exist": "Benutzer-E-Mail existiert nicht",
     "something_went_wrong": "Da ist etwas schief gelaufen",
     "confirm_delete": "Sie können diese Zahlung nicht wiederherstellen. | Sie können diese Zahlungen nicht wiederherstellen.",
@@ -508,30 +508,30 @@
     "login_placeholder": "mail@beispiel.de"
   },
   "users": {
-    "title": "Users",
+    "title": "Benutzer",
-    "users_list": "Users List",
+    "users_list": "Benutzerliste",
     "name": "Name",
     "description": "Beschreibung",
     "added_on": "Hinzugefügt am",
     "date_of_creation": "Erstellt am",
     "action": "Aktion",
-    "add_user": "Add User",
+    "add_user": "Benutzer hinzufügen",
-    "save_user": "Save User",
+    "save_user": "Benutzer speichern",
-    "update_user": "Update User",
+    "update_user": "Benutzer aktualisieren",
-    "user": "User | Users",
+    "user": "Benutzer",
-    "add_new_user": "Add New User",
+    "add_new_user": "Neuen Benutzer hinzufügen",
-    "new_user": "New User",
+    "new_user": "Neuer Benutzer",
-    "edit_user": "Edit User",
+    "edit_user": "Benutzer bearbeiten",
-    "no_users": "No users yet!",
+    "no_users": "Noch keine Benutzer!",
-    "list_of_users": "This section will contain the list of users.",
+    "list_of_users": "Dieser Abschnitt enthält die Liste der Benutzer.",
     "email": "E-Mail",
     "phone": "Telefon",
     "password": "Passwort",
     "user_attached_message": "Ein Artikel der bereits verwendet wird kann nicht gelöscht werden",
-    "confirm_delete": "You will not be able to recover this User | You will not be able to recover these Users",
+    "confirm_delete": "Sie werden diesen Benutzer nicht wiederherstellen können | Sie werden nicht in der Lage sein, diese Benutzer wiederherzustellen",
-    "created_message": "User created successfully",
+    "created_message": "Benutzer erfolgreich erstellt",
-    "updated_message": "User updated successfully",
+    "updated_message": "Benutzer wurde erfolgreich aktualisiert",
-    "deleted_message": "User deleted successfully | User deleted successfully"
+    "deleted_message": "Benutzer erfolgreich gelöscht | Benutzer erfolgreich gelöscht"
   },
   "reports": {
     "title": "Bericht",
@@ -551,7 +551,7 @@
       "date_range": "Datumsbereich auswählen"
     },
     "sales": {
-      "sales": "Vertrieb",
+      "sales": "Umsatz",
       "date_range": "Datumsbereich auswählen",
       "to_date": "bis Datum",
       "from_date": "Ab Datum",
@@ -604,10 +604,10 @@
       "tax_types": "Steuersätze",
       "expense_category": "Ausgabenkategorien",
       "update_app": "Applikation aktualisieren",
-      "backup": "Backup",
+      "backup": "Sicherung",
-      "file_disk": "File Disk",
+      "file_disk": "Dateispeicher",
       "custom_fields": "Benutzerdefinierte Felder",
-      "payment_modes": "Payment Modes",
+      "payment_modes": "Zahlungsarten",
       "notes": "Hinweise"
     },
     "title": "Einstellungen",
@@ -641,7 +641,7 @@
       "driver": "E-Mail Treiber",
       "secret": "Verschlüsselung",
       "mailgun_secret": "Mailgun Verschlüsselung",
-      "mailgun_domain": "Domain",
+      "mailgun_domain": "Mailgun Adresse",
       "mailgun_endpoint": "Mailgun-Endpunkt",
       "ses_secret": "SES Verschlüsselung",
       "ses_key": "SES-Taste",
@@ -674,7 +674,7 @@
     },
     "custom_fields": {
       "title": "Benutzerdefinierte Felder",
-      "section_description": "Customize your Invoices, Estimates & Payment Receipts with your own fields. Make sure to use the below added fields on the address formats on Customization settings page.",
+      "section_description": "Passen Sie Ihre Rechnungen, Kostenvoranschläge und Zahlungseinnahmen mit Ihren eigenen Feldern an. Benutzen Sie die unten aufgeführten Felder in den Adressformaten auf der Seite Anpassungseinstellungen.",
       "add_custom_field": "Benutzerdefiniertes Feld hinzufügen",
       "edit_custom_field": "Benutzerdefiniertes Feld bearbeiten",
       "field_name": "Feldname",
@@ -689,7 +689,7 @@
       "starting_number": "Startnummer",
       "model": "Modell",
       "help_text_description": "Geben Sie einen Text ein, damit Benutzer den Zweck dieses benutzerdefinierten Felds verstehen.",
-      "suffix": "Suffix",
+      "suffix": "Vorzeichen",
       "yes": "Ja",
       "no": "Nein",
       "order": "Auftrag",
@@ -740,41 +740,41 @@
         "title": "Rechnungen",
         "notes": "Hinweise",
         "invoice_prefix": "Rechnung Präfix",
-        "default_invoice_email_body": "Default Invoice Email Body",
+        "default_invoice_email_body": "Standard Rechnung E-Mail Inhalt",
         "invoice_settings": "Rechnungseinstellungen",
         "autogenerate_invoice_number": "Rechnungsnummer automatisch generieren",
         "invoice_setting_description": "Deaktivieren Sie diese Option, wenn Sie Rechnungsnummern nicht jedes Mal automatisch generieren möchten, wenn Sie eine neue Rechnung erstellen.",
         "enter_invoice_prefix": "Rechnungspräfix eingeben",
         "terms_and_conditions": "Allgemeine Geschäftsbedingungen",
-        "company_address_format": "Company Address Format",
+        "company_address_format": "Firmenadressformat",
-        "shipping_address_format": "Shipping Address Format",
+        "shipping_address_format": "Versandadressen Format",
-        "billing_address_format": "Billing Address Format",
+        "billing_address_format": "Rechnungsadressen Format",
         "invoice_setting_updated": "Rechnungseinstellung erfolgreich aktualisiert"
       },
       "estimates": {
         "title": "Kostenvoranschläge",
         "estimate_prefix": "Kostenvoranschlag Präfix",
-        "default_estimate_email_body": "Default Estimate Email Body",
+        "default_estimate_email_body": "Rechnung - E-Mail Text",
         "estimate_settings": "Einstellungen Kostenvoranschlag",
         "autogenerate_estimate_number": "Kostenvoranschlagsnummer automatisch generieren",
         "estimate_setting_description": "Deaktivieren Sie diese Option, wenn Sie nicht jedes Mal, wenn Sie einen neue Kostenvoranschlag erstellen, automatisch eine Schätzung generieren möchten.",
         "enter_estimate_prefix": "Geben Sie das Kostenvoranschlag Präfix ein",
         "estimate_setting_updated": "Einstellungen Kostenvoranschläge erfolgreich aktualisiert",
-        "company_address_format": "Company Address Format",
+        "company_address_format": "Firmenadresse Format",
-        "billing_address_format": "Billing Address Format",
+        "billing_address_format": "Rechnungsadressen Format",
-        "shipping_address_format": "Shipping Address Format"
+        "shipping_address_format": "Versandadressen Format"
       },
       "payments": {
         "title": "Zahlungen",
         "description": "Modes of transaction for payments",
         "payment_prefix": "Zahlung Präfix",
-        "default_payment_email_body": "Default Payment Email Body",
+        "default_payment_email_body": "Zahlung - E-Mail Text",
         "payment_settings": "Zahlung Einstellungen",
         "autogenerate_payment_number": "Zahlungsnummer automatisch generieren",
         "payment_setting_description": "Deaktivieren Sie diese Option, wenn Sie nicht jedes Mal, wenn Sie eine neue Zahlung erstellen, automatisch Zahlungsnummern generieren möchten.",
         "enter_payment_prefix": "Zahlungspräfix eingeben",
         "payment_setting_updated": "Zahlungseinstellung erfolgreich aktualisiert",
-        "payment_modes": "Payment Modes",
+        "payment_modes": "Zahlungsarten",
         "add_payment_mode": "Zahlungsmethode hinzufügen",
         "edit_payment_mode": "Zahlungsmodus bearbeiten",
         "mode_name": "Methodenname",
@@ -783,8 +783,8 @@
         "payment_mode_confirm_delete": "Du kannst diese Zahlungsmethode nicht wiederherstellen",
         "already_in_use": "Zahlungsmethode bereits in Verwendung",
         "deleted_message": "Zahlungsmethode erfolgreich",
-        "company_address_format": "Company Address Format",
+        "company_address_format": "Firmenadressformat",
-        "from_customer_address_format": "From Customer Address Format"
+        "from_customer_address_format": "Rechnungsadressen Format"
       },
       "items": {
         "title": "Artikel",
@@ -800,18 +800,18 @@
       },
       "notes": {
         "title": "Hinweise",
-        "description": "Save time by creating notes and reusing them on your invoices, estimates & payments.",
+        "description": "Sparen Sie Zeit, indem Sie Notizen erstellen und diese auf Ihren Rechnungen, Kostenvoranschlägen und Zahlungen wiederverwenden.",
         "notes": "Hinweise",
         "type": "Art",
-        "add_note": "Add Note",
+        "add_note": "Notiz hinzufügen",
-        "add_new_note": "Add New Note",
+        "add_new_note": "Neue Notiz hinzufügen",
         "name": "Name",
-        "edit_note": "Edit Note",
+        "edit_note": "Notiz bearbeiten",
-        "note_added": "Note added successfully",
+        "note_added": "Notiz erfolgreich hinzugefügt",
-        "note_updated": "Note Updated successfully",
+        "note_updated": "Notiz erfolgreich aktualisiert",
-        "note_confirm_delete": "You will not be able to recover this Note",
+        "note_confirm_delete": "Dieser Hinweis wird unwiderruflich gelöscht",
-        "already_in_use": "Note is already in use",
+        "already_in_use": "Hinweis bereits in verwendet",
-        "deleted_message": "Note deleted successfully"
+        "deleted_message": "Notiz erfolgreich gelöscht"
       }
     },
     "account_settings": {
@@ -879,7 +879,7 @@
     },
     "preferences": {
       "currency": "Währung",
-      "default_language": "Default Language",
+      "default_language": "Standardsprache",
       "time_zone": "Zeitzone",
       "fiscal_year": "Geschäftsjahr",
       "date_format": "Datum-Format",
@@ -892,7 +892,7 @@
       "updated_message": "Einstellungen erfolgreich aktualisiert",
       "select_language": "Sprache auswählen",
       "select_time_zone": "Zeitzone auswählen",
-      "select_date_format": "Select Date Format",
+      "select_date_format": "Wähle das Datumsformat",
       "select_financial_year": "Geschäftsjahr auswählen"
     },
     "update_app": {
@@ -901,7 +901,7 @@
       "check_update": "Nach Updates suchen",
       "avail_update": "Neues Update verfügbar",
       "next_version": "Nächste Version",
-      "requirements": "Requirements",
+      "requirements": "Voraussetzungen",
       "update": "Jetzt aktualisieren",
       "update_progress": "Update läuft ...",
       "progress_text": "Es dauert nur ein paar Minuten. Bitte aktualisieren Sie den Bildschirm nicht und schließen Sie das Fenster nicht, bevor das Update abgeschlossen ist.",
@@ -917,39 +917,39 @@
       "update_failed_text": "Es tut uns leid! Ihr Update ist am folgenden Schritt fehlgeschlagen: {step}"
     },
     "backup": {
-      "title": "Backup | Backups",
+      "title": "Sicherung | Sicherungen",
       "description": "The backup is a zipfile that contains all files in the directories you specify along with a dump of your database",
-      "new_backup": "Add New Backup",
+      "new_backup": "Neues Backup",
-      "create_backup": "Create Backup",
+      "create_backup": "Datensicherung erstellen",
-      "select_backup_type": "Select Backup Type",
+      "select_backup_type": "Wählen Sie den Sicherungs-Typ",
-      "backup_confirm_delete": "You will not be able to recover this Backup",
+      "backup_confirm_delete": "Dieses Backup wird unwiderruflich gelöscht",
-      "path": "path",
+      "path": "Pfad",
-      "new_disk": "New Disk",
+      "new_disk": "Speicher hinzufügen",
-      "created_at": "created at",
+      "created_at": "erstellt am",
-      "size": "size",
+      "size": "Größe",
-      "dropbox": "dropbox",
+      "dropbox": "Dropbox",
-      "local": "local",
+      "local": "Lokal",
-      "healthy": "healthy",
+      "healthy": "intakt",
-      "amount_of_backups": "amount of backups",
+      "amount_of_backups": "Menge an Sicherungen",
-      "newest_backups": "newest backups",
+      "newest_backups": "Neuste Sicherung",
-      "used_storage": "used storage",
+      "used_storage": "Verwendeter Speicher",
-      "select_disk": "Select Disk",
+      "select_disk": "Speicher auswählen",
       "action": "Aktion",
-      "deleted_message": "Backup deleted successfully",
+      "deleted_message": "Sicherung erfolgreich gelöscht",
-      "created_message": "Backup created successfully",
+      "created_message": "Backup erfolgreich erstellt",
-      "invalid_disk_credentials": "Invalid credential of selected disk"
+      "invalid_disk_credentials": "Ungültige Anmeldeinformationen für ausgewählten Speicher"
     },
     "disk": {
-      "title": "File Disk | File Disks",
+      "title": "Dateispeicher | Dateispeicher",
-      "description": "By default, Crater will use your local disk for saving backups, avatar and other image files. You can configure more than one disk drivers like DigitalOcean, S3 and Dropbox according to your preference.",
+      "description": "Standardmäßig verwendet Crater Ihre lokale Festplatte zum Speichern von Sicherungen, Avatar und anderen Bilddateien. Sie können mehr als einen Speicherort wie DigitalOcean, S3 und Dropbox nach Ihren Wünschen konfigurieren.",
-      "created_at": "created at",
+      "created_at": "erstellt am",
-      "dropbox": "dropbox",
+      "dropbox": "Dropbox",
       "name": "Name",
-      "driver": "Driver",
+      "driver": "Treiber",
       "disk_type": "Art",
-      "disk_name": "Disk Name",
+      "disk_name": "Speicher Bezeichnung",
-      "new_disk": "Add New Disk",
+      "new_disk": "Speicher hinzufügen",
-      "filesystem_driver": "Filesystem Driver",
+      "filesystem_driver": "Dateisystem-Treiber",
       "local_driver": "local Driver",
       "local_root": "local Root",
       "public_driver": "Public Driver",
@@ -977,24 +977,24 @@
       "dropbox_secret": "Dropbox Secret",
       "dropbox_app": "Dropbox App",
       "dropbox_root": "Dropbox Root",
-      "default_driver": "Default Driver",
+      "default_driver": "Standard-Treiber",
-      "is_default": "IS DEFAULT",
+      "is_default": "Standard",
-      "set_default_disk": "Set Default Disk",
+      "set_default_disk": "Als Standard festlegen",
-      "success_set_default_disk": "Disk set as default successfully",
+      "success_set_default_disk": "Speicher wurde als Standard festgelegt",
-      "save_pdf_to_disk": "Save PDFs to Disk",
+      "save_pdf_to_disk": "PDFs auf Festplatte speichern",
-      "disk_setting_description": " Enable this, if you wish to save a copy of each Invoice, Estimate & Payment Receipt PDF on your default disk automatically. Turning this option will decrease the load-time when viewing the PDFs.",
+      "disk_setting_description": " Aktivieren Sie dies, um eine Kopie von jeder Rechnung, jedem Kostenvoranschlag & jedem Zahlungsbelegung als PDF automatisch auf ihrem Standard-Speicher abzulegen. Wenn Sie diese Option aktivieren, verringert sich die Ladezeit beim Betrachten der PDFs.",
-      "select_disk": "Select Disk",
+      "select_disk": "Speicherort auswählen",
       "disk_settings": "Disk Settings",
-      "confirm_delete": "Your existing files & folders in the specified disk will not be affected but your disk configuration will be deleted from Crater",
+      "confirm_delete": "Ihre existierenden Dateien und Ordner auf der angegebenen Festplatte werden nicht beeinflusst, aber Dieser Speicherort wird aus Crater gelöscht",
       "action": "Aktion",
       "edit_file_disk": "Edit File Disk",
-      "success_create": "Disk added successfully",
+      "success_create": "Speicher erfolgreich hinzugefügt",
-      "success_update": "Disk updated successfully",
+      "success_update": "Speicher erfolgreich bearbeitet",
-      "error": "Disk addition failed",
+      "error": "Hinzufügen des Speichers gescheitert",
-      "deleted_message": "File Disk deleted successfully",
+      "deleted_message": "Speicher erfolgreich gelöscht",
-      "disk_variables_save_successfully": "Disk Configured Successfully",
+      "disk_variables_save_successfully": "Speicher erfolgreich konfiguriert",
-      "disk_variables_save_error": "Disk configuration failed.",
+      "disk_variables_save_error": "Konfiguration des Speicher gescheitert",
-      "invalid_disk_credentials": "Invalid credential of selected disk"
+      "invalid_disk_credentials": "Ungültige Anmeldeinformationen für ausgewählten Speicher"
     }
   },
   "wizard": {
@@ -1025,9 +1025,9 @@
     "time_zone": "Zeitzone",
     "fiscal_year": "Geschäftsjahr",
     "date_format": "Datumsformat",
-    "from_address": "From Address",
+    "from_address": "Absender",
     "username": "Benutzername",
-    "next": "Next",
+    "next": "Weiter",
     "continue": "Weiter",
     "skip": "Überspringen",
     "database": {
@@ -1134,37 +1134,37 @@
   "pdf_estimate_label": "Kostenvoranschlag",
   "pdf_estimate_number": "Kostenvoran. Nummer",
   "pdf_estimate_date": "Datum Kostenvoranschlag",
-  "pdf_estimate_expire_date": "Expiry date",
+  "pdf_estimate_expire_date": "Ablaufdatum",
   "pdf_invoice_label": "Rechnung",
   "pdf_invoice_number": "Rechnungsnummer",
   "pdf_invoice_date": "Rechnungsdatum",
-  "pdf_invoice_due_date": "Due date",
+  "pdf_invoice_due_date": "Fälligkeitsdatum",
   "pdf_notes": "Hinweise",
   "pdf_items_label": "Artikel",
   "pdf_quantity_label": "Menge",
   "pdf_price_label": "Preis",
   "pdf_discount_label": "Rabatt",
   "pdf_amount_label": "Summe",
-  "pdf_subtotal": "Subtotal",
+  "pdf_subtotal": "Zwischensumme",
   "pdf_total": "Gesamt",
-  "pdf_payment_receipt_label": "PAYMENT RECEIPT",
+  "pdf_payment_receipt_label": "Zahlungsbeleg",
-  "pdf_payment_date": "Payment Date",
+  "pdf_payment_date": "Zahlungsdatum",
   "pdf_payment_number": "Zahlungsnummer",
   "pdf_payment_mode": "Zahlungsart",
   "pdf_payment_amount_received_label": "Amount Received",
-  "pdf_expense_report_label": "EXPENSES REPORT",
+  "pdf_expense_report_label": "Ausgaben Bericht",
-  "pdf_total_expenses_label": "TOTAL EXPENSE",
+  "pdf_total_expenses_label": "Gesamtausgaben",
-  "pdf_profit_loss_label": "PROFIT & LOSS REPORT",
+  "pdf_profit_loss_label": "Gewinn & Verlust Bericht",
-  "pdf_income_label": "INCOME",
+  "pdf_income_label": "Einkommen",
-  "pdf_net_profit_label": "NET PROFIT",
+  "pdf_net_profit_label": "Nettogewinn",
-  "pdf_customer_sales_report": "Sales Report: By Customer",
+  "pdf_customer_sales_report": "Umsatzbericht: Nach Kunde",
-  "pdf_total_sales_label": "TOTAL SALES",
+  "pdf_total_sales_label": "GESAMTUMSATZ",
-  "pdf_item_sales_label": "Sales Report: By Item",
+  "pdf_item_sales_label": "Umsatzbericht: Nach Artikel",
-  "pdf_tax_report_label": "TAX REPORT",
+  "pdf_tax_report_label": "Umsatzsteuer BERICHT",
-  "pdf_total_tax_label": "TOTAL TAX",
+  "pdf_total_tax_label": "Gesamte Umsatzsteuer",
   "pdf_tax_types_label": "Steuersätze",
   "pdf_expenses_label": "Gesamtausgaben",
   "pdf_bill_to": "Rechnungsempfänger,",
   "pdf_ship_to": "Versand an,",
-  "pdf_received_from": "Received from:"
+  "pdf_received_from": "Erhalten von:"
 }

resources/assets/js/plugins/fr.json

@@ -153,7 +153,7 @@
     "address": "Adresse",
     "phone": "Téléphone",
     "website": "Site Internet",
-    "overview": "Overview",
+    "overview": "Aperçu",
     "enable_portal": "Activer le portail",
     "country": "Pays",
     "state": "Etat",
@@ -1078,7 +1078,7 @@
       "database_variables_save_error": "Impossible de se connecter à la base de données avec les valeurs fournies.",
       "mail_variables_save_error": "La configuration du courrier électronique a échoué.",
       "connection_failed": "La connexion à la base de données a échoué",
-      "database_should_be_empty": "Database should be empty"
+      "database_should_be_empty": "La base de données devrait être vide"
     },
     "success": {
       "mail_variables_save_successfully": "Email configuré avec succès",

resources/assets/js/plugins/i18n.js

@@ -7,9 +7,10 @@ import ar from './ar.json'
 import de from './de.json'
 import pt_BR from './pt-br.json'
 import it from './it.json'
-import sr_LA from './sr-latn.json'
+import sr from './sr.json'
 import nl from './nl.json'
 import lv from './lv.json'
+import sv from './sv.json'
 
 Vue.use(VueI18n)
 
@@ -23,9 +24,10 @@ const i18n = new VueI18n({
     de,
     pt_BR,
     it,
-    sr_LA,
+    sr,
     nl,
     lv,
+    sv,
   },
 })
 

resources/assets/js/plugins/lv.json

@@ -684,14 +684,14 @@
       "required": "Required",
       "placeholder": "Placeholder",
       "help_text": "Help Text",
-      "default_value": "Default Value",
+      "default_value": "Noklusējuma vērtība",
-      "prefix": "Prefix",
+      "prefix": "Prefikss",
-      "starting_number": "Starting Number",
+      "starting_number": "Sākuma numurs",
-      "model": "Model",
+      "model": "Modelis",
       "help_text_description": "Enter some text to help users understand the purpose of this custom field.",
       "suffix": "Suffix",
-      "yes": "Yes",
+      "yes": "Jā",
-      "no": "No",
+      "no": "Nē",
       "order": "Order",
       "custom_field_confirm_delete": "You will not be able to recover this Custom Field",
       "already_in_use": "Custom Field is already in use",

resources/assets/js/plugins/nl.json

@@ -607,7 +607,7 @@
       "backup": "Back-up",
       "file_disk": "Bestandsopslag",
       "custom_fields": "Custom Fields",
-      "payment_modes": "Payment Modes",
+      "payment_modes": "Betaalmethodes",
       "notes": "Opmerkingen"
     },
     "title": "Instellingen",
@@ -636,7 +636,7 @@
       "add_currency": "Valuta toevoegen"
     },
     "mail": {
-      "host": "Mail Host",
+      "host": "Mail host",
       "port": "Mail Port",
       "driver": "Mail-stuurprogramma",
       "secret": "Geheim",
@@ -668,45 +668,45 @@
       "state": "Provincie",
       "city": "Stad",
       "address": "Adres",
-      "zip": "Zip",
+      "zip": "Postcode",
       "save": "Opslaan",
       "updated_message": "Bedrijfsinformatie succesvol bijgewerkt"
     },
     "custom_fields": {
-      "title": "Custom Fields",
+      "title": "Aangepaste velden",
-      "section_description": "Customize your Invoices, Estimates & Payment Receipts with your own fields. Make sure to use the below added fields on the address formats on Customization settings page.",
+      "section_description": "Uw facturen, offertes & betalingsbewijzen aanpassen met uw eigen velden. Gebruik onderstaande velden op het adres format op de Customization instellings pagina.",
-      "add_custom_field": "Add Custom Field",
+      "add_custom_field": "Extra veld toevoegen",
-      "edit_custom_field": "Edit Custom Field",
+      "edit_custom_field": "Veld wijzigen",
-      "field_name": "Field Name",
+      "field_name": "Veld naam",
       "label": "Label",
       "type": "Type",
       "name": "Naam",
-      "required": "Required",
+      "required": "Verplicht",
-      "placeholder": "Placeholder",
+      "placeholder": "Tijdelijke plaatshouder",
-      "help_text": "Help Text",
+      "help_text": "Hulp Text",
-      "default_value": "Default Value",
+      "default_value": "Standaard waarde",
-      "prefix": "Prefix",
+      "prefix": "Voorvoegsel",
       "starting_number": "Starting Number",
       "model": "Model",
-      "help_text_description": "Enter some text to help users understand the purpose of this custom field.",
+      "help_text_description": "Voer tekst in om gebruikers te helpen het doel van dit aangepaste veld te begrijpen.",
-      "suffix": "Suffix",
+      "suffix": "Achtervoegsel",
-      "yes": "Yes",
+      "yes": "Ja",
-      "no": "No",
+      "no": "Nee",
-      "order": "Order",
+      "order": "Volgorde",
-      "custom_field_confirm_delete": "You will not be able to recover this Custom Field",
+      "custom_field_confirm_delete": "U kunt dit veld niet herstellen",
-      "already_in_use": "Custom Field is already in use",
+      "already_in_use": "Aangepast veld is al in gebruik",
-      "deleted_message": "Custom Field deleted successfully",
+      "deleted_message": "Aangepast veld is succesvol verwijderd",
-      "options": "options",
+      "options": "opties",
-      "add_option": "Add Options",
+      "add_option": "Optie toevoegen",
-      "add_another_option": "Add another option",
+      "add_another_option": "Nog een optie toevoegen",
-      "sort_in_alphabetical_order": "Sort in Alphabetical Order",
+      "sort_in_alphabetical_order": "Sorteer op alfabetische volgorde",
-      "add_options_in_bulk": "Add options in bulk",
+      "add_options_in_bulk": "Voeg opties toe in bulk",
-      "use_predefined_options": "Use Predefined Options",
+      "use_predefined_options": "Gebruik voorgedefinieerde opties",
-      "select_custom_date": "Select Custom Date",
+      "select_custom_date": "Selecteer een aangepaste datum",
-      "select_relative_date": "Select Relative Date",
+      "select_relative_date": "Selecteer relatieve datum",
-      "ticked_by_default": "Ticked by default",
+      "ticked_by_default": "Standaard aangevinkt",
-      "updated_message": "Custom Field updated successfully",
+      "updated_message": "Aangepast veld is succesvol aangepast",
-      "added_message": "Custom Field added successfully"
+      "added_message": "Aangepast veld is succesvol toegevoegd"
     },
     "customization": {
       "customization": "aanpassen",
@@ -740,28 +740,28 @@
         "title": "Facturen",
         "notes": "Opmerkingen",
         "invoice_prefix": "Factuurvoorvoegsel",
-        "default_invoice_email_body": "Default Invoice Email Body",
+        "default_invoice_email_body": "Standaard factuur email text",
         "invoice_settings": "Factuurinstellingen",
         "autogenerate_invoice_number": "Factuurnummer automatisch genereren",
         "invoice_setting_description": "Schakel dit uit als u niet automatisch factuurnummers wilt genereren telkens wanneer u een nieuwe factuur maakt.",
         "enter_invoice_prefix": "Voer het factuurvoorvoegsel in",
         "terms_and_conditions": "Voorwaarden",
-        "company_address_format": "Company Address Format",
+        "company_address_format": "Bedrijfsadres format",
-        "shipping_address_format": "Shipping Address Format",
+        "shipping_address_format": "Verzendadres format",
-        "billing_address_format": "Billing Address Format",
+        "billing_address_format": "Factuuradres format",
         "invoice_setting_updated": "Factuurinstelling succesvol bijgewerkt"
       },
       "estimates": {
         "title": "Offertes",
         "estimate_prefix": "Voorvoegsel schatten",
-        "default_estimate_email_body": "Default Estimate Email Body",
+        "default_estimate_email_body": "Standaard offerte email text",
         "estimate_settings": "Instellingen schatten",
         "autogenerate_estimate_number": "Automatisch geschat nummer genereren",
         "estimate_setting_description": "Schakel dit uit als u niet automatisch offertesaantallen wilt genereren telkens wanneer u een nieuwe offerte maakt.",
         "enter_estimate_prefix": "Voer het prefixnummer in",
         "estimate_setting_updated": "Instelling Offerte succesvol bijgewerkt",
-        "company_address_format": "Company Address Format",
+        "company_address_format": "Bedrijfsadres format",
-        "billing_address_format": "Billing Address Format",
+        "billing_address_format": "Factuuradres Format",
         "shipping_address_format": "Shipping Address Format"
       },
       "payments": {
@@ -923,29 +923,29 @@
       "create_backup": "Create Backup",
       "select_backup_type": "Select Backup Type",
       "backup_confirm_delete": "You will not be able to recover this Backup",
-      "path": "path",
+      "path": "pad",
-      "new_disk": "New Disk",
+      "new_disk": "Nieuwe schijf",
-      "created_at": "created at",
+      "created_at": "aangemaakt op",
-      "size": "size",
+      "size": "grootte",
       "dropbox": "dropbox",
-      "local": "local",
+      "local": "lokaal",
-      "healthy": "healthy",
+      "healthy": "gezond",
-      "amount_of_backups": "amount of backups",
+      "amount_of_backups": "aantal back-ups",
-      "newest_backups": "newest backups",
+      "newest_backups": "nieuwste back-ups",
-      "used_storage": "used storage",
+      "used_storage": "gebruikte opslag",
-      "select_disk": "Select Disk",
+      "select_disk": "Selecteer Disk",
       "action": "Actie",
       "deleted_message": "Backup deleted successfully",
       "created_message": "Backup created successfully",
-      "invalid_disk_credentials": "Invalid credential of selected disk"
+      "invalid_disk_credentials": "Ongeldige inloggegevens voor geselecteerde schijf"
     },
     "disk": {
       "title": "File Disk | File Disks",
       "description": "By default, Crater will use your local disk for saving backups, avatar and other image files. You can configure more than one disk drivers like DigitalOcean, S3 and Dropbox according to your preference.",
-      "created_at": "created at",
+      "created_at": "aangemaakt op",
       "dropbox": "dropbox",
       "name": "Naam",
-      "driver": "Driver",
+      "driver": "Stuurprogramma",
       "disk_type": "Type",
       "disk_name": "Disk Name",
       "new_disk": "Add New Disk",

resources/assets/js/plugins/sr.json

@@ -6,29 +6,34 @@
     "invoices": "Fakture",
     "expenses": "Rashodi",
     "estimates": "Profakture",
-    "payments": "Plaćanja",
+    "payments": "Uplate",
     "reports": "Izveštaji",
     "settings": "Podešavanja",
-    "logout": "Odjavi se"
+    "logout": "Odjavi se",
+    "users": "Korisnici"
   },
   "general": {
+    "add_company": "Dodaj kompaniju",
     "view_pdf": "Pogledaj PDF",
     "copy_pdf_url": "Kopiraj PDF link",
     "download_pdf": "Preuzmi PDF",
     "save": "Sačuvaj",
+    "create": "Napravi",
     "cancel": "Otkaži",
     "update": "Ažuriraj",
     "deselect": "Poništi izbor",
     "download": "Preuzmi",
     "from_date": "Od Datuma",
     "to_date": "Do Datuma",
-    "from": "Od",
+    "from": "Pošiljalac",
-    "to": "Do",
+    "to": "Primalac",
     "sort_by": "Rasporedi Po",
     "ascending": "Rastuće",
     "descending": "Opadajuće",
     "subject": "Predmet",
+    "body": "Telo",
     "message": "Poruka",
+    "send": "Pošalji",
     "go_back": "Idi nazad",
     "back_to_login": "Nazad na prijavu?",
     "home": "Početna",
@@ -78,7 +83,11 @@
     "street_1": "Adresa 1",
     "street_2": "Adresa 2",
     "action_failed": "Akcija nije uspela",
-    "retry": "Pokušaj ponovo"
+    "retry": "Pokušaj ponovo",
+    "choose_note": "Odaberi napomenu",
+    "no_note_found": "Ne postoje sačuvane napomene",
+    "insert_note": "Unesi belešku",
+    "copied_pdf_url_clipboard": "Link do PDF fajla kopiran!"
   },
   "dashboard": {
     "select_year": "Odaberi godinu",
@@ -124,11 +133,19 @@
     "percent": "Procenat",
     "compound_tax": "Složeni porez"
   },
+  "global_search": {
+    "search": "Pretraga...",
+    "customers": "Klijenti",
+    "users": "Korisnici",
+    "no_results_found": "Nema rezultata"
+  },
   "customers": {
     "title": "Klijenti",
     "add_customer": "Dodaj Klijenta",
     "contacts_list": "Lista klijenata",
     "name": "Naziv",
+    "mail": "Mail | Mail-ovi",
+    "statement": "Izjava",
     "display_name": "Naziv koji se prikazuje",
     "primary_contact_name": "Primarna kontakt osoba",
     "contact_name": "Naziv kontakt osobe",
@@ -137,6 +154,8 @@
     "address": "Adresa",
     "phone": "Telefon",
     "website": "Veb stranica",
+    "overview": "Pregled",
+    "enable_portal": "Uključi portal",
     "country": "Država",
     "state": "Savezna država",
     "city": "Grad",
@@ -146,6 +165,7 @@
     "password": "Šifra",
     "street_number": "Broj ulice",
     "primary_currency": "Primarna valuta",
+    "description": "Opis",
     "add_new_customer": "Dodaj novog klijenta",
     "save_customer": "Sačuvaj klijenta",
     "update_customer": "Ažuriraj klijenta",
@@ -163,7 +183,10 @@
     "select_currency": "Odaberi valutu",
     "select_a_customer": "Odaberi klijenta",
     "type_or_click": "Unesi tekst ili klikni da izabereš",
-
+    "new_transaction": "Nova transakcija",
+    "no_matching_customers": "Ne postoje klijenti koji odgovaraju pretrazi!",
+    "phone_number": "Broj telefona",
+    "create_date": "Datum kreiranja",
     "confirm_delete": "Nećeš moći da povratiš ovog klijenta i sve njegove Fakture, Profakture i Uplate. | Nećeš moći da povratiš ove klijente i njihove Fakture, Profakture i Uplate.",
     "created_message": "Klijent uspešno kreiran",
     "updated_message": "Klijent uspešno ažuriran",
@@ -213,7 +236,7 @@
     "partially_paid": "Delimično Plaćeno",
     "total": "Ukupno za plaćanje",
     "discount": "Popust",
-    "sub_total": "Ukupno",
+    "sub_total": "Osnovica za obračun PDV-a",
     "estimate_number": "Broj profakture",
     "ref_number": "Poziv na broj",
     "contact": "Kontakt",
@@ -262,7 +285,6 @@
     "list_of_estimates": "Ova sekcija će da sadrži spisak Profaktura.",
     "mark_as_rejected": "Označi kao odbijeno",
     "mark_as_accepted": "Označi kao prihvaćeno",
-
     "marked_as_accepted_message": "Profaktura označena kao prihvaćena",
     "marked_as_rejected_message": "Profaktura označena kao odbijena",
     "confirm_delete": "Nećeš moći da povratiš ovu Profakturu | Nećeš moći da povratiš ove Profakture",
@@ -303,7 +325,7 @@
     "partially_paid": "Delimično plaćeno",
     "total": "Ukupno za plaćanje",
     "discount": "Popust",
-    "sub_total": "Ukupno",
+    "sub_total": "Osnovica za obračun PDV-a",
     "invoice": "Faktura | Fakture",
     "invoice_number": "Broj Fakture",
     "ref_number": "Poziv na broj",
@@ -407,7 +429,8 @@
     "edit_payment": "Izmeni Uplatu",
     "view_payment": "Vidi Uplatu",
     "add_new_payment": "Dodaj Novu Uplatu",
-    "send_payment_receipt": "Pošalji potvrdu o plaćanju",
+    "send_payment_receipt": "Pošalji potvrdu o uplati",
+    "send_payment": "Pošalji Uplatu",
     "save_payment": "Sačuvaj Uplatu",
     "update_payment": "Ažuriraj Uplatu",
     "payment": "Uplata | Uplate",
@@ -415,11 +438,11 @@
     "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",
+    "confirm_mark_as_sent": "Ovo plaćanje će biti označena kao Poslata",
     "confirm_send_payment": "Ovo plaćanje će biti poslato putem Email-a klijentu",
     "send_payment_successfully": "Plaćanje uspešno poslato",
     "user_email_does_not_exist": "Email adresa klijenta ne postoji",
     "something_went_wrong": "nešto je krenulo naopako",
-
     "confirm_delete": "Nećeš moći da povratiš ovu Uplatu | Nećeš moći da povratiš ove Uplate",
     "created_message": "Uplata uspešno kreirana",
     "updated_message": "Uplata uspešno ažurirana",
@@ -428,7 +451,7 @@
   },
   "expenses": {
     "title": "Rashodi",
-    "expenses_list": "List Rashoda",
+    "expenses_list": "Lista Rashoda",
     "select_a_customer": "Odaberi klijenta",
     "expense_title": "Naslov",
     "customer": "Klijent",
@@ -443,7 +466,7 @@
     "action": "Akcija",
     "note": "Napomena",
     "category_id": "ID kategorije",
-    "date": "Datum Rashoda",
+    "date": "Datum",
     "add_expense": "Dodaj Rashod",
     "add_new_expense": "Dodaj Novi Rashod",
     "save_expense": "Sačuvaj Rashod",
@@ -454,7 +477,6 @@
     "expense": "Rashod | Rashodi",
     "no_expenses": "Još uvek nema rashoda!",
     "list_of_expenses": "Ova sekcija će da sadrži listu rashoda.",
-
     "confirm_delete": "Nećeš moći da povratiš ovaj Rashod | Nećeš moći da povratiš ove Rashode",
     "created_message": "Rashod uspešno kreiran",
     "updated_message": "Rashod uspešno ažuriran",
@@ -486,6 +508,32 @@
     "retype_password": "Ponovo unesi šifru",
     "login_placeholder": "mail@example.com"
   },
+  "users": {
+    "title": "Korisnici",
+    "users_list": "Lista korisnika",
+    "name": "Ime i prezime",
+    "description": "Opis",
+    "added_on": "Datum dodavanja",
+    "date_of_creation": "Datum kreiranja",
+    "action": "Akcija",
+    "add_user": "Dodaj Korisnika",
+    "save_user": "Sačuvaj Korisnika",
+    "update_user": "Ažuriraj Korisnika",
+    "user": "Korisnik | Korisnici",
+    "add_new_user": "Dodaj novog korisnika",
+    "new_user": "Nov Korisnik",
+    "edit_user": "Izmeni Korisnika",
+    "no_users": "Još uvek nema korisnika!",
+    "list_of_users": "Ova sekcija će da sadrži listu korisnika.",
+    "email": "Email",
+    "phone": "Broj telefona",
+    "password": "Šifra",
+    "user_attached_message": "Ne možete obrisati stavku koja je već u upotrebi",
+    "confirm_delete": "Nećeš moći da povratiš ovog Korisnika | Nećeš moći da povratiš ove Korisnike",
+    "created_message": "Korisnik uspešno napravljen",
+    "updated_message": "Korisnik uspešno ažuriran",
+    "deleted_message": "Korisnik uspešno obrisan | Korisnici uspešno obrisani"
+  },
   "reports": {
     "title": "Izveštaj",
     "from_date": "Datum od",
@@ -556,7 +604,12 @@
       "notifications": "Obaveštenja",
       "tax_types": "Tipovi Poreza",
       "expense_category": "Kategorije Rashoda",
-      "update_app": "Ažuriraj Aplikaciju"
+      "update_app": "Ažuriraj Aplikaciju",
+      "backup": "Bekap",
+      "file_disk": "File Disk",
+      "custom_fields": "Prilagođena polja",
+      "payment_modes": "Način plaćanja",
+      "notes": "Napomene"
     },
     "title": "Podešavanja",
     "setting": "Podešavanje | Podešavanja",
@@ -620,6 +673,42 @@
       "save": "Sačuvaj",
       "updated_message": "Podaci o firmi uspešno sačuvani"
     },
+    "custom_fields": {
+      "title": "Prilagođena polja",
+      "section_description": "Prilagodite vaše Fakture, Profakture i Uplate (priznanice) sa svojim poljima. Postarajte se da koristite polja navedena ispod na formatu adrese na stranici Podešavanja/Prilagođavanje.",
+      "add_custom_field": "Dodaj prilagođeno polje",
+      "edit_custom_field": "Izmeni prilagođeno polje",
+      "field_name": "Naziv polja",
+      "label": "Oznaka",
+      "type": "Tip",
+      "name": "Naziv",
+      "required": "Obavezno",
+      "placeholder": "Opis polja (Placeholder)",
+      "help_text": "Pomoćni tekst",
+      "default_value": "Podrazumevana vrednost",
+      "prefix": "Prefiks",
+      "starting_number": "Početni broj",
+      "model": "Model",
+      "help_text_description": "Unesite opis koji će pomoći korisnicima da razumeju svrhu ovog prilagođenog polja.",
+      "suffix": "Sufiks",
+      "yes": "Da",
+      "no": "Ne",
+      "order": "Redosled",
+      "custom_field_confirm_delete": "Nećeš moći da povratiš ovo prilagođeno polje",
+      "already_in_use": "Prilagođeno polje je već u upotrebi",
+      "deleted_message": "Prilagođeno polje je uspešno obrisano",
+      "options": "opcije",
+      "add_option": "Dodaj opcije",
+      "add_another_option": "Dodaj još jednu opciju",
+      "sort_in_alphabetical_order": "Poređaj po Abecedi",
+      "add_options_in_bulk": "Grupno dodavanje opcija",
+      "use_predefined_options": "Koristi predefinisane opcije",
+      "select_custom_date": "Odaberi datum",
+      "select_relative_date": "Odaberi relativan datum",
+      "ticked_by_default": "Podrazumevano odabrano",
+      "updated_message": "Prilagođeno polje uspešno ažurirano",
+      "added_message": "Prilagođeno polje uspešno dodato"
+    },
     "customization": {
       "customization": "prilagođavanje",
       "save": "Sačuvaj",
@@ -648,38 +737,45 @@
         "address_setting_updated": "Podešavanje adrese uspešno ažurirano"
       },
       "updated_message": "Podaci o firmi su uspešno ažurirani",
-
       "invoices": {
         "title": "Fakture",
         "notes": "Napomene",
         "invoice_prefix": "Prefiks faktura",
+        "default_invoice_email_body": "Podrazumevan sadržaj email-a za Fakture",
         "invoice_settings": "Podešavanje za fakture",
         "autogenerate_invoice_number": "Automatski-generiši broj fakture",
         "invoice_setting_description": "Onemogući ovo, Ako Vi ne želite da automatski-generišete broj fakture kada pravite novu fakturu.",
         "enter_invoice_prefix": "Unesite prefiks fakture",
         "terms_and_conditions": "Uslovi Korišćenja",
+        "company_address_format": "Format adrese firme",
+        "shipping_address_format": "Format adrese za dostavu firme",
+        "billing_address_format": "Format adrese za naplatu firme",
         "invoice_setting_updated": "Podešavanje za fakture je uspešno sačuvano"
       },
-
       "estimates": {
         "title": "Profakture",
         "estimate_prefix": "Prefiks profaktura",
+        "default_estimate_email_body": "Podrazumevan sadržaj email-a za Profakture",
         "estimate_settings": "Podešavanje za profakture",
         "autogenerate_estimate_number": "Automatski-generiši broj profakture",
         "estimate_setting_description": "Onemogući ovo, Ako Vi ne želite da automatski-generišete broj profakture kada pravite novu profakturu.",
         "enter_estimate_prefix": "Unesite prefiks profakture",
-        "estimate_setting_updated": "Podešavanje za profakture je uspešno sačuvano"
+        "estimate_setting_updated": "Podešavanje za profakture je uspešno sačuvano",
+        "company_address_format": "Format adrese firme",
+        "billing_address_format": "Format adrese za naplatu firme",
+        "shipping_address_format": "Format adrese za dostavu firme"
       },
-
       "payments": {
-        "title": "Plaćanja",
+        "title": "Uplate",
+        "description": "Način plaćanja",
         "payment_prefix": "Prefiks uplata",
+        "default_payment_email_body": "Podrazumevan sadržaj email-a za potvrdu o plaćanju (račun)",
         "payment_settings": "Podešavanje za plaćanja",
         "autogenerate_payment_number": "Automatski-generiši broj uplate",
         "payment_setting_description": "Onemogući ovo, Ako ne želite da automatski-generišete broj uplate kada pravite novu uplatu.",
         "enter_payment_prefix": "Unesite prefiks uplate",
         "payment_setting_updated": "Podešavanje za plaćanja je uspešno sačuvano",
-        "payment_mode": "Način Plaćanja",
+        "payment_modes": "Način Plaćanja",
         "add_payment_mode": "Dodaj način plaćanja",
         "edit_payment_mode": "Izmeni način plaćanja",
         "mode_name": "Način plaćanja",
@@ -687,12 +783,13 @@
         "payment_mode_updated": "Način plaćanja ažuriran",
         "payment_mode_confirm_delete": "Nećeš moći da povratiš ovaj Način Plaćanja",
         "already_in_use": "Način plaćanja se već koristi",
-        "deleted_message": "Način plaćanja uspešno obrisan"
+        "deleted_message": "Način plaćanja uspešno obrisan",
+        "company_address_format": "Format adrese firme",
+        "from_customer_address_format": "Format adrese klijenta"
       },
-
       "items": {
         "title": "Stavke",
-        "units": "jedinice",
+        "units": "Jedinice",
         "add_item_unit": "Dodaj jedinicu stavke",
         "edit_item_unit": "Izmeni jedinicu stavke",
         "unit_name": "Naziv jedinice",
@@ -701,6 +798,21 @@
         "item_unit_confirm_delete": "Nećeš moći da povratiš ovu jedinicu stavke",
         "already_in_use": "Jedinica stavke se već koristi",
         "deleted_message": "Jedinica stavke uspešno obrisana"
+      },
+      "notes": {
+        "title": "Napomene",
+        "description": "Uštedite vreme pravljeći napomene i koristeći ih na fakturama, profakturama i uplatama.",
+        "notes": "Napomene",
+        "type": "Tip",
+        "add_note": "Dodaj Napomenu",
+        "add_new_note": "Dodaj novu Napomenu",
+        "name": "Naziv",
+        "edit_note": "Izmeni Napomenu",
+        "note_added": "Napomena uspešno dodata",
+        "note_updated": "Napomena uspešno ažurirana",
+        "note_confirm_delete": "Nećeš moći da povratiš ovu Napomenu",
+        "already_in_use": "Napomena se već koristi",
+        "deleted_message": "Napomena uspešno obrisana"
       }
     },
     "account_settings": {
@@ -768,7 +880,7 @@
     },
     "preferences": {
       "currency": "Valuta",
-      "language": "Jezik",
+      "default_language": "Jezik",
       "time_zone": "Vremenska Zona",
       "fiscal_year": "Finansijska Godina",
       "date_format": "Format datuma",
@@ -779,10 +891,10 @@
       "preference": "Preferencija | Preferencije",
       "general_settings": "Podrazumevane preferencije za sistem",
       "updated_message": "Preferencije su uspešno ažurirane",
-      "select_language": "izaberi jezik",
+      "select_language": "Izaberi Jezik",
-      "select_time_zone": "izaberi vremensku zonu",
+      "select_time_zone": "Izaberi Vremensku Zonu",
-      "select_date_formate": "izaberi format datuma",
+      "select_date_format": "Izaberi Format Datuma",
-      "select_financial_year": "izaberi finansijsku godinu"
+      "select_financial_year": "Izaberi Finansijsku Godinu"
     },
     "update_app": {
       "title": "Ažuriraj aplikaciju",
@@ -790,6 +902,7 @@
       "check_update": "Proveri ažuriranost",
       "avail_update": "Dostupna je nova verzija",
       "next_version": "Sledeća verzija",
+      "requirements": "Zahtevi",
       "update": "Ažuriraj sad",
       "update_progress": "Ažuriranje je u toku...",
       "progress_text": "Trajaće svega par minuta. Nemojte osvežavati ili zatvoriti stranicu dok ažuriranje ne bude gotovo",
@@ -799,10 +912,92 @@
       "download_zip_file": "Preuzmi ZIP paket",
       "unzipping_package": "Raspakivanje paketa",
       "copying_files": "Kopiranje datoteka",
+      "deleting_files": "Brisanje fajlova koji nisu u upotrebi",
       "running_migrations": "Migracije u toku",
       "finishing_update": "Završavanje ažuriranja",
       "update_failed": "Neuspešno ažuriranje",
-      "update_failed_text": "Žao mi je! Tvoje ažuriranje nije uspelo na koraku broj: {step} "
+      "update_failed_text": "Žao mi je! Tvoje ažuriranje nije uspelo na koraku broj: {step} korak"
+    },
+    "backup": {
+      "title": "Bekap | Bekapi",
+      "description": "Bekap je zip arhiva koja sadrži sve fajlove iz foldera koje ste specificirali, takođe sadrži bekap baze.",
+      "new_backup": "Dodaj novi Bekap",
+      "create_backup": "Napravi Bekap",
+      "select_backup_type": "Izaberi tip Bekapa",
+      "backup_confirm_delete": "Nećeš moći da povratiš ovaj Bekap",
+      "path": "putanja",
+      "new_disk": "Novi Disk",
+      "created_at": "datum kreiranja",
+      "size": "veličina",
+      "dropbox": "dropbox",
+      "local": "lokalni",
+      "healthy": "zdrav",
+      "amount_of_backups": "broj bekapa",
+      "newest_backups": "najnoviji bekapi",
+      "used_storage": "korišćeno skladište",
+      "select_disk": "Izaberi Disk",
+      "action": "Akcija",
+      "deleted_message": "Bekap uspešno obrisan",
+      "created_message": "Bekap uspešno napravljen",
+      "invalid_disk_credentials": "Pogrešni kredencijali za odabrani disk"
+    },
+    "disk": {
+      "title": "File Disk | File Disks",
+      "description": "Podrazumevano ponašanje je da Crater koristi lokalni disk za čuvanje bekapa, avatara i ostalih slika. Možete podesiti više od jednog disk drajvera od provajdera poput DigitalOcean, S3 i Dropbox po vašoj želji.",
+      "created_at": "datum kreiranja",
+      "dropbox": "dropbox",
+      "name": "Naziv",
+      "driver": "Drajver",
+      "disk_type": "Tip",
+      "disk_name": "Naziv Diska",
+      "new_disk": "Dodaj novi Disk",
+      "filesystem_driver": "Filesystem Driver",
+      "local_driver": "lokalni Drajver",
+      "local_root": "local Root",
+      "public_driver": "Public Driver",
+      "public_root": "Public Root",
+      "public_url": "Public URL",
+      "public_visibility": "Public Visibility",
+      "media_driver": "Media Driver",
+      "media_root": "Media Root",
+      "aws_driver": "AWS Driver",
+      "aws_key": "AWS Key",
+      "aws_secret": "AWS Secret",
+      "aws_region": "AWS Region",
+      "aws_bucket": "AWS Bucket",
+      "aws_root": "AWS Root",
+      "do_spaces_type": "Do Spaces type",
+      "do_spaces_key": "Do Spaces key",
+      "do_spaces_secret": "Do Spaces Secret",
+      "do_spaces_region": "Do Spaces Region",
+      "do_spaces_bucket": "Do Spaces Bucket",
+      "do_spaces_endpoint": "Do Spaces Endpoint",
+      "do_spaces_root": "Do Spaces Root",
+      "dropbox_type": "Dropbox Type",
+      "dropbox_token": "Dropbox Token",
+      "dropbox_key": "Dropbox Key",
+      "dropbox_secret": "Dropbox Secret",
+      "dropbox_app": "Dropbox App",
+      "dropbox_root": "Dropbox Root",
+      "default_driver": "Podrazumevani Drajver",
+      "is_default": "DA LI JE PODRAZUMEVAN",
+      "set_default_disk": "Postavi Podrazumevani Disk",
+      "set_default_disk_confirm": "Ovaj disk će biti postavljen kao podrazumevan i svi novi PDF fajlovi će biti sačuvani na ovom disku",
+      "success_set_default_disk": "Disk je uspešno postavljen kao podrazumevan",
+      "save_pdf_to_disk": "Sačuvaj PDF fajlove na Disk",
+      "disk_setting_description": " Uključite ovo ako želite da sačuvate kopiju PDF fajla svake Fakture, Profakture i Uplate na vaš podrazumevani disk automatski. Uključivanjem ove opcije ćete smanjiti vreme učitavanja pri pregledu PDF fajlova.",
+      "select_disk": "Izaberi Disk",
+      "disk_settings": "Disk Podešavanja",
+      "confirm_delete": "Ovo neće uticati na vaše postojeće fajlove i foldere na navedenom disku, ali će se konfiguracija vašeg diska izbrisati iz Cratera.",
+      "action": "Akcija",
+      "edit_file_disk": "Izmeni File Disk",
+      "success_create": "Disk uspešno dodat",
+      "success_update": "Disk uspešno ažuriran",
+      "error": "Dodavanje diska nije uspelo",
+      "deleted_message": "File Disk uspešno obrisan",
+      "disk_variables_save_successfully": "Disk uspešno podešen",
+      "disk_variables_save_error": "Podešavanje diska nije uspelo.",
+      "invalid_disk_credentials": "Pogrešan kredencijal za disk koji je naveden"
     }
   },
   "wizard": {
@@ -845,8 +1040,10 @@
       "port": "Port baze podataka",
       "password": "Šifra baze podataka",
       "app_url": "URL aplikacije",
+      "app_domain": "Domen aplikacije",
       "username": "Korisničko ime baze podataka",
       "db_name": "Naziv baze podataka",
+      "db_path": "Putanja do baze",
       "desc": "Kreiraj bazu podataka na svom serveru i postavi kredencijale prateći obrazac u nastavku."
     },
     "permissions": {
@@ -872,7 +1069,6 @@
       "from_mail": "E-mail adresa pošiljaoca",
       "encryption": "E-mail enkripcija",
       "mail_config_desc": "Ispod se nalazi forma za podešavanje E-mail drajvera za slanje pošte iz aplikacije. Takođe možete podesiti provajdere treće strane kao Sendgrid, SES itd."
-
     },
     "req": {
       "system_req": "Sistemski zahtevi",
@@ -901,7 +1097,9 @@
     "invoices_and_estimates": "fakture i profakture sa mogućnošću odabira više obrazaca"
   },
   "validation": {
-    "invalid_url": "Nevažeći URL (ex: http://www.crater.com)",
+    "invalid_phone": "Pogrešan Broj Telefona",
+    "invalid_url": "Nevažeći URL (primer: http://www.crater.com)",
+    "invalid_domain_url": "Pogrešan URL (primer: crater.com)",
     "required": "Obavezno polje",
     "email_incorrect": "Pogrešan E-mail",
     "email_already_taken": "Navedeni E-mail je zauzet",
@@ -926,14 +1124,50 @@
     "price_minvalue": "Cena mora biti veća od 0",
     "amount_maxlength": "Iznos ne može da ima više od 20 cifara",
     "amount_minvalue": "Iznos mora biti veći od 0",
-    "description_maxlength": "Opis ne može da ima više od 255 karaktera",
+    "description_maxlength": "Opis ne može da ima više od 65,000 karaktera",
     "subject_maxlength": "Predmet ne može da ima više od 100 karaktera",
     "message_maxlength": "Poruka ne može da ima više od 255 karaktera",
     "maximum_options_error": "Maksimalan broj opcija je izabran. Prvo uklonite izabranu opciju da biste izabrali drugu",
-    "notes_maxlength": "Napomena ne može da ima više od 255 karaktera",
+    "notes_maxlength": "Napomena ne može da ima više od 65,000 karaktera",
     "address_maxlength": "Adresa ne može da ima više od 255 karaktera",
     "ref_number_maxlength": "Poziv na broj ne može da ima više od 225 karaktera",
     "prefix_maxlength": "Prefiks ne može da ima više od 5 karaktera",
     "something_went_wrong": "nešto je krenulo naopako"
-  }
+  },
+  "pdf_estimate_label": "Profaktura",
+  "pdf_estimate_number": "Broj Profakture",
+  "pdf_estimate_date": "Datum Profakture",
+  "pdf_estimate_expire_date": "Datum isteka Profakture",
+  "pdf_invoice_label": "Faktura",
+  "pdf_invoice_number": "Broj Fakture",
+  "pdf_invoice_date": "Datum Fakture",
+  "pdf_invoice_due_date": "Datum dospeća Fakture",
+  "pdf_notes": "Napomena",
+  "pdf_items_label": "Stavke",
+  "pdf_quantity_label": "Količina",
+  "pdf_price_label": "Cena",
+  "pdf_discount_label": "Popust",
+  "pdf_amount_label": "Iznos",
+  "pdf_subtotal": "Osnovica za obračun PDV-a",
+  "pdf_total": "Ukupan iznos",
+  "pdf_payment_receipt_label": "POTVRDA O UPLATI",
+  "pdf_payment_date": "Datum Uplate",
+  "pdf_payment_number": "Broj Uplate",
+  "pdf_payment_mode": "Način Uplate",
+  "pdf_payment_amount_received_label": "Iznos Uplate",
+  "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_income_label": "PRIHOD",
+  "pdf_net_profit_label": "NETO PROFIT",
+  "pdf_customer_sales_report": "Izveštaj o Prodaji: Po Klijentu",
+  "pdf_total_sales_label": "PRODAJA UKUPNO",
+  "pdf_item_sales_label": "Izveštaj o Prodaji: Po Stavci",
+  "pdf_tax_report_label": "IZVEŠTAJ O POREZIMA",
+  "pdf_total_tax_label": "UKUPNO POREZ",
+  "pdf_tax_types_label": "Tipovi Poreza",
+  "pdf_expenses_label": "Rashodi",
+  "pdf_bill_to": "Račun za,",
+  "pdf_ship_to": "Isporučiti za,",
+  "pdf_received_from": "Poslat od strane:"
 }

resources/assets/js/views/auth/ForgotPassword.vue

@@ -46,7 +46,6 @@
 
 <script type="text/babel">
 import { async } from 'q'
-import { mapActions } from 'vuex'
 const { required, email } = require('vuelidate/lib/validators')
 
 export default {
@@ -68,7 +67,6 @@ export default {
     },
   },
   methods: {
-    ...mapActions('auth'),
     async validateBeforeSubmit(e) {
       this.$v.formData.$touch()
       if (!this.$v.formData.$invalid) {

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

@@ -77,7 +77,7 @@
               :calendar-button="true"
               calendar-button-icon="calendar"
               class="mt-2"
-              @change="$v.newEstimate.estimate_date.$touch()"
+              @input="$v.newEstimate.estimate_date.$touch()"
             />
           </sw-input-group>
 
@@ -92,7 +92,7 @@
               :calendar-button="true"
               calendar-button-icon="calendar"
               class="mt-2"
-              @change="$v.newEstimate.expiry_date.$touch()"
+              @input="$v.newEstimate.expiry_date.$touch()"
             />
           </sw-input-group>
 
@@ -262,7 +262,7 @@
           >
             <sw-button
               type="button"
-              class="flex justify-center w-full text-sm lg:w-auto"
+              class="flex justify-center w-full text-sm lg:w-auto hover:bg-gray-400"
               variant="gray"
               @click="openTemplateModal"
             >

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

@@ -296,7 +296,7 @@ export default {
       },
       set: function (newValue) {
         if (parseFloat(newValue) > 0) {
-          this.item.price = newValue * 100
+          this.item.price = (newValue * 100).toFixed(2)
           this.maxDiscount = this.item.price
         } else {
           this.item.price = newValue

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

@@ -110,7 +110,7 @@
               :calendar-button="true"
               class="mt-2"
               calendar-button-icon="calendar"
-              @change="$v.formData.expense_date.$touch()"
+              @input="$v.formData.expense_date.$touch()"
             />
           </sw-input-group>
 

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

@@ -76,7 +76,7 @@
               :calendar-button="true"
               calendar-button-icon="calendar"
               class="mt-2"
-              @change="$v.newInvoice.invoice_date.$touch()"
+              @input="$v.newInvoice.invoice_date.$touch()"
             />
           </sw-input-group>
 
@@ -91,7 +91,7 @@
               :calendar-button="true"
               calendar-button-icon="calendar"
               class="mt-2"
-              @change="$v.newInvoice.due_date.$touch()"
+              @input="$v.newInvoice.due_date.$touch()"
             />
           </sw-input-group>
 
@@ -254,7 +254,7 @@
           >
             <sw-button
               type="button"
-              class="flex justify-center w-full text-sm lg:w-auto"
+              class="flex justify-center w-full text-sm text-black lg:w-auto hover:bg-gray-400"
               variant="gray"
               @click="openTemplateModal"
             >

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

@@ -296,7 +296,7 @@ export default {
       },
       set: function (newValue) {
         if (parseFloat(newValue) > 0) {
-          this.item.price = newValue * 100
+          this.item.price = (newValue * 100).toFixed(2)
           this.maxDiscount = this.item.price
         } else {
           this.item.price = newValue

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

@@ -59,7 +59,7 @@
               :calendar-button="true"
               class="mt-1"
               calendar-button-icon="calendar"
-              @change="$v.formData.payment_date.$touch()"
+              @input="$v.formData.payment_date.$touch()"
             />
           </sw-input-group>
 
@@ -288,7 +288,7 @@ export default {
         return this.formData.amount / 100
       },
       set: function (newValue) {
-        this.formData.amount = newValue * 100
+        this.formData.amount = (newValue * 100).toFixed(2)
       },
     },
     pageTitle() {

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

@@ -29,7 +29,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.from_date.$touch()"
+            @input="$v.formData.from_date.$touch()"
           />
         </sw-input-group>
 
@@ -44,7 +44,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.to_date.$touch()"
+            @input="$v.formData.to_date.$touch()"
           />
         </sw-input-group>
       </div>
@@ -164,13 +164,13 @@ export default {
       }
     },
 
-    dateRangeUrl () {
+    dateRangeUrl() {
       return `${this.siteURL}?from_date=${moment(
         this.formData.from_date
       ).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
         'YYYY-MM-DD'
       )}`
-    }
+    },
   },
 
   watch: {

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

@@ -29,7 +29,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.from_date.$touch()"
+            @input="$v.formData.from_date.$touch()"
           />
         </sw-input-group>
 
@@ -44,7 +44,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.to_date.$touch()"
+            @input="$v.formData.to_date.$touch()"
           />
         </sw-input-group>
       </div>
@@ -163,13 +163,13 @@ export default {
       }
     },
 
-    dateRangeUrl () {
+    dateRangeUrl() {
       return `${this.siteURL}?from_date=${moment(
         this.formData.from_date
       ).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
         'YYYY-MM-DD'
       )}`
-    }
+    },
   },
 
   watch: {

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

@@ -28,7 +28,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.from_date.$touch()"
+            @input="$v.formData.from_date.$touch()"
           />
         </sw-input-group>
 
@@ -43,7 +43,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.to_date.$touch()"
+            @input="$v.formData.to_date.$touch()"
           />
         </sw-input-group>
       </div>
@@ -182,21 +182,21 @@ export default {
       }
     },
 
-    customerDateRangeUrl () {
+    customerDateRangeUrl() {
       return `${this.customerSiteURL}?from_date=${moment(
-          this.formData.from_date
+        this.formData.from_date
-        ).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
+      ).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
-          'YYYY-MM-DD'
+        'YYYY-MM-DD'
-        )}`
+      )}`
     },
 
-    itemDateRangeUrl () {
+    itemDateRangeUrl() {
       return `${this.itemsSiteURL}?from_date=${moment(
         this.formData.from_date
       ).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
         'YYYY-MM-DD'
       )}`
-    }
+    },
   },
 
   watch: {

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

@@ -28,7 +28,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.from_date.$touch()"
+            @input="$v.formData.from_date.$touch()"
           />
         </sw-input-group>
 
@@ -43,7 +43,7 @@
             :calendar-button="true"
             calendar-button-icon="calendar"
             class="mt-2"
-            @change="$v.formData.to_date.$touch()"
+            @input="$v.formData.to_date.$touch()"
           />
         </sw-input-group>
       </div>
@@ -152,13 +152,13 @@ export default {
       }
     },
 
-    dateRangeUrl () {
+    dateRangeUrl() {
       return `${this.siteURL}?from_date=${moment(
         this.formData.from_date
       ).format('YYYY-MM-DD')}&to_date=${moment(this.formData.to_date).format(
         'YYYY-MM-DD'
       )}`
-    }
+    },
   },
 
   watch: {

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

@@ -313,59 +313,53 @@ export default {
         name: this.formData.name,
         email: this.formData.email,
       }
-
+      try {
-      if (
+        if (
-        this.formData.password != null &&
+          this.formData.password != null &&
-        this.formData.password !== undefined &&
+          this.formData.password !== undefined &&
-        this.formData.password !== ''
+          this.formData.password !== ''
-      ) {
+        ) {
-        data = { ...data, password: this.formData.password }
+          data = { ...data, password: this.formData.password }
-      }
-
-      let response = await this.updateCurrentUser(data)
-
-      let languageData = {
-        settings: {
-          language: this.language.code,
-        },
-      }
-
-      let languageRes = await this.updateUserSettings(languageData)
-
-      // if(languageRes) {
-      //   window.i18n.locale = this.language.code
-      // }
-
-      if (response.data.success) {
-        this.isLoading = false
-
-        if (this.fileObject && this.previewAvatar) {
-          let avatarData = new FormData()
-
-          avatarData.append(
-            'admin_avatar',
-            JSON.stringify({
-              name: this.fileObject.name,
-              data: this.previewAvatar,
-            })
-          )
-          this.uploadAvatar(avatarData)
         }
 
-        window.toastr['success'](
+        let response = await this.updateCurrentUser(data)
-          this.$t('settings.account_settings.updated_message')
-        )
 
-        this.formData.password = ''
+        let languageData = {
-        this.formData.confirm_password = ''
+          settings: {
+            language: this.language.code,
+          },
+        }
+
+        let languageRes = await this.updateUserSettings(languageData)
+
+        if (response.data.success) {
+          this.isLoading = false
+
+          if (this.fileObject && this.previewAvatar) {
+            let avatarData = new FormData()
+
+            avatarData.append(
+              'admin_avatar',
+              JSON.stringify({
+                name: this.fileObject.name,
+                data: this.previewAvatar,
+              })
+            )
+
+            this.uploadAvatar(avatarData)
+          }
+
+          window.toastr['success'](
+            this.$t('settings.account_settings.updated_message')
+          )
+
+          this.formData.password = ''
+          this.formData.confirm_password = ''
+        }
+      } catch (error) {
+        this.isLoading = false
         return true
       }
-
-      window.toastr['error'](response.data.error)
-
-      this.isLoading = false
-
-      return true
     },
   },
 }

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

@@ -354,7 +354,7 @@
                         <h1 class="header-logo"> {{$estimate->user->company->name}} </h1>
                     @endif
                 </td>
-                <td width="50%" class="company-address-container company-address">
+                <td width="50%" class="company-address-container company-address text-right">
                     {!! $company_address !!}
                 </td>
             </tr>

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

@@ -273,7 +273,7 @@
         }
 
         .total-table-attribute-value {
-            font-weight: 500;
+            font-weight: bold;
             text-align: right;
             font-size: 12px;
             color: #040405;

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

@@ -314,7 +314,7 @@
                         <h1 class="header-logo"> {{$invoice->user->company->name}} </h1>
                     @endif
                 </td>
-                <td width="50%" class="company-address-container company-address">
+                <td width="50%" class="company-address-container company-address text-right">
                     {!! $company_address !!}
                 </td>
             </tr>

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

@@ -65,6 +65,10 @@
             float: right;
         } */
 
+        .header-section-right {
+            text-align: right;
+        }
+
         .header {
             font-size: 20px;
             color: rgba(0, 0, 0, 0.7);
@@ -226,7 +230,7 @@
         }
 
         .content-heading span {
-            font-weight: 400;
+            font-weight: normal;
             font-size: 14px;
             line-height: 25px;
             padding-bottom: 5px;
@@ -248,7 +252,7 @@
 
         .total-display-label {
             display: inline;
-            font-weight: 600;
+            font-weight: bold;
             font-size: 14px;
             line-height: 21px;
             color: #595959;
@@ -256,7 +260,7 @@
 
         .total-display-box span {
             float: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 14px;
             line-height: 21px;
             text-align: right;

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

@@ -20,7 +20,7 @@
         }
 
         .heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 24px;
             color: #5851D8;
             width: 100%;
@@ -30,7 +30,7 @@
         }
 
         .heading-date-range {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 15px;
             color: #A5ACC1;
             width: 100%;
@@ -40,7 +40,7 @@
         }
 
         .sub-heading-text {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 16px;
             color: #595959;
             padding: 0px;
@@ -98,7 +98,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             text-align: right;
@@ -117,7 +117,7 @@
             padding: 0px;
             margin: 0px;
             text-align: left;
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -127,7 +127,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 20px;
             line-height: 21px;
             color: #5851D8;

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

@@ -20,7 +20,7 @@
         }
 
         .heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 24px;
             color: #5851D8;
             width: 100%;
@@ -30,7 +30,7 @@
         }
 
         .heading-date-range {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 15px;
             color: #A5ACC1;
             width: 100%;
@@ -40,7 +40,7 @@
         }
 
         .sub-heading-text {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 16px;
             color: #595959;
             padding: 0px;
@@ -65,7 +65,7 @@
         .income-amount {
             padding: 0px;
             margin: 0px;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             text-align: right;
@@ -123,7 +123,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             text-align: right;
@@ -142,7 +142,7 @@
             padding: 0px;
             margin: 0px;
             text-align: left;
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -152,7 +152,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 20px;
             line-height: 21px;
             color: #5851D8;

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

@@ -20,7 +20,7 @@
         }
 
         .heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 24px;
             color: #5851D8;
             width: 100%;
@@ -30,7 +30,7 @@
         }
 
         .heading-date-range {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 15px;
             color: #A5ACC1;
             width: 100%;
@@ -40,7 +40,7 @@
         }
 
         .sub-heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -98,7 +98,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             text-align: right;
@@ -117,7 +117,7 @@
             padding: 0px;
             margin: 0px;
             text-align: left;
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -127,7 +127,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 20px;
             line-height: 21px;
             color: #5851D8;

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

@@ -20,7 +20,7 @@
         }
 
         .heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 24px;
             color: #5851D8;
             width: 100%;
@@ -30,7 +30,7 @@
         }
 
         .heading-date-range {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 15px;
             color: #A5ACC1;
             width: 100%;
@@ -40,7 +40,7 @@
         }
 
         .sub-heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -98,7 +98,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             text-align: right;
@@ -117,7 +117,7 @@
             padding: 0px;
             margin: 0px;
             text-align: left;
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -127,7 +127,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 20px;
             line-height: 21px;
             color: #5851D8;

resources/views/app/pdf/reports/tax-summary.blade.php

@@ -21,7 +21,7 @@
         }
 
         .heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 24px;
             color: #5851D8;
             width: 100%;
@@ -31,7 +31,7 @@
         }
 
         .heading-date-range {
-            font-weight: 600;
+            font-weight: normal;
             font-size: 15px;
             color: #A5ACC1;
             width: 100%;
@@ -41,7 +41,7 @@
         }
 
         .sub-heading-text {
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             color: #595959;
             padding: 0px;
@@ -99,7 +99,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             text-align: right;
@@ -118,7 +118,7 @@
             padding: 0px;
             margin: 0px;
             text-align: left;
-            font-weight: 600;
+            font-weight: bold;
             font-size: 16px;
             line-height: 21px;
             color: #595959;
@@ -128,7 +128,7 @@
             padding: 0px;
             margin: 0px;
             text-align: right;
-            font-weight: 500;
+            font-weight: bold;
             font-size: 20px;
             line-height: 21px;
             color: #5851D8;