Bump minimatch from 3.0.4 to 3.1.2

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
feat: uffizzi integration (#1091 )
2025-10-30 13:11:08 -04:00 · 2022-11-21 13:06:47 +00:00 · 2022-11-21 18:35:59 +05:30 · 2022-11-03 19:29:16 +05:30 · 2022-10-26 19:51:36 +05:30 · 2022-10-26 19:33:25 +05:30
75 changed files with 7484 additions and 8495 deletions
--- a/.github/workflows/uffizzi-build.yml
+++ b/.github/workflows/uffizzi-build.yml
@ -0,0 +1,162 @@
+name: Build PR Image
+on:
+  pull_request:
+    types: [opened,synchronize,reopened,closed]
+
+jobs:
+
+  build-application:
+    name: Build and Push `application`
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
+    outputs:
+      tags: ${{ steps.meta.outputs.tags }}
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2        
+      - name: Generate UUID image name
+        id: uuid
+        run: echo "UUID_TAG_APP=$(uuidgen)" >> $GITHUB_ENV
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: registry.uffizzi.com/${{ env.UUID_TAG_APP }}
+          tags: type=raw,value=60d
+      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          context: ./
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          file: ./uffizzi/Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+
+  build-nginx:
+    name: Build and Push `nginx`
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
+    outputs:
+      tags: ${{ steps.meta.outputs.tags }}
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2        
+      - name: Generate UUID image name
+        id: uuid
+        run: echo "UUID_TAG_NGINX=$(uuidgen)" >> $GITHUB_ENV
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: registry.uffizzi.com/${{ env.UUID_TAG_NGINX }}
+          tags: type=raw,value=60d
+      - name: Build and Push Image to Uffizzi ephemeral registry
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          context: ./
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          file: ./uffizzi/nginx/Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+
+  build-crond:
+    name: Build and Push `crond`
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
+    outputs:
+      tags: ${{ steps.meta.outputs.tags }}
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2        
+      - name: Generate UUID image name
+        id: uuid
+        run: echo "UUID_TAG_CROND=$(uuidgen)" >> $GITHUB_ENV
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: registry.uffizzi.com/${{ env.UUID_TAG_CROND }}
+          tags: type=raw,value=60d
+      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          context: ./
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          file: ./uffizzi/crond/Dockerfile      
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+
+
+  render-compose-file:
+    name: Render Docker Compose File
+    # Pass output of this workflow to another triggered by `workflow_run` event.
+    runs-on: ubuntu-latest
+    outputs:
+      compose-file-cache-key: ${{ steps.hash.outputs.hash }}
+    needs: 
+      - build-application
+      - build-nginx
+      - build-crond
+    steps:
+      - name: Checkout git repo
+        uses: actions/checkout@v3
+      - name: Render Compose File
+        run: |
+          APP_IMAGE=$(echo ${{ needs.build-application.outputs.tags }})
+          export APP_IMAGE
+          NGINX_IMAGE=$(echo ${{ needs.build-nginx.outputs.tags }})
+          export NGINX_IMAGE
+          CROND_IMAGE=$(echo ${{ needs.build-crond.outputs.tags }})
+          export CROND_IMAGE
+          # Render simple template from environment variables.
+          envsubst < ./uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
+          cat docker-compose.rendered.yml
+      - name: Upload Rendered Compose File as Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: preview-spec
+          path: docker-compose.rendered.yml
+          retention-days: 2
+      - name: Serialize PR Event to File
+        run:  |
+          cat << EOF > event.json
+          ${{ toJSON(github.event) }} 
+          
+          EOF
+      - name: Upload PR Event as Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: preview-spec
+          path: event.json
+          retention-days: 2
+
+  delete-preview:
+    name: Call for Preview Deletion
+    runs-on: ubuntu-latest
+    if: ${{ github.event.action == 'closed' }}
+    steps:
+      # If this PR is closing, we will not render a compose file nor pass it to the next workflow.
+      - name: Serialize PR Event to File
+        run: echo '${{ toJSON(github.event) }}' > event.json
+      - name: Upload PR Event as Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: preview-spec
+          path: event.json
+          retention-days: 2
+
--- a/.github/workflows/uffizzi-preview.yml
+++ b/.github/workflows/uffizzi-preview.yml
@ -0,0 +1,84 @@
+name: Deploy Uffizzi Preview
+
+on:
+  workflow_run:
+    workflows:
+      - "Build PR Image"
+    types:
+      - completed
+
+
+jobs:
+  cache-compose-file:
+    name: Cache Compose File
+    runs-on: ubuntu-latest
+    outputs:
+      compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }}
+      pr-number: ${{ env.PR_NUMBER }}
+    steps:
+      - name: 'Download artifacts'
+        # Fetch output (zip archive) from the workflow run that triggered this workflow.
+        uses: actions/github-script@v6
+        with:
+          script: |
+            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "preview-spec"
+            })[0];
+            let download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            let fs = require('fs');
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data));
+      - name: 'Unzip artifact'
+        run: unzip preview-spec.zip
+      - name: Read Event into ENV
+        run: |
+          echo 'EVENT_JSON<<EOF' >> $GITHUB_ENV
+          cat event.json >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: Hash Rendered Compose File
+        id: hash
+        # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact.
+        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
+        run: echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV
+      - name: Cache Rendered Compose File
+        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
+        uses: actions/cache@v3
+        with:
+          path: docker-compose.rendered.yml
+          key: ${{ env.COMPOSE_FILE_HASH }}
+
+      - name: Read PR Number From Event Object
+        id: pr
+        run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV
+
+      - name: DEBUG - Print Job Outputs
+        if: ${{ runner.debug }}
+        run: |
+          echo "PR number: ${{ env.PR_NUMBER }}"
+          echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}"
+          cat event.json
+  deploy-uffizzi-preview:
+    name: Use Remote Workflow to Preview on Uffizzi
+    needs:
+      - cache-compose-file
+    uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2.6.1
+    with:
+      # If this workflow was triggered by a PR close event, cache-key will be an empty string
+      # and this reusable workflow will delete the preview deployment.
+      compose-file-cache-key: ${{ needs.cache-compose-file.outputs.compose-file-cache-key }}
+      compose-file-cache-path: docker-compose.rendered.yml
+      server: https://app.uffizzi.com/
+      pr-number: ${{ needs.cache-compose-file.outputs.pr-number }}
+    permissions:
+      contents: read
+      pull-requests: write
+      id-token: write
--- a/.gitignore
+++ b/.gitignore
@ -16,3 +16,4 @@ Homestead.yaml
 .gitkeep
 /public/docs
 /.scribe
+!storage/fonts/.gitkeep
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.1-fpm

 # Arguments defined in docker-compose.yml
 ARG user
--- a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
@ -2,24 +2,25 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

+use PDF;
 use Carbon\Carbon;
-use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
-use Crater\Models\CompanySetting;
+use Crater\Models\Currency;
 use Crater\Models\Customer;
 use Illuminate\Http\Request;
+use Crater\Models\CompanySetting;
 use Illuminate\Support\Facades\App;
-use PDF;
+use Crater\Http\Controllers\Controller;

 class CustomerSalesReportController extends Controller
 {
    /**
-    * Handle the incoming request.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
-    */
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $hash
+     * @return \Illuminate\Http\JsonResponse
+     */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -56,6 +57,7 @@ class CustomerSalesReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));

        $colors = [
            'primary_text_color',
@ -80,6 +82,7 @@ class CustomerSalesReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
+            'currency' => $currency,
        ]);

        $pdf = PDF::loadView('app.pdf.reports.sales-customers');
--- a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
@ -2,24 +2,25 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use Carbon\Carbon;
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Company;
-use Crater\Models\CompanySetting;
-use Crater\Models\Expense;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use PDF;
+use Carbon\Carbon;
+use Crater\Models\Company;
+use Crater\Models\Expense;
+use Crater\Models\Currency;
+use Illuminate\Http\Request;
+use Crater\Models\CompanySetting;
+use Illuminate\Support\Facades\App;
+use Crater\Http\Controllers\Controller;

 class ExpensesReportController extends Controller
 {
    /**
-    * Handle the incoming request.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
-    */
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $hash
+     * @return \Illuminate\Http\JsonResponse
+     */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -43,6 +44,7 @@ class ExpensesReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));

        $colors = [
            'primary_text_color',
@ -66,6 +68,7 @@ class ExpensesReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
+            'currency' => $currency,
        ]);
        $pdf = PDF::loadView('app.pdf.reports.expenses');

--- a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
@ -2,24 +2,25 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use Carbon\Carbon;
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Company;
-use Crater\Models\CompanySetting;
-use Crater\Models\InvoiceItem;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use PDF;
+use Carbon\Carbon;
+use Crater\Models\Company;
+use Crater\Models\Currency;
+use Illuminate\Http\Request;
+use Crater\Models\InvoiceItem;
+use Crater\Models\CompanySetting;
+use Illuminate\Support\Facades\App;
+use Crater\Http\Controllers\Controller;

 class ItemSalesReportController extends Controller
 {
    /**
-    * Handle the incoming request.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
-    */
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $hash
+     * @return \Illuminate\Http\JsonResponse
+     */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -43,6 +44,7 @@ class ItemSalesReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));

        $colors = [
            'primary_text_color',
@ -66,6 +68,7 @@ class ItemSalesReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
+            'currency' => $currency,
        ]);
        $pdf = PDF::loadView('app.pdf.reports.sales-items');

--- a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
@ -2,25 +2,26 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

+use PDF;
 use Carbon\Carbon;
-use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
-use Crater\Models\CompanySetting;
 use Crater\Models\Expense;
 use Crater\Models\Payment;
+use Crater\Models\Currency;
 use Illuminate\Http\Request;
+use Crater\Models\CompanySetting;
 use Illuminate\Support\Facades\App;
-use PDF;
+use Crater\Http\Controllers\Controller;

 class ProfitLossReportController extends Controller
 {
    /**
-    * Handle the incoming request.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
-    */
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $hash
+     * @return \Illuminate\Http\JsonResponse
+     */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -49,6 +50,8 @@ class ProfitLossReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
+

        $colors = [
            'primary_text_color',
@ -74,6 +77,7 @@ class ProfitLossReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
+            'currency' => $currency,
        ]);
        $pdf = PDF::loadView('app.pdf.reports.profit-loss');

--- a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
+++ b/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
@ -2,24 +2,25 @@

 namespace Crater\Http\Controllers\V1\Admin\Report;

-use Carbon\Carbon;
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Company;
-use Crater\Models\CompanySetting;
-use Crater\Models\Tax;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\App;
 use PDF;
+use Carbon\Carbon;
+use Crater\Models\Tax;
+use Crater\Models\Company;
+use Crater\Models\Currency;
+use Illuminate\Http\Request;
+use Crater\Models\CompanySetting;
+use Illuminate\Support\Facades\App;
+use Crater\Http\Controllers\Controller;

 class TaxSummaryReportController extends Controller
 {
    /**
-    * Handle the incoming request.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
-    */
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  string  $hash
+     * @return \Illuminate\Http\JsonResponse
+     */
    public function __invoke(Request $request, $hash)
    {
        $company = Company::where('unique_hash', $hash)->first();
@ -44,6 +45,8 @@ class TaxSummaryReportController extends Controller
        $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
        $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
        $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
+        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
+

        $colors = [
            'primary_text_color',
@ -68,6 +71,7 @@ class TaxSummaryReportController extends Controller
            'company' => $company,
            'from_date' => $from_date,
            'to_date' => $to_date,
+            'currency' => $currency,
        ]);

        $pdf = PDF::loadView('app.pdf.reports.tax-summary');
--- a/composer.json
+++ b/composer.json
@ -38,15 +38,15 @@
    "barryvdh/laravel-ide-helper": "^2.6",
    "beyondcode/laravel-dump-server": "^1.0",
    "facade/ignition": "^2.3.6",
-    "friendsofphp/php-cs-fixer": "^3.0",
-    "fzaninotto/faker": "^1.9.1",
+    "friendsofphp/php-cs-fixer": "^3.8",
+    "fakerphp/faker": "^1.9.1",
    "mockery/mockery": "^1.3.1",
    "nunomaduro/collision": "^5.0",
    "pestphp/pest": "^1.0",
    "pestphp/pest-plugin-faker": "^1.0",
    "pestphp/pest-plugin-laravel": "^1.0",
    "pestphp/pest-plugin-parallel": "^0.2.1",
-    "phpunit/phpunit": "^9.0"
+    "phpunit/phpunit": "^9.3"
  },
  "autoload": {
    "psr-4": {
@ -81,7 +81,10 @@
  "config": {
    "optimize-autoloader": true,
    "preferred-install": "dist",
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "pestphp/pest-plugin": true
+    }
  },
  "extra": {
    "laravel": {
--- a/composer.lock
+++ b/composer.lock
--- a/config/crater.php
+++ b/config/crater.php
@ -71,6 +71,7 @@ return [
        ["code" => "cs", "name" => "Czech"],
        ["code" => "el", "name" => "Greek"],
        ["code" => "hr", "name" => "Crotian"],
+        ["code" => "th", "name" => "ไทย"],
    ],

    /*
--- a/database/seeders/CountriesTableSeeder.php
+++ b/database/seeders/CountriesTableSeeder.php
@ -170,7 +170,7 @@ class CountriesTableSeeder extends Seeder
        ['id' => 152,'code' => 'NR','name' => "Nauru",'phonecode' => 674],
        ['id' => 153,'code' => 'NP','name' => "Nepal",'phonecode' => 977],
        ['id' => 154,'code' => 'AN','name' => "Netherlands Antilles",'phonecode' => 599],
-        ['id' => 155,'code' => 'NL','name' => "Netherlands The",'phonecode' => 31],
+        ['id' => 155,'code' => 'NL','name' => "Netherlands",'phonecode' => 31],
        ['id' => 156,'code' => 'NC','name' => "New Caledonia",'phonecode' => 687],
        ['id' => 157,'code' => 'NZ','name' => "New Zealand",'phonecode' => 64],
        ['id' => 158,'code' => 'NI','name' => "Nicaragua",'phonecode' => 505],
--- a/docker-compose/cron.dockerfile
+++ b/docker-compose/cron.dockerfile
@ -1,7 +1,7 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0-fpm-alpine

 RUN apk add --no-cache \
-    php7-bcmath
+    php8-bcmath

 RUN docker-php-ext-install pdo pdo_mysql bcmath

--- a/package-lock.json
+++ b/package-lock.json
@ -65,6 +65,13 @@
        "to-fast-properties": "^2.0.0"
      }
    },
+    "@esbuild/linux-loong64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
+      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "dev": true,
+      "optional": true
+    },
    "@eslint/eslintrc": {
      "version": "0.4.3",
      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@ -214,6 +221,23 @@
      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz",
      "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ=="
    },
+    "@rvxlab/tailwind-plugin-ios-full-height": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@rvxlab/tailwind-plugin-ios-full-height/-/tailwind-plugin-ios-full-height-1.1.0.tgz",
+      "integrity": "sha512-jPIxXn0raN/YTk8nXesqM+JbS2WWd5XaUk/MbaAgVDDPyYtsPfeN3B26xIhSa2oE2+JB66tegPUMSOmixzroXg==",
+      "dev": true
+    },
+    "@stripe/stripe-js": {
+      "version": "1.44.1",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.44.1.tgz",
+      "integrity": "sha512-DKj3U6tS+sCNsSXsoZbOl5gDrAVD3cAZ9QCiVSykLC3iJo085kkmw/3BAACRH54Bq2bN34yySuH6G1SLh2xHXA=="
+    },
+    "@tailwindcss/aspect-ratio": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz",
+      "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==",
+      "dev": true
+    },
    "@tailwindcss/forms": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz",
@ -223,6 +247,35 @@
        "mini-svg-data-uri": "^1.2.3"
      }
    },
+    "@tailwindcss/line-clamp": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.1.tgz",
+      "integrity": "sha512-pNr0T8LAc3TUx/gxCfQZRe9NB2dPEo/cedPHzUGIPxqDMhgjwNm6jYxww4W5l0zAsAddxr+XfZcqttGiFDgrGg=="
+    },
+    "@tailwindcss/typography": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.8.tgz",
+      "integrity": "sha512-xGQEp8KXN8Sd8m6R4xYmwxghmswrd0cPnNI2Lc6fmrC3OojysTBJJGSIVwPV56q4t6THFUK3HJ0EaWwpglSxWw==",
+      "dev": true,
+      "requires": {
+        "lodash.castarray": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.merge": "^4.6.2",
+        "postcss-selector-parser": "6.0.10"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
    "@tiptap/core": {
      "version": "2.0.0-beta.99",
      "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.0.0-beta.99.tgz",
@ -386,6 +439,11 @@
      "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-2.0.0-beta.13.tgz",
      "integrity": "sha512-0EtAwuRldCAoFaL/iXgkRepEeOd55rPg5N4FQUN1xTwZT7PDofukP0DG/2jff/Uj17x4uTaJAa9qlFWuNnDvjw=="
    },
+    "@tiptap/extension-text-align": {
+      "version": "2.0.0-beta.202",
+      "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-2.0.0-beta.202.tgz",
+      "integrity": "sha512-cB5SBKRTn730BBwtPQaKfc7uYgI7bGuD1UbsdF8UY93vIsRjdRO4McNlvgfDrb8WrD460PsOOXx18YwX1+3T/Q=="
+    },
    "@tiptap/starter-kit": {
      "version": "2.0.0-beta.97",
      "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.97.tgz",
@ -537,6 +595,12 @@
        "@types/prosemirror-transform": "*"
      }
    },
+    "@vitejs/plugin-vue": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz",
+      "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==",
+      "dev": true
+    },
    "@vue/compiler-core": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz",
@ -558,6 +622,70 @@
        "@vue/shared": "3.2.4"
      }
    },
+    "@vue/compiler-sfc": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz",
+      "integrity": "sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.45",
+        "@vue/compiler-dom": "3.2.45",
+        "@vue/compiler-ssr": "3.2.45",
+        "@vue/reactivity-transform": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7",
+        "postcss": "^8.1.10",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "@babel/parser": {
+          "version": "7.20.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz",
+          "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==",
+          "dev": true
+        },
+        "@vue/compiler-core": {
+          "version": "3.2.45",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
+          "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
+          "dev": true,
+          "requires": {
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.45",
+            "estree-walker": "^2.0.2",
+            "source-map": "^0.6.1"
+          }
+        },
+        "@vue/compiler-dom": {
+          "version": "3.2.45",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz",
+          "integrity": "sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==",
+          "dev": true,
+          "requires": {
+            "@vue/compiler-core": "3.2.45",
+            "@vue/shared": "3.2.45"
+          }
+        },
+        "@vue/compiler-ssr": {
+          "version": "3.2.45",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz",
+          "integrity": "sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==",
+          "dev": true,
+          "requires": {
+            "@vue/compiler-dom": "3.2.45",
+            "@vue/shared": "3.2.45"
+          }
+        },
+        "@vue/shared": {
+          "version": "3.2.45",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
+          "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==",
+          "dev": true
+        }
+      }
+    },
    "@vue/compiler-ssr": {
      "version": "3.2.19",
      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz",
@ -607,6 +735,45 @@
        "@vue/shared": "3.2.4"
      }
    },
+    "@vue/reactivity-transform": {
+      "version": "3.2.45",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz",
+      "integrity": "sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==",
+      "dev": true,
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.45",
+        "@vue/shared": "3.2.45",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.25.7"
+      },
+      "dependencies": {
+        "@babel/parser": {
+          "version": "7.20.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz",
+          "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==",
+          "dev": true
+        },
+        "@vue/compiler-core": {
+          "version": "3.2.45",
+          "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.45.tgz",
+          "integrity": "sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==",
+          "dev": true,
+          "requires": {
+            "@babel/parser": "^7.16.4",
+            "@vue/shared": "3.2.45",
+            "estree-walker": "^2.0.2",
+            "source-map": "^0.6.1"
+          }
+        },
+        "@vue/shared": {
+          "version": "3.2.45",
+          "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.45.tgz",
+          "integrity": "sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==",
+          "dev": true
+        }
+      }
+    },
    "@vue/ref-transform": {
      "version": "3.2.19",
      "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz",
@ -677,6 +844,44 @@
      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz",
      "integrity": "sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg=="
    },
+    "@vuelidate/components": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@vuelidate/components/-/components-1.2.3.tgz",
+      "integrity": "sha512-QE+oSzJVYZUfYcIAsM+QCrB3xRJoesFzUTNtfuYbhWfdMmTHxA9YtKuKWlTsR1nK8+SmHMJROIG8PnL77ZLSuQ==",
+      "requires": {
+        "@vuelidate/core": "^2.0.0"
+      }
+    },
+    "@vuelidate/core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@vuelidate/core/-/core-2.0.0.tgz",
+      "integrity": "sha512-xIFgdQlScO0aaSZ0wTGPJh8YcTMNAj5veI8yPgiAyxOT+GV7vNQFiU1vpYWCL4cklkkhYvRRSC2OEX7YOZNmPQ==",
+      "requires": {
+        "vue-demi": "^0.13.11"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+          "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
+        }
+      }
+    },
+    "@vuelidate/validators": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@vuelidate/validators/-/validators-2.0.0.tgz",
+      "integrity": "sha512-fQQcmDWfz7pyH5/JPi0Ng2GEgNK1pUHn/Z/j5rG/Q+HwhgIXvJblTPcZwKOj1ABL7V4UVuGKECvZCDHNGOwdrg==",
+      "requires": {
+        "vue-demi": "^0.13.11"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+          "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
+        }
+      }
+    },
    "@vueuse/core": {
      "version": "6.0.0",
      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-6.0.0.tgz",
@ -1240,6 +1445,175 @@
        }
      }
    },
+    "esbuild": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
+      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
+      "dev": true,
+      "requires": {
+        "@esbuild/linux-loong64": "0.14.54",
+        "esbuild-android-64": "0.14.54",
+        "esbuild-android-arm64": "0.14.54",
+        "esbuild-darwin-64": "0.14.54",
+        "esbuild-darwin-arm64": "0.14.54",
+        "esbuild-freebsd-64": "0.14.54",
+        "esbuild-freebsd-arm64": "0.14.54",
+        "esbuild-linux-32": "0.14.54",
+        "esbuild-linux-64": "0.14.54",
+        "esbuild-linux-arm": "0.14.54",
+        "esbuild-linux-arm64": "0.14.54",
+        "esbuild-linux-mips64le": "0.14.54",
+        "esbuild-linux-ppc64le": "0.14.54",
+        "esbuild-linux-riscv64": "0.14.54",
+        "esbuild-linux-s390x": "0.14.54",
+        "esbuild-netbsd-64": "0.14.54",
+        "esbuild-openbsd-64": "0.14.54",
+        "esbuild-sunos-64": "0.14.54",
+        "esbuild-windows-32": "0.14.54",
+        "esbuild-windows-64": "0.14.54",
+        "esbuild-windows-arm64": "0.14.54"
+      }
+    },
+    "esbuild-android-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
+      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-android-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
+      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
+      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
+      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
+      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
+      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-32": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
+      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
+      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
+      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
+      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-mips64le": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
+      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-ppc64le": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
+      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-riscv64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
+      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-s390x": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
+      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-netbsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
+      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-openbsd-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
+      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-sunos-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
+      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-32": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
+      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
+      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-arm64": {
+      "version": "0.14.54",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
+      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
+      "dev": true,
+      "optional": true
+    },
    "escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@ -1947,12 +2321,24 @@
      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
    },
+    "lodash.castarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz",
+      "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==",
+      "dev": true
+    },
    "lodash.clonedeep": {
      "version": "4.5.0",
      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
      "dev": true
    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "dev": true
+    },
    "lodash.merge": {
      "version": "4.6.2",
      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@ -2018,9 +2404,9 @@
      "integrity": "sha512-+fA2oRcR1dJI/7ITmeQJDrYWks0wodlOz0pAEhKYJ2IVc1z0AnwJUsKY2fzFmPAM3Jo9J0rBx8JAA9QQSJ5PuA=="
    },
    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
      "dev": true,
      "requires": {
        "brace-expansion": "^1.1.7"
@ -2205,6 +2591,22 @@
      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
      "dev": true
    },
+    "pinia": {
+      "version": "2.0.24",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.24.tgz",
+      "integrity": "sha512-DDLd4Iphyc+6PYYYbx7jkb6WP9gecgu9bz9huyB5rb7CdJI3DhzYiZI+/Ih8MLewRrP9DSpslF/BgSNrJtZU7A==",
+      "requires": {
+        "@vue/devtools-api": "^6.4.5",
+        "vue-demi": "*"
+      },
+      "dependencies": {
+        "@vue/devtools-api": {
+          "version": "6.4.5",
+          "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
+          "integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
+        }
+      }
+    },
    "postcss": {
      "version": "8.4.5",
      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
@ -2508,6 +2910,15 @@
        "glob": "^7.1.3"
      }
    },
+    "rollup": {
+      "version": "2.77.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
+      "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
+      "dev": true,
+      "requires": {
+        "fsevents": "~2.3.2"
+      }
+    },
    "rope-sequence": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.2.tgz",
@ -2668,6 +3079,12 @@
        "has-flag": "^3.0.0"
      }
    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
    "table": {
      "version": "6.7.2",
      "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz",
@ -2934,12 +3351,86 @@
      "resolved": "https://registry.npmjs.org/v-money3/-/v-money3-3.16.1.tgz",
      "integrity": "sha512-U0GjmdybvEwfxCpZiTUbKugSglJbX6wxlyMeg0YJdLTAKlnjMRDph3hpNJlTlg5Gs8MQRpDVdaLysBjV749HLg=="
    },
+    "v-tooltip": {
+      "version": "4.0.0-beta.17",
+      "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-4.0.0-beta.17.tgz",
+      "integrity": "sha512-d7v/6KEXQOtcj3NT3Z1LpbDv8SBh8JgbsD+3s/zGIGCxiXC2SoVW6wGV4X0MlCo97PiosibcSe+VKbFiy4AKnQ==",
+      "requires": {
+        "@popperjs/core": "^2.11.0",
+        "vue-resize": "^2.0.0-alpha.1"
+      },
+      "dependencies": {
+        "@popperjs/core": {
+          "version": "2.11.6",
+          "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+          "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
+        }
+      }
+    },
    "v8-compile-cache": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
      "dev": true
    },
+    "vite": {
+      "version": "2.9.15",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.15.tgz",
+      "integrity": "sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==",
+      "dev": true,
+      "requires": {
+        "esbuild": "^0.14.27",
+        "fsevents": "~2.3.2",
+        "postcss": "^8.4.13",
+        "resolve": "^1.22.0",
+        "rollup": ">=2.59.0 <2.78.0"
+      },
+      "dependencies": {
+        "is-core-module": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+          "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "8.4.19",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
+          "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+          "dev": true,
+          "requires": {
+            "nanoid": "^3.3.4",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
+          }
+        },
+        "resolve": {
+          "version": "1.22.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+          "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.9.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        },
+        "source-map-js": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+          "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+          "dev": true
+        }
+      }
+    },
    "vue": {
      "version": "3.2.4",
      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.4.tgz",
@ -3002,6 +3493,11 @@
        "@vue/devtools-api": "^6.0.0-beta.7"
      }
    },
+    "vue-resize": {
+      "version": "2.0.0-alpha.1",
+      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz",
+      "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg=="
+    },
    "vue-router": {
      "version": "4.0.11",
      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.11.tgz",
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRow.vue
@ -17,18 +17,7 @@
            <td class="px-5 py-4 text-left align-top">
              <div class="flex justify-start">
                <div
-                  class="
-                    flex
-                    items-center
-                    justify-center
-                    w-5
-                    h-5
-                    mt-2
-                    text-gray-300
-                    cursor-move
-                    handle
-                    mr-2
-                  "
+                  class="flex items-center justify-center w-5 h-5 mt-2 mr-2 text-gray-300 cursor-move  handle"
                >
                  <DragIcon />
                </div>
@ -108,7 +97,7 @@

                          <BaseIcon
                            name="ChevronDownIcon"
-                            class="w-4 h-4 text-gray-500 ml-1"
+                            class="w-4 h-4 ml-1 text-gray-500"
                          />
                        </span>
                      </BaseButton>
@ -155,7 +144,7 @@
              <BaseContentPlaceholders v-if="loading">
                <BaseContentPlaceholdersText
                  :lines="1"
-                  class="w-24 h-8 rounded-md border"
+                  class="w-24 h-8 border rounded-md"
                />
              </BaseContentPlaceholders>

@ -175,6 +164,7 @@
                :ability="abilities.CREATE_INVOICE"
                :store="store"
                :store-prop="storeProp"
+                :discount="discount"
                @update="updateTax"
              />
            </td>
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue
@ -30,24 +30,13 @@
        <template v-if="userStore.hasAbilities(ability)" #action>
          <button
            type="button"
-            class="
-              flex
-              items-center
-              justify-center
-              w-full
-              px-2
-              cursor-pointer
-              py-2
-              bg-gray-200
-              border-none
-              outline-none
-            "
+            class="flex items-center justify-center w-full px-2 py-2 bg-gray-200 border-none outline-none cursor-pointer "
            @click="openTaxModal"
          >
            <BaseIcon name="CheckCircleIcon" class="h-5 text-primary-400" />

            <label
-              class="ml-2 text-sm leading-none text-primary-400 cursor-pointer"
+              class="ml-2 text-sm leading-none cursor-pointer text-primary-400"
              >{{ $t('invoices.add_new_tax') }}</label
            >
          </button>
@ -115,6 +104,10 @@ const props = defineProps({
    type: Number,
    default: 0,
  },
+  discountedTotal: {
+    type: Number,
+    default: 0,
+  },
  currency: {
    type: [Object, String],
    required: true,
@ -153,19 +146,19 @@ const filteredTypes = computed(() => {
 })

 const taxAmount = computed(() => {
-  if (localTax.compound_tax && props.total) {
-    return ((props.total + props.totalTax) * localTax.percent) / 100
+  if (localTax.compound_tax && props.discountedTotal) {
+    return ((props.discountedTotal + props.totalTax) * localTax.percent) / 100
  }

-  if (props.total && localTax.percent) {
-    return (props.total * localTax.percent) / 100
+  if (props.discountedTotal && localTax.percent) {
+    return (props.discountedTotal * localTax.percent) / 100
  }

  return 0
 })

 watch(
-  () => props.total,
+  () => props.discountedTotal,
  () => {
    updateRowTax()
  }
--- a/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
+++ b/resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue
@ -29,14 +29,7 @@

      <label
        v-else
-        class="
-          flex
-          items-center
-          justify-center
-          m-0
-          text-lg text-black
-          uppercase
-        "
+        class="flex items-center justify-center m-0 text-lg text-black uppercase "
      >
        <BaseFormatMoney
          :amount="store.getSubTotal"
@ -66,14 +59,7 @@

      <label
        v-else-if="store[storeProp].tax_per_item === 'YES'"
-        class="
-          flex
-          items-center
-          justify-center
-          m-0
-          text-lg text-black
-          uppercase
-        "
+        class="flex items-center justify-center m-0 text-lg text-black uppercase "
      >
        <BaseFormatMoney :amount="tax.amount" :currency="defaultCurrency" />
      </label>
@ -98,7 +84,7 @@
      <BaseContentPlaceholders v-if="isLoading">
        <BaseContentPlaceholdersText
          :lines="1"
-          class="w-24 h-8 rounded-md border"
+          class="w-24 h-8 border rounded-md"
        />
      </BaseContentPlaceholders>
      <div v-else class="flex" style="width: 140px" role="group">
@ -114,7 +100,7 @@
        <BaseDropdown position="bottom-end">
          <template #activator>
            <BaseButton
-              class="rounded-tr-md rounded-br-md p-2 rounded-none"
+              class="p-2 rounded-none rounded-tr-md rounded-br-md"
              type="button"
              variant="white"
            >
@ -127,7 +113,7 @@

                <BaseIcon
                  name="ChevronDownIcon"
-                  class="w-4 h-4 text-gray-500 ml-1"
+                  class="w-4 h-4 ml-1 text-gray-500"
                />
              </span>
            </BaseButton>
@ -180,15 +166,7 @@
    </div>

    <div
-      class="
-        flex
-        items-center
-        justify-between
-        w-full
-        pt-2
-        mt-5
-        border-t border-gray-200 border-solid
-      "
+      class="flex items-center justify-between w-full pt-2 mt-5 border-t border-gray-200 border-solid "
    >
      <BaseContentPlaceholders v-if="isLoading">
        <BaseContentPlaceholdersText :lines="1" class="w-16 h-5" />
@ -204,14 +182,7 @@
      </BaseContentPlaceholders>
      <label
        v-else
-        class="
-          flex
-          items-center
-          justify-center
-          text-lg
-          uppercase
-          text-primary-400
-        "
+        class="flex items-center justify-center text-lg uppercase  text-primary-400"
      >
        <BaseFormatMoney :amount="store.getTotal" :currency="defaultCurrency" />
      </label>
@ -334,6 +305,7 @@ function selectPercentage() {

 function onSelectTax(selectedTax) {
  let amount = 0
+
  if (selectedTax.compound_tax && props.store.getSubtotalWithDiscount) {
    amount = Math.round(
      ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) *
--- a/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
+++ b/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
@ -143,7 +143,7 @@
          <template #activator>
            <img
              :src="previewAvatar"
-              class="block w-8 h-8 rounded md:h-9 md:w-9"
+              class="block w-8 h-8 rounded md:h-9 md:w-9 object-cover"
            />
          </template>

--- a/resources/scripts/admin/views/items/Create.vue
+++ b/resources/scripts/admin/views/items/Create.vue
@ -54,8 +54,6 @@
              label="name"
              :options="itemStore.itemUnits"
              value-prop="id"
-              :can-deselect="false"
-              :can-clear="false"
              :placeholder="$t('items.select_a_unit')"
              searchable
              track-by="name"
--- a/resources/scripts/locales/ar.json
+++ b/resources/scripts/locales/ar.json
@ -4,7 +4,7 @@
    "customers": "العملاء",
    "items": "بضائع/خدمات",
    "invoices": "الفواتير",
-    "recurring-invoices": "الفواتير المتكررة",
+    "recurring-invoices": "Recurring Invoices",
    "expenses": "النفقات",
    "estimates": "التقديرات",
    "payments": "الدفوعات",
@ -12,7 +12,7 @@
    "settings": "الإعدادات",
    "logout": "تسجيل الخروج",
    "users": "المستخدمون",
-    "modules": "الإضافات"
+    "modules": "Modules"
  },
  "general": {
    "add_company": "أضف شركة",
@ -29,9 +29,9 @@
    "to_date": "إلى تاريخ",
    "from": "من",
    "to": "إلى",
-    "ok": "حسناً",
-    "yes": "نعم",
-    "no": "لا",
+    "ok": "Ok",
+    "yes": "Yes",
+    "no": "No",
    "sort_by": "ترتيب حسب",
    "ascending": "تصاعدي",
    "descending": "تنازلي",
@ -39,7 +39,7 @@
    "body": "الجسم",
    "message": "رسالة",
    "send": "إرسال",
-    "preview": "معاينة",
+    "preview": "Preview",
    "go_back": "إلى الخلف",
    "back_to_login": "العودة إلى تسجيل الدخول؟",
    "home": "الرئيسية",
@ -65,7 +65,7 @@
    "sent": "ارسلت",
    "all": "الكل",
    "select_all": "تحديد الكل",
-    "select_template": "تحديد القالب",
+    "select_template": "Select Template",
    "choose_file": "اضغط هنا لاختيار ملف",
    "choose_template": "اختيار القالب",
    "choose": "اختر",
@ -93,14 +93,14 @@
    "no_note_found": "لم يتم العثور على الملاحظة",
    "insert_note": "أدخل ملاحظة",
    "copied_pdf_url_clipboard": "تم نسخ رابط PDF إلى الحافظة!",
-    "copied_url_clipboard": "تم نسخ الرابط إلى الحافظة!",
-    "docs": "المستندات",
-    "do_you_wish_to_continue": "هل ترغب في المتابعة؟",
-    "note": "ملاحظة",
-    "pay_invoice": "سدد الفاتورة",
-    "login_successfully": "تم تسجيل الدخول بنجاح!",
-    "logged_out_successfully": "تم تسجيل الخروج",
-    "mark_as_default": "تحديد كافتراضي"
+    "copied_url_clipboard": "Copied url to clipboard!",
+    "docs": "Docs",
+    "do_you_wish_to_continue": "Do you wish to continue?",
+    "note": "Note",
+    "pay_invoice": "Pay Invoice",
+    "login_successfully": "Logged in successfully!",
+    "logged_out_successfully": "Logged out successfully",
+    "mark_as_default": "Mark as default"
  },
  "dashboard": {
    "select_year": "اختر السنة",
@ -109,7 +109,7 @@
      "customers": "العملاء",
      "invoices": "الفواتير",
      "estimates": "التقديرات",
-      "payments": "المدفوعات"
+      "payments": "Payments"
    },
    "chart_info": {
      "total_sales": "المبيعات",
@ -151,27 +151,27 @@
    "no_results_found": "لم يتم العثور على نتائج"
  },
  "company_switcher": {
-    "label": "تبديل الشركة",
-    "no_results_found": "لا توجد نتائج",
-    "add_new_company": "إضافة شركة جديدة",
-    "new_company": "شركة جديدة",
-    "created_message": "تم إنشاء الشركة بنجاح"
+    "label": "SWITCH COMPANY",
+    "no_results_found": "No Results Found",
+    "add_new_company": "Add new company",
+    "new_company": "New company",
+    "created_message": "Company created successfully"
  },
  "dateRange": {
-    "today": "اليوم",
-    "this_week": "هذا الاسبوع",
-    "this_month": "هذا الشهر",
-    "this_quarter": "هذا الربع",
-    "this_year": "هذه السنة",
-    "previous_week": "الأسبوع السابق",
-    "previous_month": "الشهر الماضي",
-    "previous_quarter": "الربع السابق",
-    "previous_year": "السنة الماضية",
-    "custom": "مخصص"
+    "today": "Today",
+    "this_week": "This Week",
+    "this_month": "This Month",
+    "this_quarter": "This Quarter",
+    "this_year": "This Year",
+    "previous_week": "Previous Week",
+    "previous_month": "Previous Month",
+    "previous_quarter": "Previous Quarter",
+    "previous_year": "Previous Year",
+    "custom": "Custom"
  },
  "customers": {
    "title": "العملاء",
-    "prefix": "البادئة",
+    "prefix": "Prefix",
    "add_customer": "إضافة عميل",
    "contacts_list": "قائمة العملاء",
    "name": "الاسم",
@ -186,9 +186,9 @@
    "phone": "الهاتف",
    "website": "موقع الإنترنت",
    "overview": "استعراض",
-    "invoice_prefix": "بادئة الفاتورة",
-    "estimate_prefix": "بادئة رقم التقدير",
-    "payment_prefix": "بادئة رقم الدفعة",
+    "invoice_prefix": "Invoice Prefix",
+    "estimate_prefix": "Estimate Prefix",
+    "payment_prefix": "Payment Prefix",
    "enable_portal": "تفعيل البوابة",
    "country": "الدولة",
    "state": "الولاية/المنطقة",
@ -197,7 +197,7 @@
    "added_on": "أضيف في",
    "action": "إجراء",
    "password": "كلمة المرور",
-    "confirm_password": "تأكيد كلمة المرور",
+    "confirm_password": "Confirm Password",
    "street_number": "رقم الشارع",
    "primary_currency": "العملة الرئيسية",
    "description": "الوصف",
@ -208,10 +208,10 @@
    "new_customer": "عميل جديد",
    "edit_customer": "تعديل عميل",
    "basic_info": "معلوات أساسية",
-    "portal_access": "الوصول إلى بوابة العملاء",
-    "portal_access_text": "هل تريد السماح لهذا العميل بتسجيل الدخول إلى بوابة العملاء؟",
-    "portal_access_url": "رابط بوابة العملاء",
-    "portal_access_url_help": "يرجى نسخ وإعادة إرسال عنوان URL أعلاه إلى الزبون لتوفير الوصول.",
+    "portal_access": "Portal Access",
+    "portal_access_text": "Would you like to allow this customer to login to the Customer Portal?",
+    "portal_access_url": "Customer Portal Login URL",
+    "portal_access_url_help": "Please copy & forward the above given URL to your customer for providing access.",
    "billing_address": "عنوان الفوترة",
    "shipping_address": "عنوان الشحن",
    "copy_billing_address": "نسخ من عنوان الفوترة",
@ -231,9 +231,9 @@
    "confirm_delete": "لن تتمكن من استرداد هذا العميل وجميع الفواتير والتقديرات والمدفوعات ذات الصلة. | لن تتمكن من استرداد هؤلاء العملاء وجميع الفواتير والتقديرات والمدفوعات ذات الصلة.",
    "created_message": "تم إنشاء العملاء بنجاح",
    "updated_message": "تم تحديث العملاء بنجاح",
-    "address_updated_message": "تم تحديث العنوان بنجاح",
+    "address_updated_message": "Address Information Updated succesfully",
    "deleted_message": "تم حذف العملاء بنجاح | تم حذف العميل بنجاح",
-    "edit_currency_not_allowed": "لا يمكن تغيير العملة بمجرد إنشاء معاملة."
+    "edit_currency_not_allowed": "Cannot change currency once transactions created."
  },
  "items": {
    "title": "الأصناف",
@ -265,8 +265,8 @@
  },
  "estimates": {
    "title": "التقديرات",
-    "accept_estimate": "قبول التقدير",
-    "reject_estimate": "رفض التقدير",
+    "accept_estimate": "Accept Estimate",
+    "reject_estimate": "Reject Estimate",
    "estimate": "تقدير | تقديرات",
    "estimates_list": "قائمة التقديرات",
    "days": "{days} أيام",
@ -318,10 +318,10 @@
    },
    "accepted": "مقبول",
    "rejected": "مرفوض",
-    "expired": "انتهت مدة الصلاحية",
+    "expired": "Expired",
    "sent": "مرسل",
    "draft": "مسودة",
-    "viewed": "تمت المشاهدة",
+    "viewed": "Viewed",
    "declined": "مرفوض",
    "new_estimate": "تقدير جديد",
    "add_new_estimate": "إضافة تقدير جديد",
@ -355,14 +355,14 @@
      "select_an_item": "اكتب أو اختر الصنف",
      "type_item_description": "اكتب وصف الصنف (اختياري)"
    },
-    "mark_as_default_estimate_template_description": "في حالة التعفيل، سيتم اختيار القالب المحدد تلقائياً للتقديرات الجديدة."
+    "mark_as_default_estimate_template_description": "If enabled, the selected template will be automatically selected for new estimates."
  },
  "invoices": {
    "title": "الفواتير",
-    "download": "تحميل",
-    "pay_invoice": "سدد الفاتورة",
+    "download": "Download",
+    "pay_invoice": "Pay Invoice",
    "invoices_list": "قائمة الفواتير",
-    "invoice_information": "معلومات الفاتورة",
+    "invoice_information": "Invoice Information",
    "days": "{days} أيام",
    "months": "{months} أشهر",
    "years": "{years} سنوات",
@ -397,13 +397,13 @@
    "send_invoice": "إرسال الفاتورة",
    "resend_invoice": "إعادة إرسال الفاتورة",
    "invoice_template": "قالب الفاتورة",
-    "conversion_message": "تم استنساخ الفاتورة بنجاح",
+    "conversion_message": "Invoice cloned successful",
    "template": "قالب",
    "mark_as_sent": "تحديد كمرسل",
    "confirm_send_invoice": "سيتم إرسال هذه الفاتورة بالبريد الألكتروني إلى العميل",
    "invoice_mark_as_sent": "سيتم تحديد هذه الفاتورة كمرسلة",
-    "confirm_mark_as_accepted": "سيتم تحديد هذه الفاتورة كمقبولة",
-    "confirm_mark_as_rejected": "سيتم تحديد هذه الفاتورة كمرفوضة",
+    "confirm_mark_as_accepted": "This invoice will be marked as Accepted",
+    "confirm_mark_as_rejected": "This invoice will be marked as Rejected",
    "confirm_send": "سيتم إرسال هذه الفاتورة بالبريد الألكتروني إلى العميل",
    "invoice_date": "تاريخ الفاتورة",
    "record_payment": "تسجيل مدفوعات",
@ -415,13 +415,13 @@
    "update_invoice": "تحديث الفاتورة",
    "add_new_tax": "إضافة ضريبة جديدة",
    "no_invoices": "لا يوجد فواتير حتى الآن!",
-    "mark_as_rejected": "تحديد كمرفوض",
-    "mark_as_accepted": "تحديد كمقبول",
+    "mark_as_rejected": "Mark as rejected",
+    "mark_as_accepted": "Mark as accepted",
    "list_of_invoices": "قائمة الفواتير .",
    "select_invoice": "اختر الفاتورة",
    "no_matching_invoices": "لا يوجد فواتير مطابقة!",
    "mark_as_sent_successfully": "تم تحديد الفاتورة كمرسلة بنجاح",
-    "invoice_sent_successfully": "تم إرسال الفاتورة بنجاح",
+    "invoice_sent_successfully": "Invoice sent successfully",
    "cloned_successfully": "تم استنساخ الفاتورة بنجاح",
    "clone_invoice": "استنساخ الفاتورة",
    "confirm_clone": "سيتم استنساخ هذه الفاتورة في فاتورة جديدة",
@ -447,14 +447,14 @@
    "marked_as_sent_message": "تم إرسال الفاتورة بنجاح",
    "something_went_wrong": "خطأ غير معروف!",
    "invalid_due_amount_message": "المبلغ النهائي للفاتورة لا يمكن أن يكون أقل من المبلغ المطلوب لها. رجاءاً حدث الفاتورة أو قم بحذف المدفوعات المرتبطة بها للاستمرار.",
-    "mark_as_default_invoice_template_description": "في حالة التفعيل، سيتم اختيار القالب المحدد تلقائياً للفواتير الجديدة."
+    "mark_as_default_invoice_template_description": "If enabled, the selected template will be automatically selected for new invoices."
  },
  "recurring_invoices": {
-    "title": "الفواتير المتكررة",
-    "invoices_list": "الفواتير المتكررة",
-    "days": "{days} أيام",
-    "months": "{months} أشهر",
-    "years": "{years} سنوات",
+    "title": "Recurring Invoices",
+    "invoices_list": "Recurring Invoices List",
+    "days": "{days} Days",
+    "months": "{months} Month",
+    "years": "{years} Year",
    "all": "All",
    "paid": "Paid",
    "unpaid": "Unpaid",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "تقدير",
  "pdf_estimate_number": "رقم تقدير",
  "pdf_estimate_date": "تاريخ التقدير",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "تاريخ انتهاء الصلاحية",
  "pdf_invoice_label": "الفاتورة",
  "pdf_invoice_number": "رقم الفاتورة",
  "pdf_invoice_date": "تاريخ الفاتورة",
--- a/resources/scripts/locales/cs.json
+++ b/resources/scripts/locales/cs.json
@ -112,7 +112,7 @@
      "payments": "Platby"
    },
    "chart_info": {
-      "total_sales": "Prodeje",
+      "total_sales": "Slevy",
      "total_receipts": "Doklady",
      "total_expense": "Výdaje",
      "net_income": "Čistý příjem",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Odhad",
  "pdf_estimate_number": "Číslo odhadu",
  "pdf_estimate_date": "Datum odhadu",
-  "pdf_estimate_expire_date": "Datum expirace",
+  "pdf_estimate_expire_date": "Doba platnosti",
  "pdf_invoice_label": "Faktura",
  "pdf_invoice_number": "Číslo faktury",
  "pdf_invoice_date": "Datum fakturace",
@ -1495,7 +1495,7 @@
  "pdf_quantity_label": "Množství",
  "pdf_price_label": "Cena",
  "pdf_discount_label": "Sleva",
-  "pdf_amount_label": "Částka",
+  "pdf_amount_label": "Množství",
  "pdf_subtotal": "Mezisoučet",
  "pdf_total": "Celkem",
  "pdf_payment_label": "Platba",
--- a/resources/scripts/locales/de.json
+++ b/resources/scripts/locales/de.json
@ -688,7 +688,7 @@
    "other_modules": "Weitere Module",
    "view_all": "Alle Anzeigen",
    "no_reviews_found": "Für dieses Modul gibt es noch keine Bewertungen!",
-    "module_not_purchased": "Modul noch nicht erworben",
+    "module_not_purchased": "Module Not Purchased",
    "module_not_found": "Modul nicht gefunden",
    "version_not_supported": "This module version doesn't support the current version of Crater",
    "last_updated": "Zuletzt aktualisiert am",
@ -1113,7 +1113,7 @@
      "default_currency_error": "Diese Währung wird bereits in einem der aktiven Anbieter verwendet",
      "exchange_help_text": "Wechselkurs eingeben um von {currency} nach {baseCurrency} zu konvertieren",
      "currency_freak": "CurrencyFreaks",
-      "currency_layer": "Währungsebene",
+      "currency_layer": "Currency Layer",
      "open_exchange_rate": "Open Exchange Rate",
      "currency_converter": "Währungsumrechner",
      "server": "Server",
@ -1150,8 +1150,8 @@
      "payment_mode_added": "Zahlungsart hinzugefügt",
      "payment_mode_updated": "Zahlungsart aktualisiert",
      "payment_mode_confirm_delete": "Sie werden diese Zahlungsart nicht wiederherstellen können",
-      "payments_attached": "Diese Zahlungsmethode ist bereits mit Zahlungen verknüpft. Bitte löschen Sie die angehängten Zahlungen, um mit der Löschung fortzufahren.",
-      "expenses_attached": "Diese Zahlungsmethode ist bereits mit Ausgaben verknüpft. Bitte löschen Sie die angehängten Ausgaben, um mit der Löschung fortzufahren.",
+      "payments_attached": "This payment method is already attached to payments. Please delete the attached payments to proceed with deletion.",
+      "expenses_attached": "This payment method is already attached to expenses. Please delete the attached expenses to proceed with deletion.",
      "deleted_message": "Zahlungsart erfolgreich gelöscht"
    },
    "expense_category": {
@ -1179,7 +1179,7 @@
      "discount_per_item": "Rabatt pro Artikel ",
      "discount_setting_description": "Aktivieren Sie diese Option, wenn Sie einzelnen Rechnungspositionen einen Rabatt hinzufügen möchten. Standardmäßig wird der Rabatt direkt zur Rechnung hinzugefügt.",
      "expire_public_links": "Öffentliche Links automatisch ablaufen lassen",
-      "expire_setting_description": "Geben Sie an, ob Sie alle von der Anwendung gesendeten Links zur Ansicht von Rechnungen, Kostenvoranschlägen und Zahlungen usw. nach einer bestimmten Zeit ablaufen lassen möchten.",
+      "expire_setting_description": "Specify whether you would like to expire all the links sent by application to view invoices, estimates & payments, etc after a specified duration.",
      "save": "Speichern",
      "preference": "Präferenz | Präferenzen",
      "general_settings": "Standardeinstellungen für das System.",
@ -1272,14 +1272,14 @@
      "do_spaces_secret": "Do Spaces Secret",
      "do_spaces_region": "Do Spaced Region",
      "do_spaces_bucket": "Do Spaces Bucket",
-      "do_spaces_endpoint": "Do Spaces Endpunkt",
+      "do_spaces_endpoint": "Do Spaces Endpoint",
      "do_spaces_root": "Do Spaced Root",
      "dropbox_type": "Dropbox Typ",
      "dropbox_token": "Dropbox Token",
      "dropbox_key": "Dropbox Schlüssel",
      "dropbox_secret": "Dropbox Secret",
      "dropbox_app": "Dropbox App",
-      "dropbox_root": "Dropbox Root Verzeichnis",
+      "dropbox_root": "Dropbox Root",
      "default_driver": "Standard-Treiber",
      "is_default": "Standard",
      "set_default_disk": "Als Standard festlegen",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Angebot",
  "pdf_estimate_number": "Angebotsnummer",
  "pdf_estimate_date": "Angebotsdatum",
-  "pdf_estimate_expire_date": "Zahlungsziel",
+  "pdf_estimate_expire_date": "Gültig bis",
  "pdf_invoice_label": "Rechnung",
  "pdf_invoice_number": "Rechnungsnummer",
  "pdf_invoice_date": "Rechnungsdatum",
--- a/resources/scripts/locales/el.json
+++ b/resources/scripts/locales/el.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Εκτίμηση",
  "pdf_estimate_number": "Εκτίμηση Αριθμού",
  "pdf_estimate_date": "Εκτιμώμενη ημ. επισκευής",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Ημερομηνία λήξης",
  "pdf_invoice_label": "Τιμολόγιο",
  "pdf_invoice_number": "Αριθμός τιμολογίου",
  "pdf_invoice_date": "Ημ/νία Τιμολόγησης",
--- a/resources/scripts/locales/es.json
+++ b/resources/scripts/locales/es.json
@ -1,6 +1,6 @@
 {
  "navigation": {
-    "dashboard": "Panel de Control",
+    "dashboard": "Tablero",
    "customers": "Clientes",
    "items": "Artículos",
    "invoices": "Facturas",
@ -9,7 +9,7 @@
    "estimates": "Presupuestos",
    "payments": "Pagos",
    "reports": "Informes",
-    "settings": "Configuración",
+    "settings": "Ajustes",
    "logout": "Cerrar sesión",
    "users": "Usuarios",
    "modules": "Módulos"
@ -47,7 +47,7 @@
    "delete": "Eliminar",
    "edit": "Editar",
    "view": "Ver",
-    "add_new_item": "Agregar Nuevo Artículo",
+    "add_new_item": "Agregar ítem nuevo",
    "clear_all": "Limpiar todo",
    "showing": "Mostrar",
    "of": "de",
@ -87,7 +87,7 @@
    "select_city": "Seleccionar ciudad",
    "street_1": "Calle 1",
    "street_2": "Calle 2",
-    "action_failed": "Acción Fallida",
+    "action_failed": "Accion Fallida",
    "retry": "Procesar de nuevo",
    "choose_note": "Elegir nota",
    "no_note_found": "No se encontró ninguna nota",
@ -98,7 +98,7 @@
    "do_you_wish_to_continue": "¿Deseas continuar?",
    "note": "Nota",
    "pay_invoice": "Pagar factura",
-    "login_successfully": "¡Sesión inciada con éxito!",
+    "login_successfully": "Logeado Satisfactoriamente!",
    "logged_out_successfully": "Logeado Satisfactoriamente",
    "mark_as_default": "Marcar como predeterminado"
  },
@ -113,7 +113,7 @@
    },
    "chart_info": {
      "total_sales": "Ventas",
-      "total_receipts": "Recibos",
+      "total_receipts": "Ingresos",
      "total_expense": "Gastos",
      "net_income": "Ingresos netos",
      "year": "Seleccione año"
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Presupuestar",
  "pdf_estimate_number": "Número de Presupuesto",
  "pdf_estimate_date": "Fecha presupuesto",
-  "pdf_estimate_expire_date": "Fecha de vencimiento",
+  "pdf_estimate_expire_date": "Fecha de caducidad",
  "pdf_invoice_label": "Factura",
  "pdf_invoice_number": "Numero de factura",
  "pdf_invoice_date": "Fecha de la factura",
--- a/resources/scripts/locales/fa.json
+++ b/resources/scripts/locales/fa.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Estimate",
  "pdf_estimate_number": "Estimate Number",
  "pdf_estimate_date": "Estimate Date",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Expiry date",
  "pdf_invoice_label": "Invoice",
  "pdf_invoice_number": "Invoice Number",
  "pdf_invoice_date": "Invoice Date",
--- a/resources/scripts/locales/fi.json
+++ b/resources/scripts/locales/fi.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Tarjous",
  "pdf_estimate_number": "Tarjousnumero",
  "pdf_estimate_date": "Tarjouksen päiväys",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Voimassaolo päivä",
  "pdf_invoice_label": "Lasku",
  "pdf_invoice_number": "Laskunumero",
  "pdf_invoice_date": "Laskun päiväys",
--- a/resources/scripts/locales/fr.json
+++ b/resources/scripts/locales/fr.json
@ -310,7 +310,7 @@
    "confirm_mark_as_sent": "Ce devis sera marqué comme envoyé",
    "confirm_mark_as_accepted": "Ce devis sera marqué comme accepté",
    "confirm_mark_as_rejected": "Ce devis sera marqué comme rejeté",
-    "no_matching_estimates": "Aucun devis correspondant !",
+    "no_matching_estimates": "Aucune estimation correspondante !",
    "mark_as_sent_successfully": "Devis marqué comme envoyé",
    "send_estimate_successfully": "Devis envoyé",
    "errors": {
@ -355,7 +355,7 @@
      "select_an_item": "Sélectionnez un article",
      "type_item_description": "Taper la description de l'article (facultatif)"
    },
-    "mark_as_default_estimate_template_description": "Si activé, le modèle sélectionné sera automatiquement utilisé pour les nouvelles estimations."
+    "mark_as_default_estimate_template_description": "If enabled, the selected template will be automatically selected for new estimates."
  },
  "invoices": {
    "title": "Factures",
@ -447,7 +447,7 @@
    "marked_as_sent_message": "Facture supprimée | Factures supprimées",
    "something_went_wrong": "quelque chose a mal tourné",
    "invalid_due_amount_message": "Le paiement entré est supérieur au montant total dû pour cette facture. Veuillez vérifier et réessayer.",
-    "mark_as_default_invoice_template_description": "Si activé, le modèle sélectionné sera automatiquement utilisé pour les nouvelles factures."
+    "mark_as_default_invoice_template_description": "If enabled, the selected template will be automatically selected for new invoices."
  },
  "recurring_invoices": {
    "title": "Factures récurrentes",
@ -526,7 +526,7 @@
    "cloned_successfully": "Facture récurrente clonée",
    "clone_invoice": "Dupliquer",
    "confirm_clone": "Cette facture récurrente sera clonée dans une nouvelle facture récurrente",
-    "add_customer_email": "Veuillez ajouter une adresse e-mail pour ce client afin d'envoyer les factures automatiquement.",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
    "item": {
      "title": "Nom",
      "description": "Description",
@ -844,9 +844,9 @@
      "secret": "Secret",
      "mailgun_secret": "Secret Mailgun",
      "mailgun_domain": "Domaine",
-      "mailgun_endpoint": "Endpoint de Mailgun",
-      "ses_secret": "Clé secrète SES",
-      "ses_key": "Clé SES",
+      "mailgun_endpoint": "Mailgun Endpoint",
+      "ses_secret": "SES Secret",
+      "ses_key": "SES Key",
      "password": "Mot de passe",
      "username": "Nom d'utilisateur",
      "mail_config": "Envoi d'emails",
@ -1112,10 +1112,10 @@
      "error": "Vous ne pouvez pas supprimer le fournisseur actif",
      "default_currency_error": "Cette devise est déjà affectée à un fournisseur",
      "exchange_help_text": "Veuillez entrer le taux de change pour convertir {currency} en {baseCurrency}",
-      "currency_freak": "Currency Freaks",
+      "currency_freak": "Currency Freak",
      "currency_layer": "Currency Layer",
-      "open_exchange_rate": "Ouvrir le taux de change",
-      "currency_converter": "Convertisseur de devises",
+      "open_exchange_rate": "Open Exchange Rate",
+      "currency_converter": "Currency Converter",
      "server": "Serveur",
      "url": "URL",
      "active": "Actif",
@ -1150,8 +1150,8 @@
      "payment_mode_added": "Mode de paiement ajouté",
      "payment_mode_updated": "Mode de paiement mis à jour",
      "payment_mode_confirm_delete": "Vous ne pourrez pas récupérer ce mode de paiement",
-      "payments_attached": "Ce moyen de paiement est déjà utilisé par des paiements. Merci de supprimer les paiements associés avant de procéder à la suppression.",
-      "expenses_attached": "Ce moyen de paiement est déjà utilisé par des dépenses. Merci de supprimer les dépenses associés avant de procéder à la suppression.",
+      "payments_attached": "This payment method is already attached to payments. Please delete the attached payments to proceed with deletion.",
+      "expenses_attached": "This payment method is already attached to expenses. Please delete the attached expenses to proceed with deletion.",
      "deleted_message": "Mode de paiement supprimé"
    },
    "expense_category": {
@ -1262,8 +1262,8 @@
      "media_driver": "Stockage multimédia",
      "media_root": "Répertoire média",
      "aws_driver": "AWS",
-      "aws_key": "Clé AWS",
-      "aws_secret": "Clé secrète AWS",
+      "aws_key": "AWS Key",
+      "aws_secret": "AWS Secret",
      "aws_region": "Région AWS",
      "aws_bucket": "Bucket",
      "aws_root": "Répertoire",
@ -1491,7 +1491,7 @@
  "pdf_invoice_date": "Date",
  "pdf_invoice_due_date": "Date d’échéance",
  "pdf_notes": "Notes de bas de page",
-  "pdf_items_label": "Désignation",
+  "pdf_items_label": "Articles",
  "pdf_quantity_label": "Quantité",
  "pdf_price_label": "Prix",
  "pdf_discount_label": "Remise",
--- a/resources/scripts/locales/hi.json
+++ b/resources/scripts/locales/hi.json
@ -510,11 +510,11 @@
    "update_expense": "Update Expense",
    "edit_invoice": "Edit Recurring Invoice",
    "new_invoice": "New Recurring Invoice",
-    "send_automatically": "अटोमेटिक",
+    "send_automatically": "Send Automatically",
    "send_automatically_desc": "Enable this, if you would like to send the invoice automatically to the customer when its created.",
    "save_invoice": "Save Recurring Invoice",
    "update_invoice": "Update Recurring Invoice",
-    "add_new_tax": "नवी कर",
+    "add_new_tax": "Add New Tax",
    "no_invoices": "No Recurring Invoices yet!",
    "mark_as_rejected": "Mark as rejected",
    "mark_as_accepted": "Mark as accepted",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Estimate",
  "pdf_estimate_number": "Estimate Number",
  "pdf_estimate_date": "Estimate Date",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Expiry date",
  "pdf_invoice_label": "Invoice",
  "pdf_invoice_number": "Invoice Number",
  "pdf_invoice_date": "Invoice Date",
--- a/resources/scripts/locales/hr.json
+++ b/resources/scripts/locales/hr.json
@ -4,7 +4,7 @@
    "customers": "Klijenti",
    "items": "Stavke",
    "invoices": "Fakture",
-    "recurring-invoices": "Ponavljajuće fakture\n",
+    "recurring-invoices": "Recurring Invoices",
    "expenses": "Rashodi",
    "estimates": "Ponude",
    "payments": "Uplate",
@ -12,7 +12,7 @@
    "settings": "Postavke",
    "logout": "Odjava",
    "users": "Korisnici",
-    "modules": "Moduli"
+    "modules": "Modules"
  },
  "general": {
    "add_company": "Dodaj tvrtku",
@ -30,8 +30,8 @@
    "from": "Pošiljatelj",
    "to": "Primatelj",
    "ok": "Ok",
-    "yes": "Da",
-    "no": "Ne",
+    "yes": "Yes",
+    "no": "No",
    "sort_by": "Posloži Po",
    "ascending": "Rastuće",
    "descending": "Padajuće",
@ -39,7 +39,7 @@
    "body": "Tijelo",
    "message": "Poruka",
    "send": "Pošalji",
-    "preview": "Pregled",
+    "preview": "Preview",
    "go_back": "Natrag",
    "back_to_login": "Natrag na prijavu?",
    "home": "Početna",
@ -65,7 +65,7 @@
    "sent": "Poslano",
    "all": "Sve",
    "select_all": "Izaberi sve",
-    "select_template": "Odaberite predložak",
+    "select_template": "Select Template",
    "choose_file": "Klikni ovdje da izabereš fajl",
    "choose_template": "Izaberi predložak",
    "choose": "Izaberi",
@ -93,13 +93,13 @@
    "no_note_found": "Ne postoje spremljene napomene",
    "insert_note": "Unesi bilješku",
    "copied_pdf_url_clipboard": "Link do PDF fajla kopiran!",
-    "copied_url_clipboard": "URL je kopiran u međuspremnik!",
-    "docs": "Dokumenti",
-    "do_you_wish_to_continue": "Želite li nastaviti?",
-    "note": "Bilješka",
-    "pay_invoice": "Plati račun",
-    "login_successfully": "Uspješno ste prijavljeni!\n",
-    "logged_out_successfully": "Uspješno odjavljen\n",
+    "copied_url_clipboard": "Copied url to clipboard!",
+    "docs": "Docs",
+    "do_you_wish_to_continue": "Do you wish to continue?",
+    "note": "Note",
+    "pay_invoice": "Pay Invoice",
+    "login_successfully": "Logged in successfully!",
+    "logged_out_successfully": "Logged out successfully",
    "mark_as_default": "Postavi kao zadano"
  },
  "dashboard": {
@ -109,7 +109,7 @@
      "customers": "Klijenti",
      "invoices": "Računi",
      "estimates": "Ponude",
-      "payments": "Plaćanja"
+      "payments": "Payments"
    },
    "chart_info": {
      "total_sales": "Prodaja",
@ -151,18 +151,18 @@
    "no_results_found": "Nema rezultata"
  },
  "company_switcher": {
-    "label": "IZABERI TVRTKU",
-    "no_results_found": "Nema rezultata\n",
-    "add_new_company": "Dodajte novu tvrtku\n",
-    "new_company": "Nova tvrtka\n",
-    "created_message": "Tvrtka uspješno stvorena\n"
+    "label": "SWITCH COMPANY",
+    "no_results_found": "No Results Found",
+    "add_new_company": "Add new company",
+    "new_company": "New company",
+    "created_message": "Company created successfully"
  },
  "dateRange": {
-    "today": "Danas\n",
-    "this_week": "Danas\n",
-    "this_month": "Danas\n",
-    "this_quarter": "Danas\n",
-    "this_year": "Danas\n",
+    "today": "Today",
+    "this_week": "This Week",
+    "this_month": "This Month",
+    "this_quarter": "This Quarter",
+    "this_year": "This Year",
    "previous_week": "Previous Week",
    "previous_month": "Previous Month",
    "previous_quarter": "Previous Quarter",
@ -456,32 +456,32 @@
    "months": "{months} Month",
    "years": "{years} Year",
    "all": "All",
-    "paid": "Plaćeno",
-    "unpaid": "Ne plaćeno",
-    "viewed": "Pregledano",
-    "overdue": "Kašnjenja",
-    "active": "Aktivno",
-    "completed": "Završeno",
-    "customer": "KUPAC",
-    "paid_status": "STATUS PLAĆANJA",
-    "ref_no": "BR. REFERENCE",
-    "number": "BROJ",
+    "paid": "Paid",
+    "unpaid": "Unpaid",
+    "viewed": "Viewed",
+    "overdue": "Overdue",
+    "active": "Active",
+    "completed": "Completed",
+    "customer": "CUSTOMER",
+    "paid_status": "PAID STATUS",
+    "ref_no": "REF NO.",
+    "number": "NUMBER",
    "amount_due": "AMOUNT DUE",
-    "partially_paid": "Djelomično plaćeno\n",
-    "total": "Ukupno",
-    "discount": "Popust",
-    "sub_total": "Popdzbroj",
-    "invoice": "Ponavljajuća faktura | Ponavjaljuća faktura",
-    "invoice_number": "Broj ponavljajuće fakture\n",
-    "next_invoice_date": "Datum sljedećeg računa",
-    "ref_number": "Broj reference",
-    "contact": "Kontakt",
-    "add_item": "Dodaj stavku",
-    "date": "Datum",
-    "limit_by": "Ograniči po",
-    "limit_date": "Vremenski rok",
-    "limit_count": "Broj ograničenja\n",
-    "count": "Brojač",
+    "partially_paid": "Partially Paid",
+    "total": "Total",
+    "discount": "Discount",
+    "sub_total": "Sub Total",
+    "invoice": "Recurring Invoice | Recurring Invoices",
+    "invoice_number": "Recurring Invoice Number",
+    "next_invoice_date": "Next Invoice Date",
+    "ref_number": "Ref Number",
+    "contact": "Contact",
+    "add_item": "Add an Item",
+    "date": "Date",
+    "limit_by": "Limit by",
+    "limit_date": "Limit Date",
+    "limit_count": "Limit Count",
+    "count": "Count",
    "status": "Status",
    "select_a_status": "Select a status",
    "working": "Working",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Ponuda",
  "pdf_estimate_number": "Broj Ponude",
  "pdf_estimate_date": "Datum Ponude",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Datum isteka Ponude",
  "pdf_invoice_label": "Faktura",
  "pdf_invoice_number": "Broj Fakture",
  "pdf_invoice_date": "Datum Fakture",
--- a/resources/scripts/locales/id.json
+++ b/resources/scripts/locales/id.json
--- a/resources/scripts/locales/it.json
+++ b/resources/scripts/locales/it.json
@ -54,9 +54,9 @@
    "actions": "Azioni",
    "subtotal": "SUBTOTALE",
    "discount": "SCONTO",
-    "fixed": "Fisso",
+    "fixed": "Fissato",
    "percentage": "Percentuale",
-    "tax": "IMPOSTA",
+    "tax": "TASSA",
    "total_amount": "AMMONTARE TOTALE",
    "bill_to": "Fattura a",
    "ship_to": "Invia a",
--- a/resources/scripts/locales/ja.json
+++ b/resources/scripts/locales/ja.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Estimate",
  "pdf_estimate_number": "Estimate Number",
  "pdf_estimate_date": "Estimate Date",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Expiry date",
  "pdf_invoice_label": "Invoice",
  "pdf_invoice_number": "Invoice Number",
  "pdf_invoice_date": "Invoice Date",
--- a/resources/scripts/locales/locales.js
+++ b/resources/scripts/locales/locales.js
@ -17,6 +17,7 @@ import sk from './sk.json'
 import vi from './vi.json'
 import el from './el.json'
 import hr from './hr.json'
+import th from './th.json'

 export default {
  cs,
@ -37,5 +38,6 @@ export default {
  vi,
  pl,
  el,
-  hr
+  hr,
+  th
 }
--- a/resources/scripts/locales/lt.json
+++ b/resources/scripts/locales/lt.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Pasiūlymas",
  "pdf_estimate_number": "Pasiūlymo numeris",
  "pdf_estimate_date": "Pasiūlymo data",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Galiojimo laikas",
  "pdf_invoice_label": "Sąskaita",
  "pdf_invoice_number": "Invoice Number",
  "pdf_invoice_date": "Invoice Date",
--- a/resources/scripts/locales/lv.json
+++ b/resources/scripts/locales/lv.json
--- a/resources/scripts/locales/nl.json
+++ b/resources/scripts/locales/nl.json
@ -4,7 +4,7 @@
    "customers": "Klanten",
    "items": "Artikelen",
    "invoices": "Facturen",
-    "recurring-invoices": "Periodieke facturen",
+    "recurring-invoices": "Periodieke factuur",
    "expenses": "Uitgaven",
    "estimates": "Offertes",
    "payments": "Betalingen",
@ -28,16 +28,16 @@
    "from_date": "Vanaf datum",
    "to_date": "T/m datum",
    "from": "Vanaf",
-    "to": "Naar",
-    "ok": "Oké",
-    "yes": "Ja",
-    "no": "Nee",
+    "to": "Naar.",
+    "ok": "Oké.",
+    "yes": "Ja.",
+    "no": "Nee.",
    "sort_by": "Sorteer op",
    "ascending": "Oplopend",
    "descending": "Aflopend",
    "subject": "Onderwerp",
    "body": "Inhoud",
-    "message": "Bericht",
+    "message": "Bericht.",
    "send": "Verstuur",
    "preview": "Voorbeeld",
    "go_back": "Ga terug",
@ -54,7 +54,7 @@
    "actions": "Acties",
    "subtotal": "SUBTOTAAL",
    "discount": "KORTING",
-    "fixed": "Vast bedrag",
+    "fixed": "Gemaakt",
    "percentage": "Percentage",
    "tax": "BELASTING",
    "total_amount": "TOTAALBEDRAG",
@ -85,17 +85,17 @@
    "select_state": "Selecteer staat",
    "select_country": "Selecteer land",
    "select_city": "Selecteer stad",
-    "street_1": "Straat 1",
-    "street_2": "Straat 2",
-    "action_failed": "Actie mislukt",
-    "retry": "Opnieuw proberen",
+    "street_1": "straat 1",
+    "street_2": "Straat # 2",
+    "action_failed": "Actie: mislukt",
+    "retry": "Retr",
    "choose_note": "Kies notitie",
    "no_note_found": "Geen notitie gevonden",
    "insert_note": "Notitie invoegen",
    "copied_pdf_url_clipboard": "PDF link naar klembord gekopieerd!",
    "copied_url_clipboard": "URL naar klembord gekopieerd!",
-    "docs": "Documentatie",
-    "do_you_wish_to_continue": "Wil je doorgaan?",
+    "docs": "Documenten",
+    "do_you_wish_to_continue": "Wilt u Doorgaan?",
    "note": "Notitie",
    "pay_invoice": "Betaal factuur",
    "login_successfully": "Succesvol ingelogd!",
@ -526,7 +526,7 @@
    "cloned_successfully": "Terugkerende factuur succesvol gekopieerd",
    "clone_invoice": "Kopieer periodieke factuur",
    "confirm_clone": "Deze periodieke factuur wordt gekopieerd naar een nieuwe periodieke factuur",
-    "add_customer_email": "Voeg een e-mailadres aan deze klant toe zodat facturen automatisch verzonden kunnen worden.",
+    "add_customer_email": "Voeg een e-mailadres aan deze klant toe, zodat facturen automatisch verzonden kunnen worden.",
    "item": {
      "title": "Item titel",
      "description": "Beschrijving",
@ -1114,13 +1114,13 @@
      "exchange_help_text": "Voer de wisselkoers in om te converteren van {currency} naar {baseCurrency}",
      "currency_freak": "Valuta Freak",
      "currency_layer": "Valuta-laag",
-      "open_exchange_rate": "Open wisselkoers",
+      "open_exchange_rate": "Open Exchange Rate",
      "currency_converter": "Valuta omzetter",
      "server": "Server",
      "url": "URL",
      "active": "Actief",
-      "currency_help_text": "Deze aanbieder wordt alleen gebruikt voor de hier boven geselecteerde valuta",
-      "currency_in_used": "De volgende valuta zijn al actief bij een andere aanbieder. Verwijder deze valuta uit de selectie om deze aanbieder opnieuw te activeren."
+      "currency_help_text": "This provider will only be used on above selected currencies",
+      "currency_in_used": "The following currencies are already active on another provider. Please remove these currencies from selection to activate this provider again."
    },
    "tax_types": {
      "title": "Belastingtypen",
@ -1143,16 +1143,16 @@
    },
    "payment_modes": {
      "title": "Betaalmethodes",
-      "description": "Modi van transacties voor betalingen",
-      "add_payment_mode": "Voeg betaalwijze toe",
-      "edit_payment_mode": "Wijzig betaalwijze",
-      "mode_name": "Modusnaam",
+      "description": "Modes of transaction for payments",
+      "add_payment_mode": "Add Payment Mode",
+      "edit_payment_mode": "Edit Payment Mode",
+      "mode_name": "Mode Name",
      "payment_mode_added": "Betaalwijze toegevoegd",
-      "payment_mode_updated": "Betaalwijze bijgewerkt",
-      "payment_mode_confirm_delete": "U kunt deze betalingsmodus niet herstellen",
-      "payments_attached": "Deze betalingsmethode is al gekoppeld aan betalingen. Verwijder de gekoppelde betalingen om verder te gaan met het verwijderen.",
-      "expenses_attached": "Deze betaalmethode is al gekoppeld aan uitgaven. Verwijder de gekoppelde kosten om door te gaan met het verwijderen.",
-      "deleted_message": "Betaalwijze succesvol verwijderd"
+      "payment_mode_updated": "Payment Mode Updated",
+      "payment_mode_confirm_delete": "You will not be able to recover this Payment Mode",
+      "payments_attached": "This payment method is already attached to payments. Please delete the attached payments to proceed with deletion.",
+      "expenses_attached": "This payment method is already attached to expenses. Please delete the attached expenses to proceed with deletion.",
+      "deleted_message": "Payment Mode deleted successfully"
    },
    "expense_category": {
      "title": "Onkostencategorieën",
@ -1178,8 +1178,8 @@
      "discount_setting": "Kortingsinstelling",
      "discount_per_item": "Korting per item",
      "discount_setting_description": "Schakel dit in als u korting wilt toevoegen aan afzonderlijke factuuritems. Standaard wordt korting rechtstreeks aan de factuur toegevoegd.",
-      "expire_public_links": "Publieke links automatisch laten vervallen",
-      "expire_setting_description": "Geef aan of je alle links die eerder zijn verstuurd door de applicatie om facturen, offertes en betalingen te bekijken wilt laten verlopen na een bepaalde duur.",
+      "expire_public_links": "Automatically Expire Public Links",
+      "expire_setting_description": "Specify whether you would like to expire all the links sent by application to view invoices, estimates & payments, etc after a specified duration.",
      "save": "Opslaan",
      "preference": "Voorkeur | Voorkeuren",
      "general_settings": "Standaardvoorkeuren voor het systeem.",
@ -1188,9 +1188,9 @@
      "select_time_zone": "Selecteer Tijdzone",
      "select_date_format": "Selecteer datum/tijdindeling",
      "select_financial_year": "Selecteer financieel ja",
-      "recurring_invoice_status": "Status periodieke facturen",
-      "create_status": "Status aanmaken",
-      "active": "Actief",
+      "recurring_invoice_status": "Recurring Invoice Status",
+      "create_status": "Create Status",
+      "active": "Active",
      "on_hold": "In wacht",
      "update_status": "Updatestatus",
      "completed": "Voltooid",
@ -1217,10 +1217,10 @@
      "finishing_update": "Afwerking Update",
      "update_failed": "Update mislukt",
      "update_failed_text": "Sorry! Je update is mislukt op: {step} step ",
-      "update_warning": "Alle applicatiebestanden en de standaard sjabloonbestanden worden overschreven wanneer u de applicatie met behulp van dit hulpprogramma bijwerkt. Maak een reservekopie van uw sjablonen en database voordat u deze bijwerkt."
+      "update_warning": "All of the application files and default template files will be overwritten when you update the application using this utility. Please take a backup of your templates & database before updating."
    },
    "backup": {
-      "title": "Back-up | Back-ups",
+      "title": "Backup | Backups",
      "description": "De back-up is een zipfile met alle bestanden in de mappen die je opgeeft samen met een dump van je database",
      "new_backup": "Nieuwe back-up",
      "create_backup": "Backup maken",
--- a/resources/scripts/locales/pl.json
+++ b/resources/scripts/locales/pl.json
@ -2,7 +2,7 @@
  "navigation": {
    "dashboard": "Pulpit",
    "customers": "Kontrahenci",
-    "items": "Produkty",
+    "items": "Pozycje",
    "invoices": "Faktury",
    "recurring-invoices": "Faktury cykliczne",
    "expenses": "Wydatki",
@ -100,7 +100,7 @@
    "pay_invoice": "Zapłać Fakturę",
    "login_successfully": "Zalogowano pomyślnie!",
    "logged_out_successfully": "Wylogowano pomyślnie",
-    "mark_as_default": "Oznacz jako domyślne"
+    "mark_as_default": "Mark as default"
  },
  "dashboard": {
    "select_year": "Wybierz rok",
@ -355,7 +355,7 @@
      "select_an_item": "Wpisz lub kliknij aby wybrać element",
      "type_item_description": "Opis pozycji (opcjonalnie)"
    },
-    "mark_as_default_estimate_template_description": "Jeśli włączone, wybrany szablon zostanie automatycznie wybrany dla nowych ofert."
+    "mark_as_default_estimate_template_description": "If enabled, the selected template will be automatically selected for new estimates."
  },
  "invoices": {
    "title": "Faktury",
@ -447,7 +447,7 @@
    "marked_as_sent_message": "Faktura oznaczona jako wysłana pomyślnie",
    "something_went_wrong": "coś poszło nie tak",
    "invalid_due_amount_message": "Całkowita kwota faktury nie może być mniejsza niż całkowita kwota zapłacona za tę fakturę. Proszę zaktualizować fakturę lub usunąć powiązane płatności, aby kontynuować.",
-    "mark_as_default_invoice_template_description": "Jeśli włączone, wybrany szablon zostanie automatycznie wybrany dla nowych faktur."
+    "mark_as_default_invoice_template_description": "If enabled, the selected template will be automatically selected for new invoices."
  },
  "recurring_invoices": {
    "title": "Faktury cykliczne",
@ -526,7 +526,7 @@
    "cloned_successfully": "Faktura Cykliczna sklonowana pomyślnie",
    "clone_invoice": "Klonuj Fakturę Cykliczną",
    "confirm_clone": "Ta faktura cykliczna zostanie sklonowana do nowej faktury cyklicznej",
-    "add_customer_email": "Dodaj adres e-mail dla tego klienta, aby wysyłać faktury automatycznie.",
+    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
    "item": {
      "title": "Tytuł pozycji",
      "description": "Opis",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Oferta",
  "pdf_estimate_number": "Numer oferty",
  "pdf_estimate_date": "Data oferty",
-  "pdf_estimate_expire_date": "Data ważności",
+  "pdf_estimate_expire_date": "Termin ważności",
  "pdf_invoice_label": "Faktura",
  "pdf_invoice_number": "Numer faktury",
  "pdf_invoice_date": "Data faktury",
--- a/resources/scripts/locales/pt.json
+++ b/resources/scripts/locales/pt.json
--- a/resources/scripts/locales/ro.json
+++ b/resources/scripts/locales/ro.json
@ -97,8 +97,8 @@
    "docs": "Documentație",
    "do_you_wish_to_continue": "Doriţi să continuaţi?",
    "note": "Note",
-    "pay_invoice": "Plătește factura",
-    "login_successfully": "Autentificat cu succes!",
+    "pay_invoice": "Pay Invoice",
+    "login_successfully": "Logged in successfully!",
    "logged_out_successfully": "Logged out successfully",
    "mark_as_default": "Mark as default"
  },
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Estimate",
  "pdf_estimate_number": "Estimate Number",
  "pdf_estimate_date": "Estimate Date",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Expiry date",
  "pdf_invoice_label": "Invoice",
  "pdf_invoice_number": "Invoice Number",
  "pdf_invoice_date": "Invoice Date",
--- a/resources/scripts/locales/ru.json
+++ b/resources/scripts/locales/ru.json
--- a/resources/scripts/locales/sk.json
+++ b/resources/scripts/locales/sk.json
@ -4,7 +4,7 @@
    "customers": "Zákazníci",
    "items": "Položky",
    "invoices": "Faktúry",
-    "recurring-invoices": "Pravidelné faktúry",
+    "recurring-invoices": "Recurring Invoices",
    "expenses": "Výdaje",
    "estimates": "Cenové odhady",
    "payments": "Platby",
@ -12,7 +12,7 @@
    "settings": "Nastavenia",
    "logout": "Odhlásiť sa",
    "users": "Uživatelia",
-    "modules": "Moduly"
+    "modules": "Modules"
  },
  "general": {
    "add_company": "Pridať firmu",
@ -30,8 +30,8 @@
    "from": "Od",
    "to": "Pre",
    "ok": "Ok",
-    "yes": "Áno",
-    "no": "Nie",
+    "yes": "Yes",
+    "no": "No",
    "sort_by": "Zoradiť podľa",
    "ascending": "Vzostupne",
    "descending": "Zostupne",
@ -39,7 +39,7 @@
    "body": "Telo textu",
    "message": "Správa",
    "send": "Odoslať",
-    "preview": "Náhľad",
+    "preview": "Preview",
    "go_back": "Späť",
    "back_to_login": "Späť na prihlásenie?",
    "home": "Domov",
@ -65,7 +65,7 @@
    "sent": "Odoslané",
    "all": "Všetko",
    "select_all": "Vybrať všetky",
-    "select_template": "Vyberte šablónu",
+    "select_template": "Select Template",
    "choose_file": "Kliknite sem pre vybratie súboru",
    "choose_template": "Vybrať vzhľad",
    "choose": "Vybrať",
@ -92,15 +92,15 @@
    "choose_note": "Vyberte poznámku",
    "no_note_found": "Neboli nájdené žiadne poznámky",
    "insert_note": "Vlož poznámku",
-    "copied_pdf_url_clipboard": "PDF bolo skopírované do schránky!",
-    "copied_url_clipboard": "URL adresa bola skopírovaná do schránky!",
+    "copied_pdf_url_clipboard": "Copied PDF url to clipboard!",
+    "copied_url_clipboard": "Copied url to clipboard!",
    "docs": "Docs",
-    "do_you_wish_to_continue": "Želáte si pokračovať?",
-    "note": "Poznámka",
-    "pay_invoice": "Zaplatiť faktúru",
-    "login_successfully": "Prihlásenie bolo úspešné!",
-    "logged_out_successfully": "Odhlásenie bolo úspešné",
-    "mark_as_default": "Označiť ako predvolené"
+    "do_you_wish_to_continue": "Do you wish to continue?",
+    "note": "Note",
+    "pay_invoice": "Pay Invoice",
+    "login_successfully": "Logged in successfully!",
+    "logged_out_successfully": "Logged out successfully",
+    "mark_as_default": "Mark as default"
  },
  "dashboard": {
    "select_year": "Vyberte rok",
@ -109,7 +109,7 @@
      "customers": "Zákazníci",
      "invoices": "Faktúry",
      "estimates": "Cenové odhady",
-      "payments": "Platby"
+      "payments": "Payments"
    },
    "chart_info": {
      "total_sales": "Predaje",
@ -151,27 +151,27 @@
    "no_results_found": "Neboli nájdené žiadne výsledky"
  },
  "company_switcher": {
-    "label": "PREPNÚŤ SPOLOČNOSŤ",
-    "no_results_found": "Neboli nájdené žiadne výsledky",
-    "add_new_company": "Pridať novú spoločnosť",
-    "new_company": "Vytvorte spoločnosť",
-    "created_message": "Spoločnosť úspešne vytvorená"
+    "label": "SWITCH COMPANY",
+    "no_results_found": "No Results Found",
+    "add_new_company": "Add new company",
+    "new_company": "New company",
+    "created_message": "Company created successfully"
  },
  "dateRange": {
-    "today": "Dnes",
-    "this_week": "Tento týždeň",
-    "this_month": "Tento mesiac",
-    "this_quarter": "Tento štvrťrok",
-    "this_year": "Tento rok",
-    "previous_week": "Predchádzajúci týždeň",
-    "previous_month": "Predchádzajúci mesiac",
-    "previous_quarter": "Predchádzajúci štvrťrok",
-    "previous_year": "Predchádzajúci rok",
-    "custom": "Vlastný"
+    "today": "Today",
+    "this_week": "This Week",
+    "this_month": "This Month",
+    "this_quarter": "This Quarter",
+    "this_year": "This Year",
+    "previous_week": "Previous Week",
+    "previous_month": "Previous Month",
+    "previous_quarter": "Previous Quarter",
+    "previous_year": "Previous Year",
+    "custom": "Custom"
  },
  "customers": {
    "title": "Zákazníci",
-    "prefix": "Predpona",
+    "prefix": "Prefix",
    "add_customer": "Pridať Zákazníka",
    "contacts_list": "Zoznam zákazníkov",
    "name": "Meno",
@ -186,9 +186,9 @@
    "phone": "Telefón",
    "website": "Webové stránky",
    "overview": "Prehľad",
-    "invoice_prefix": "Predpona Faktúry",
-    "estimate_prefix": "Predpona cenového odhadu",
-    "payment_prefix": "Predpona platby",
+    "invoice_prefix": "Invoice Prefix",
+    "estimate_prefix": "Estimate Prefix",
+    "payment_prefix": "Payment Prefix",
    "enable_portal": "Aktivovať portál",
    "country": "Krajina",
    "state": "Štát",
@ -197,7 +197,7 @@
    "added_on": "Pridané Dňa",
    "action": "Akcia",
    "password": "Heslo",
-    "confirm_password": "Potvrdiť heslo",
+    "confirm_password": "Confirm Password",
    "street_number": "Číslo Ulice",
    "primary_currency": "Hlavná Mena",
    "description": "Popis",
@ -208,17 +208,17 @@
    "new_customer": "Nový Zákazník",
    "edit_customer": "Upraviť Zákazníka",
    "basic_info": "Základné Informácie",
-    "portal_access": "Prístupy na portál",
-    "portal_access_text": "Chcete povoliť tomuto používateľovi pripojiť sa na Zákaznícky Portál?",
-    "portal_access_url": "Adresa zákazníckeho portálu",
-    "portal_access_url_help": "Prosím, skopírujte a prepošlite URL adresu uvedenú vyššie vášmu klientovi pre udelenie prístupu.",
+    "portal_access": "Portal Access",
+    "portal_access_text": "Would you like to allow this customer to login to the Customer Portal?",
+    "portal_access_url": "Customer Portal Login URL",
+    "portal_access_url_help": "Please copy & forward the above given URL to your customer for providing access.",
    "billing_address": "Fakturačná Adresa",
    "shipping_address": "Doručovacia Adresa",
    "copy_billing_address": "Kopírovať podľa Fakturačnej adresy",
    "no_customers": "Zatiaľ nebol pridaný žiadny zákazník!",
    "no_customers_found": "Nenájdení žiadni zákazníci!",
-    "no_contact": "Žiadny kontakt",
-    "no_contact_name": "Žiadny kontakt",
+    "no_contact": "No contact",
+    "no_contact_name": "No contact name",
    "list_of_customers": "Táto sekcia bude obsahovať zoznam zákazníkov.",
    "primary_display_name": "Hlavné meno pre zobrazenie",
    "select_currency": "Vyberte menu",
@ -231,7 +231,7 @@
    "confirm_delete": "Nebudete môcť obnoviť tohto zákazníka ani žiadne faktúry, cenové odhady alebo platby s ním spojené. | Nebudete môcť obnoviť týchto zákazníkov ani žiadne faktúry, cenové odhady alebo platby s nimi spojené.",
    "created_message": "Zákazník úspešne vytvorený",
    "updated_message": "Zákazník úspešne aktualizovaný",
-    "address_updated_message": "Nastavenia adresy úspešne aktualizované",
+    "address_updated_message": "Address Information Updated succesfully",
    "deleted_message": "Zákazník úspešne odstránený | Zákazníci úspešne odstránení",
    "edit_currency_not_allowed": "Cannot change currency once transactions created."
  },
@ -244,7 +244,7 @@
    "added_on": "Pridané Dňa",
    "price": "Cena",
    "date_of_creation": "Dátum Vytvorenia",
-    "not_selected": "Nie je vybratá žiadna položka",
+    "not_selected": "No item selected",
    "action": "Akcia",
    "add_item": "Pridať Položku",
    "save_item": "Uložiť Položku",
@ -317,7 +317,7 @@
      "required": "Pole je povinné"
    },
    "accepted": "Prijátá",
-    "rejected": "Odmietnuté",
+    "rejected": "Rejected",
    "expired": "Expired",
    "sent": "Odoslaná",
    "draft": "Koncept",
@ -359,8 +359,8 @@
  },
  "invoices": {
    "title": "Faktúry",
-    "download": "Stiahnuť",
-    "pay_invoice": "Zaplatiť faktúru",
+    "download": "Download",
+    "pay_invoice": "Pay Invoice",
    "invoices_list": "Zoznam Faktúr",
    "invoice_information": "Invoice Information",
    "days": "{days} Ďeň",
@ -370,8 +370,8 @@
    "paid": "Zaplatené",
    "unpaid": "Nezaplatené",
    "viewed": "Viewed",
-    "overdue": "Po splatnosti",
-    "completed": "Dokončené",
+    "overdue": "Overdue",
+    "completed": "Completed",
    "customer": "ZÁKAZNÍK",
    "paid_status": "Stav platby",
    "ref_no": "REF Č.",
@ -408,7 +408,7 @@
    "invoice_date": "Dátum Vystavenia",
    "record_payment": "Zaznamenať Platbu",
    "add_new_invoice": "Nová Faktúra",
-    "update_expense": "Aktualizovať Výdaj",
+    "update_expense": "Update Expense",
    "edit_invoice": "Upraviť Faktúru",
    "new_invoice": "Nová Faktúra",
    "save_invoice": "Uložiť Faktúru",
@ -421,7 +421,7 @@
    "select_invoice": "Vybrať Faktúru",
    "no_matching_invoices": "Nenašli sa žiadne faktúry!",
    "mark_as_sent_successfully": "Faktúra označená ako úspešne odoslaná",
-    "invoice_sent_successfully": "Faktúra bola úspešne odoslaná",
+    "invoice_sent_successfully": "Invoice sent successfully",
    "cloned_successfully": "Faktúra bola úspešne okopírovaná",
    "clone_invoice": "Kopírovať faktúru",
    "confirm_clone": "Faktúra bude okopírovaná do novej",
@ -450,34 +450,34 @@
    "mark_as_default_invoice_template_description": "If enabled, the selected template will be automatically selected for new invoices."
  },
  "recurring_invoices": {
-    "title": "Pravidelné faktúry",
-    "invoices_list": "Zoznam pravidelných faktúr",
+    "title": "Recurring Invoices",
+    "invoices_list": "Recurring Invoices List",
    "days": "{days} Days",
    "months": "{months} Month",
    "years": "{years} Year",
-    "all": "Všetko",
-    "paid": "Zaplatené",
-    "unpaid": "Nezaplatené",
+    "all": "All",
+    "paid": "Paid",
+    "unpaid": "Unpaid",
    "viewed": "Viewed",
-    "overdue": "Po splatnosti",
+    "overdue": "Overdue",
    "active": "Active",
-    "completed": "Dokončené",
-    "customer": "ZÁKAZNÍK",
+    "completed": "Completed",
+    "customer": "CUSTOMER",
    "paid_status": "PAID STATUS",
-    "ref_no": "REF Č.",
-    "number": "ČÍSLO",
+    "ref_no": "REF NO.",
+    "number": "NUMBER",
    "amount_due": "AMOUNT DUE",
-    "partially_paid": "Čiastočne Zaplatené",
-    "total": "Celkom",
-    "discount": "Zľava",
-    "sub_total": "Medzisúčet",
-    "invoice": "Pravidelná faktúra | Pravidelné faktúry",
-    "invoice_number": "Číslo pravidelnej faktúry",
-    "next_invoice_date": "Dátum nasledujúceho vystavenia",
-    "ref_number": "Ref. Číslo",
-    "contact": "Kontakt",
-    "add_item": "Pridať položku",
-    "date": "Dátum",
+    "partially_paid": "Partially Paid",
+    "total": "Total",
+    "discount": "Discount",
+    "sub_total": "Sub Total",
+    "invoice": "Recurring Invoice | Recurring Invoices",
+    "invoice_number": "Recurring Invoice Number",
+    "next_invoice_date": "Next Invoice Date",
+    "ref_number": "Ref Number",
+    "contact": "Contact",
+    "add_item": "Add an Item",
+    "date": "Date",
    "limit_by": "Limit by",
    "limit_date": "Limit Date",
    "limit_count": "Limit Count",
@ -506,15 +506,15 @@
    "starts_at": "Start Date",
    "due_date": "Invoice Due Date",
    "record_payment": "Record Payment",
-    "add_new_invoice": "Vytvoriť novú pravidelnú faktúru",
-    "update_expense": "Aktualizovať Výdaj",
-    "edit_invoice": "Upraviť pravidelnú faktúru",
-    "new_invoice": "Nová pravidelná faktúra",
-    "send_automatically": "Odoslať automaticky",
+    "add_new_invoice": "Add New Recurring Invoice",
+    "update_expense": "Update Expense",
+    "edit_invoice": "Edit Recurring Invoice",
+    "new_invoice": "New Recurring Invoice",
+    "send_automatically": "Send Automatically",
    "send_automatically_desc": "Enable this, if you would like to send the invoice automatically to the customer when its created.",
-    "save_invoice": "Uložiť pravidelnú faktúru",
-    "update_invoice": "Upraviť pravidelnú faktúru",
-    "add_new_tax": "Pridať novú daň",
+    "save_invoice": "Save Recurring Invoice",
+    "update_invoice": "Update Recurring Invoice",
+    "add_new_tax": "Add New Tax",
    "no_invoices": "No Recurring Invoices yet!",
    "mark_as_rejected": "Mark as rejected",
    "mark_as_accepted": "Mark as accepted",
@ -528,27 +528,27 @@
    "confirm_clone": "This recurring invoice will be cloned into a new Recurring Invoice",
    "add_customer_email": "Please add an email address for this customer to send invoices automatically.",
    "item": {
-      "title": "Názov položky",
-      "description": "Popis",
-      "quantity": "Množstvo",
-      "price": "Cena",
-      "discount": "Zľava",
-      "total": "Súčet",
-      "total_discount": "Celková zľava",
-      "sub_total": "Medzisúčet",
-      "tax": "Daň",
-      "amount": "Množstvo",
-      "select_an_item": "Začnite písať alebo kliknite pre vybratie položky",
-      "type_item_description": "Popis položky (voliteľné)"
+      "title": "Item Title",
+      "description": "Description",
+      "quantity": "Quantity",
+      "price": "Price",
+      "discount": "Discount",
+      "total": "Total",
+      "total_discount": "Total Discount",
+      "sub_total": "Sub Total",
+      "tax": "Tax",
+      "amount": "Amount",
+      "select_an_item": "Type or click to select an item",
+      "type_item_description": "Type Item Description (optional)"
    },
    "frequency": {
-      "title": "Frekvencia",
-      "select_frequency": "Vybrať frekvenciu",
-      "minute": "Minúta",
-      "hour": "Hodina",
-      "day_month": "Deň v mesiaci",
-      "month": "Mesiac",
-      "day_week": "Deň v týždni"
+      "title": "Frequency",
+      "select_frequency": "Select Frequency",
+      "minute": "Minute",
+      "hour": "Hour",
+      "day_month": "Day of month",
+      "month": "Month",
+      "day_week": "Day of week"
    },
    "confirm_delete": "You will not be able to recover this Invoice | You will not be able to recover these Invoices",
    "created_message": "Recurring Invoice created successfully",
@ -686,12 +686,12 @@
    "api_token": "API token",
    "invalid_api_token": "Invalid API Token.",
    "other_modules": "Other Modules",
-    "view_all": "Zobraziť všetky",
-    "no_reviews_found": "Zatiaľ nie sú dostupné žiadne hodnotenia pre tento modul!",
-    "module_not_purchased": "Modul nie je kúpený",
-    "module_not_found": "Modul nebol nájdený",
+    "view_all": "View All",
+    "no_reviews_found": "There are no reviews for this module yet!",
+    "module_not_purchased": "Module Not Purchased",
+    "module_not_found": "Module Not Found",
    "version_not_supported": "This module version doesn't support the current version of Crater",
-    "last_updated": "Naposledy aktualizované",
+    "last_updated": "Last Updated On",
    "connect_installation": "Connect your installation",
    "api_token_description": "Login to {url} and connect this installation by entering the API Token. Your purchased modules will show up here after the connection is established.",
    "view_module": "View Module",
@ -806,8 +806,8 @@
      "custom_fields": "Vlastné Polia",
      "payment_modes": "Spôsoby Platby",
      "notes": "Poznámky",
-      "exchange_rate": "Výmenný kurz",
-      "address_information": "Údaje adresy"
+      "exchange_rate": "Exchange Rate",
+      "address_information": "Address Information"
    },
    "address_information": {
      "section_description": "  You can update Your Address information using form below."
@ -872,9 +872,9 @@
      "address": "Adresa",
      "zip": "PSČ",
      "save": "Uložiť",
-      "delete": "Odstrániť",
+      "delete": "Delete",
      "updated_message": "Informácie o firme úspešne aktualizované",
-      "delete_company": "Odstrániť spoločnosť",
+      "delete_company": "Delete Company",
      "delete_company_description": "Once you delete your company, you will lose all the data and files associated with it permanently.",
      "are_you_absolutely_sure": "Are you absolutely sure?",
      "delete_company_modal_desc": "This action cannot be undone. This will permanently delete {company} and all of its associated data.",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Cenový odhad",
  "pdf_estimate_number": "Číslo cenového odhadu",
  "pdf_estimate_date": "Dátum cenového odhadu",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Platnosť cenového odhadu",
  "pdf_invoice_label": "Faktúra",
  "pdf_invoice_number": "Číslo faktúry",
  "pdf_invoice_date": "Dátum vystavenia",
--- a/resources/scripts/locales/sl.json
+++ b/resources/scripts/locales/sl.json
--- a/resources/scripts/locales/sr.json
+++ b/resources/scripts/locales/sr.json
@ -12,7 +12,7 @@
    "settings": "Podešavanja",
    "logout": "Odjavi se",
    "users": "Korisnici",
-    "modules": "Moduli"
+    "modules": "Modules"
  },
  "general": {
    "add_company": "Dodaj kompaniju",
@ -30,8 +30,8 @@
    "from": "Pošiljalac",
    "to": "Primalac",
    "ok": "Ok",
-    "yes": "Da",
-    "no": "Ne",
+    "yes": "Yes",
+    "no": "No",
    "sort_by": "Rasporedi Po",
    "ascending": "Rastuće",
    "descending": "Opadajuće",
@ -39,7 +39,7 @@
    "body": "Telo",
    "message": "Poruka",
    "send": "Pošalji",
-    "preview": "Pregled",
+    "preview": "Preview",
    "go_back": "Idi nazad",
    "back_to_login": "Nazad na prijavu?",
    "home": "Početna",
@ -95,9 +95,9 @@
    "copied_pdf_url_clipboard": "Link do PDF fajla kopiran!",
    "copied_url_clipboard": "Copied url to clipboard!",
    "docs": "Docs",
-    "do_you_wish_to_continue": "Da li želite nastaviti?",
-    "note": "Bilješka",
-    "pay_invoice": "Plati račun",
+    "do_you_wish_to_continue": "Do you wish to continue?",
+    "note": "Note",
+    "pay_invoice": "Pay Invoice",
    "login_successfully": "Logged in successfully!",
    "logged_out_successfully": "Logged out successfully",
    "mark_as_default": "Mark as default"
@ -318,10 +318,10 @@
    },
    "accepted": "Prihvaćeno",
    "rejected": "Odbijeno",
-    "expired": "Istekao",
+    "expired": "Expired",
    "sent": "Poslato",
    "draft": "U izradi",
-    "viewed": "Pregledano",
+    "viewed": "Viewed",
    "declined": "Odbijeno",
    "new_estimate": "Nova Profaktura",
    "add_new_estimate": "Dodaj novu Profakturu",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Profaktura",
  "pdf_estimate_number": "Broj Profakture",
  "pdf_estimate_date": "Datum Profakture",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Datum isteka Profakture",
  "pdf_invoice_label": "Faktura",
  "pdf_invoice_number": "Broj Fakture",
  "pdf_invoice_date": "Datum Fakture",
--- a/resources/scripts/locales/sv.json
+++ b/resources/scripts/locales/sv.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Kostnadsförslag",
  "pdf_estimate_number": "Kostnadsförslagsnummer",
  "pdf_estimate_date": "Kostnadsförslagsdatum",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Utgångsdatum",
  "pdf_invoice_label": "Faktura",
  "pdf_invoice_number": "Fakturanummer",
  "pdf_invoice_date": "Fakturadatum",
--- a/resources/scripts/locales/th.json
+++ b/resources/scripts/locales/th.json
--- a/resources/scripts/locales/tr.json
+++ b/resources/scripts/locales/tr.json
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Estimate",
  "pdf_estimate_number": "Estimate Number",
  "pdf_estimate_date": "Estimate Date",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Expiry date",
  "pdf_invoice_label": "Invoice",
  "pdf_invoice_number": "Invoice Number",
  "pdf_invoice_date": "Invoice Date",
--- a/resources/scripts/locales/uk.json
+++ b/resources/scripts/locales/uk.json
--- a/resources/scripts/locales/vi.json
+++ b/resources/scripts/locales/vi.json
@ -12,7 +12,7 @@
    "settings": "Cài đặt",
    "logout": "Đăng xuất",
    "users": "Người dùng",
-    "modules": "Các Mô-Đun"
+    "modules": "Modules"
  },
  "general": {
    "add_company": "Thêm công ty",
@ -93,13 +93,13 @@
    "no_note_found": "Không tìm thấy ghi chú",
    "insert_note": "Chèn ghi chú",
    "copied_pdf_url_clipboard": "Đã sao chép url PDF vào khay nhớ tạm!",
-    "copied_url_clipboard": "Đã sao chép url vào khay nhớ tạm!",
+    "copied_url_clipboard": "Copied url to clipboard!",
    "docs": "Tài liệu",
    "do_you_wish_to_continue": "Bạn có muốn tiếp tục không?",
    "note": "Ghi chú",
-    "pay_invoice": "Thanh toán hóa đơn",
-    "login_successfully": "Đăng nhập thành công!",
-    "logged_out_successfully": "Đăng xuất thành công",
+    "pay_invoice": "Pay Invoice",
+    "login_successfully": "Logged in successfully!",
+    "logged_out_successfully": "Logged out successfully",
    "mark_as_default": "Đánh dấu mặc định"
  },
  "dashboard": {
@ -109,7 +109,7 @@
      "customers": "Khách hàng",
      "invoices": "Hóa đơn",
      "estimates": "Ước tính",
-      "payments": "Thanh toán"
+      "payments": "Payments"
    },
    "chart_info": {
      "total_sales": "Bán hàng",
@ -208,10 +208,10 @@
    "new_customer": "Khách hàng mới",
    "edit_customer": "Chỉnh sửa khách hàng",
    "basic_info": "Thông tin cơ bản",
-    "portal_access": "Truy cập cổng thông tin",
-    "portal_access_text": "Bạn có muốn cho phép người dùng này truy cập vào cổng thông tin khách hàng không?",
-    "portal_access_url": "Đường dẫn đăng nhập cổng thông tin khách hàng",
-    "portal_access_url_help": "Hãy sao chép & chuyển tiếp đường dẫn bên trên cho khách hàng của bạn để cho phép truy cập.",
+    "portal_access": "Portal Access",
+    "portal_access_text": "Would you like to allow this customer to login to the Customer Portal?",
+    "portal_access_url": "Customer Portal Login URL",
+    "portal_access_url_help": "Please copy & forward the above given URL to your customer for providing access.",
    "billing_address": "Địa chỉ thanh toán",
    "shipping_address": "Địa chỉ giao hàng",
    "copy_billing_address": "Sao chép từ thanh toán",
@ -231,7 +231,7 @@
    "confirm_delete": "Bạn sẽ không thể khôi phục khách hàng này và tất cả các Hóa đơn, Ước tính và Thanh toán có liên quan. | Bạn sẽ không thể khôi phục những khách hàng này và tất cả các Hóa đơn, Ước tính và Thanh toán có liên quan.",
    "created_message": "Khách hàng được tạo thành công",
    "updated_message": "Đã cập nhật khách hàng thành công",
-    "address_updated_message": "Thông tin địa chỉ được cập nhật thành công",
+    "address_updated_message": "Address Information Updated succesfully",
    "deleted_message": "Đã xóa khách hàng thành công | Đã xóa khách hàng thành công",
    "edit_currency_not_allowed": "Không thể đổi tiền tệ khi bản dịch đã được tạo."
  },
@ -265,7 +265,7 @@
  },
  "estimates": {
    "title": "Ước tính",
-    "accept_estimate": "Chấp nhận ước tính",
+    "accept_estimate": "Accept Estimate",
    "reject_estimate": "Reject Estimate",
    "estimate": "Ước tính | Ước tính",
    "estimates_list": "Danh sách ước tính",
@ -318,7 +318,7 @@
    },
    "accepted": "Đã được chấp nhận",
    "rejected": "Từ chối",
-    "expired": "Hết hạn",
+    "expired": "Expired",
    "sent": "Gởi",
    "draft": "Bản nháp",
    "viewed": "Viewed",
@ -463,36 +463,36 @@
    "active": "Hoạt động",
    "completed": "Hoàn thành",
    "customer": "KHÁCH HÀNG",
-    "paid_status": "TÌNH TRẠNG THANH TOÁN",
-    "ref_no": "Số tham chiếu.",
-    "number": "SỐ",
+    "paid_status": "PAID STATUS",
+    "ref_no": "REF NO.",
+    "number": "NUMBER",
    "amount_due": "AMOUNT DUE",
    "partially_paid": "Partially Paid",
-    "total": "Tổng",
-    "discount": "Giảm giá",
+    "total": "Total",
+    "discount": "Discount",
    "sub_total": "Sub Total",
    "invoice": "Recurring Invoice | Recurring Invoices",
-    "invoice_number": "Số hóa đơn định kì",
-    "next_invoice_date": "Ngày lập hoá đơn tiếp theo",
-    "ref_number": "Số tham chiếu",
-    "contact": "Liên hệ",
-    "add_item": "Thêm một mặt hàng",
-    "date": "Ngày",
-    "limit_by": "Giới hạn bởi",
-    "limit_date": "Ngày giới hạn",
+    "invoice_number": "Recurring Invoice Number",
+    "next_invoice_date": "Next Invoice Date",
+    "ref_number": "Ref Number",
+    "contact": "Contact",
+    "add_item": "Add an Item",
+    "date": "Date",
+    "limit_by": "Limit by",
+    "limit_date": "Limit Date",
    "limit_count": "Limit Count",
    "count": "Count",
-    "status": "Trạng thái",
-    "select_a_status": "Chọn một trạng thái",
-    "working": "Đang hoạt động",
-    "on_hold": "Đang chờ",
-    "complete": "Hoàn thành",
-    "add_tax": "Thêm thuế",
-    "amount": "Số tiền",
-    "action": "Hành động",
-    "notes": "Ghi chú",
-    "view": "Xem",
-    "basic_info": "Thông tin cơ bản",
+    "status": "Status",
+    "select_a_status": "Select a status",
+    "working": "Working",
+    "on_hold": "On Hold",
+    "complete": "Completed",
+    "add_tax": "Add Tax",
+    "amount": "Amount",
+    "action": "Action",
+    "notes": "Notes",
+    "view": "View",
+    "basic_info": "Basic Info",
    "send_invoice": "Send Recurring Invoice",
    "auto_send": "Auto Send",
    "resend_invoice": "Resend Recurring Invoice",
@ -504,9 +504,9 @@
    "invoice_mark_as_sent": "This recurring invoice will be marked as sent",
    "confirm_send": "This recurring invoice will be sent via email to the customer",
    "starts_at": "Start Date",
-    "due_date": "Ngày lập hóa đơn",
-    "record_payment": "Ghi lại Thanh toán",
-    "add_new_invoice": "Cập nhật Hóa đơn định kỳ",
+    "due_date": "Invoice Due Date",
+    "record_payment": "Record Payment",
+    "add_new_invoice": "Add New Recurring Invoice",
    "update_expense": "Update Expense",
    "edit_invoice": "Edit Recurring Invoice",
    "new_invoice": "New Recurring Invoice",
@ -533,7 +533,7 @@
      "quantity": "Quantity",
      "price": "Price",
      "discount": "Discount",
-      "total": "Tổng cộng",
+      "total": "Total",
      "total_discount": "Total Discount",
      "sub_total": "Sub Total",
      "tax": "Tax",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "Ước tính",
  "pdf_estimate_number": "Số ước tính",
  "pdf_estimate_date": "Ngày ước tính",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "Ngày hết hạn",
  "pdf_invoice_label": "Hóa đơn",
  "pdf_invoice_number": "Số hóa đơn",
  "pdf_invoice_date": "Ngày lập hóa đơn",
--- a/resources/scripts/locales/zh.json
+++ b/resources/scripts/locales/zh.json
@ -12,7 +12,7 @@
    "settings": "設定",
    "logout": "登出",
    "users": "使用者",
-    "modules": "功能模組"
+    "modules": "Modules"
  },
  "general": {
    "add_company": "新增公司",
@ -93,14 +93,14 @@
    "no_note_found": "沒有找到備註",
    "insert_note": "插入備註",
    "copied_pdf_url_clipboard": "複製PDF位址到剪貼簿!",
-    "copied_url_clipboard": "將網址複製到剪貼簿！",
+    "copied_url_clipboard": "Copied url to clipboard!",
    "docs": "文檔",
    "do_you_wish_to_continue": "你確定要繼續？",
    "note": "備註",
-    "pay_invoice": "支付發票",
-    "login_successfully": "已成功登入！",
-    "logged_out_successfully": "已成功登出",
-    "mark_as_default": "標記為預設值"
+    "pay_invoice": "Pay Invoice",
+    "login_successfully": "Logged in successfully!",
+    "logged_out_successfully": "Logged out successfully",
+    "mark_as_default": "Mark as default"
  },
  "dashboard": {
    "select_year": "選擇年份",
@ -109,7 +109,7 @@
      "customers": "客户",
      "invoices": "發票",
      "estimates": "報價",
-      "payments": "付款"
+      "payments": "Payments"
    },
    "chart_info": {
      "total_sales": "銷售",
@ -208,10 +208,10 @@
    "new_customer": "新客戶",
    "edit_customer": "編輯客戶",
    "basic_info": "基本資料",
-    "portal_access": "門戶訪問",
-    "portal_access_text": "您想允許此客戶登入客戶門戶嗎？",
-    "portal_access_url": "客戶門戶登入URL",
-    "portal_access_url_help": "請將上述給定的URL複製並轉發給您的客戶以提供訪問許可權。",
+    "portal_access": "Portal Access",
+    "portal_access_text": "Would you like to allow this customer to login to the Customer Portal?",
+    "portal_access_url": "Customer Portal Login URL",
+    "portal_access_url_help": "Please copy & forward the above given URL to your customer for providing access.",
    "billing_address": "帳單地址",
    "shipping_address": "送貨地址",
    "copy_billing_address": "由帳單複製",
@ -231,7 +231,7 @@
    "confirm_delete": "你將不能夠還原此客戶, 以及此客戶相關的發票, 報價及付款. | 你將不能夠還原此客戶, 以及此客戶相關的發票, 報價及付款.",
    "created_message": "成功新增客戶",
    "updated_message": "成功更新客戶",
-    "address_updated_message": "地址資訊已成功更新",
+    "address_updated_message": "Address Information Updated succesfully",
    "deleted_message": "成功刪除客戶 | 成功刪除客戶",
    "edit_currency_not_allowed": "交易一旦創建後就不能改變貨幣!"
  },
@ -265,8 +265,8 @@
  },
  "estimates": {
    "title": "報價",
-    "accept_estimate": "接受估價",
-    "reject_estimate": "拒絕估算",
+    "accept_estimate": "Accept Estimate",
+    "reject_estimate": "Reject Estimate",
    "estimate": "報價 | 報價",
    "estimates_list": "報價列表",
    "days": "{days} 天",
@ -318,10 +318,10 @@
    },
    "accepted": "已接受",
    "rejected": "已拒絕",
-    "expired": "已過期",
+    "expired": "Expired",
    "sent": "傳送",
    "draft": "草稿",
-    "viewed": "已檢視",
+    "viewed": "Viewed",
    "declined": "拒絕",
    "new_estimate": "新報價",
    "add_new_estimate": "新增報價",
@ -355,14 +355,14 @@
      "select_an_item": "輸入或點擊去選擇商品",
      "type_item_description": "商品詳情(可選)"
    },
-    "mark_as_default_estimate_template_description": "如果啟用，所選模板將自動選擇新的估算。"
+    "mark_as_default_estimate_template_description": "If enabled, the selected template will be automatically selected for new estimates."
  },
  "invoices": {
    "title": "發票",
-    "download": "下載",
-    "pay_invoice": "支付發票",
+    "download": "Download",
+    "pay_invoice": "Pay Invoice",
    "invoices_list": "發票列表",
-    "invoice_information": "發票資訊",
+    "invoice_information": "Invoice Information",
    "days": "{days} 天",
    "months": "{months} 月",
    "years": "{years} 年",
@ -447,7 +447,7 @@
    "marked_as_sent_message": "發票已標示為成功傳送",
    "something_went_wrong": "出現錯誤",
    "invalid_due_amount_message": "發票總額不能少於支付總額. 請更新發票或刪除相關支付再繼續.",
-    "mark_as_default_invoice_template_description": "如果啟用，所選模板將自動選擇新發票"
+    "mark_as_default_invoice_template_description": "If enabled, the selected template will be automatically selected for new invoices."
  },
  "recurring_invoices": {
    "title": "定期發票",
@ -464,12 +464,12 @@
    "completed": "已完成",
    "customer": "客戶",
    "paid_status": "付款狀態",
-    "ref_no": "參考號碼",
-    "number": "號",
-    "amount_due": "到期金額",
-    "partially_paid": "部分支付",
-    "total": "總計",
-    "discount": "折扣",
+    "ref_no": "REF NO.",
+    "number": "NUMBER",
+    "amount_due": "AMOUNT DUE",
+    "partially_paid": "Partially Paid",
+    "total": "Total",
+    "discount": "Discount",
    "sub_total": "Sub Total",
    "invoice": "Recurring Invoice | Recurring Invoices",
    "invoice_number": "Recurring Invoice Number",
@ -504,16 +504,16 @@
    "invoice_mark_as_sent": "This recurring invoice will be marked as sent",
    "confirm_send": "This recurring invoice will be sent via email to the customer",
    "starts_at": "Start Date",
-    "due_date": "發票到期日期",
-    "record_payment": "紀錄付款",
-    "add_new_invoice": "添加定期發票",
-    "update_expense": "更新支出",
-    "edit_invoice": "編輯定期發票",
-    "new_invoice": "添加定期發票",
-    "send_automatically": "自動發送",
-    "send_automatically_desc": "如果您希望在建立發票時自動將發票發送給客戶，請啟用此選項。",
-    "save_invoice": "保存定期發票",
-    "update_invoice": "更新定期發票",
+    "due_date": "Invoice Due Date",
+    "record_payment": "Record Payment",
+    "add_new_invoice": "Add New Recurring Invoice",
+    "update_expense": "Update Expense",
+    "edit_invoice": "Edit Recurring Invoice",
+    "new_invoice": "New Recurring Invoice",
+    "send_automatically": "Send Automatically",
+    "send_automatically_desc": "Enable this, if you would like to send the invoice automatically to the customer when its created.",
+    "save_invoice": "Save Recurring Invoice",
+    "update_invoice": "Update Recurring Invoice",
    "add_new_tax": "Add New Tax",
    "no_invoices": "No Recurring Invoices yet!",
    "mark_as_rejected": "Mark as rejected",
@ -1485,7 +1485,7 @@
  "pdf_estimate_label": "報價",
  "pdf_estimate_number": "報價單號",
  "pdf_estimate_date": "報價日期",
-  "pdf_estimate_expire_date": "Expiry Date",
+  "pdf_estimate_expire_date": "有效日期",
  "pdf_invoice_label": "發票",
  "pdf_invoice_number": "發票號碼",
  "pdf_invoice_date": "發票日期",
--- a/resources/static/fonts/THSarabunNew-Bold.ttf
+++ b/resources/static/fonts/THSarabunNew-Bold.ttf
--- a/resources/static/fonts/THSarabunNew-BoldItalic.ttf
+++ b/resources/static/fonts/THSarabunNew-BoldItalic.ttf
--- a/resources/static/fonts/THSarabunNew-Italic.ttf
+++ b/resources/static/fonts/THSarabunNew-Italic.ttf
--- a/resources/static/fonts/THSarabunNew.ttf
+++ b/resources/static/fonts/THSarabunNew.ttf
--- a/resources/views/app/pdf/estimate/estimate1.blade.php
+++ b/resources/views/app/pdf/estimate/estimate1.blade.php
@ -386,6 +386,10 @@
        }

    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
--- a/resources/views/app/pdf/estimate/estimate2.blade.php
+++ b/resources/views/app/pdf/estimate/estimate2.blade.php
@ -408,6 +408,10 @@
        }

    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
--- a/resources/views/app/pdf/estimate/estimate3.blade.php
+++ b/resources/views/app/pdf/estimate/estimate3.blade.php
@ -346,6 +346,10 @@
        }

    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@ -327,6 +327,10 @@
        }

    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@ -377,6 +377,10 @@
        }

    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@ -2,7 +2,7 @@
 <html>

 <head>
-    <title>@lang('pdf_invoice_label') - {{$invoice->invoice_number}}</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">
@ -187,7 +187,7 @@


        .total-display-table {
-             border-top: none;
+            border-top: none;
            page-break-inside: avoid;
            page-break-before: auto;
            page-break-after: auto;
@ -304,7 +304,12 @@
        .pl-0 {
            padding-left: 0;
        }
+
    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
@ -312,10 +317,10 @@
        <table width="100%">
            <tr>
                <td width="50%" class="header-section-left">
-                    @if($logo)
-                    <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
+                    @if ($logo)
+                        <img class="header-logo" style="height: 50px;" src="{{ $logo }}" alt="Company Logo">
                    @else
-                    <h1 class="header-logo"> {{$invoice->customer->company->name}} </h1>
+                        <h1 class="header-logo"> {{ $invoice->customer->company->name }} </h1>
                    @endif
                </td>
                <td width="50%" class="text-right company-address-container company-address">
@ -331,14 +336,14 @@
        <div class="main-content">
            <div class="customer-address-container">
                <div class="billing-address-container billing-address">
-                    @if($billing_address)
+                    @if ($billing_address)
                        <b>@lang('pdf_bill_to')</b> <br>
                        {!! $billing_address !!}
                    @endif
                </div>

-                <div @if($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
-                    @if($shipping_address)
+                <div @if ($billing_address !== '</br>') class="shipping-address-container shipping-address" @else class="shipping-address-container--left shipping-address" @endif>
+                    @if ($shipping_address)
                        <b>@lang('pdf_ship_to')</b> <br>
                        {!! $shipping_address !!}
                    @endif
@ -350,15 +355,15 @@
                <table>
                    <tr>
                        <td class="attribute-label">@lang('pdf_invoice_number')</td>
-                        <td class="attribute-value"> &nbsp;{{$invoice->invoice_number}}</td>
+                        <td class="attribute-value"> &nbsp;{{ $invoice->invoice_number }}</td>
                    </tr>
                    <tr>
                        <td class="attribute-label">@lang('pdf_invoice_date')</td>
-                        <td class="attribute-value"> &nbsp;{{$invoice->formattedInvoiceDate}}</td>
+                        <td class="attribute-value"> &nbsp;{{ $invoice->formattedInvoiceDate }}</td>
                    </tr>
                    <tr>
                        <td class="attribute-label">@lang('pdf_invoice_due_date')</td>
-                        <td class="attribute-value"> &nbsp;{{$invoice->formattedDueDate}}</td>
+                        <td class="attribute-value"> &nbsp;{{ $invoice->formattedDueDate }}</td>
                    </tr>
                </table>
            </div>
@ -368,7 +373,7 @@
        @include('app.pdf.invoice.partials.table')

        <div class="notes">
-            @if($notes)
+            @if ($notes)
                <div class="notes-label">
                    @lang('pdf_notes')
                </div>
--- a/resources/views/app/pdf/locale/th.blade.php
+++ b/resources/views/app/pdf/locale/th.blade.php
@ -0,0 +1,34 @@
+<style type="text/css">
+    @font-face {
+        font-family: 'THSarabunNew';
+        font-style: normal;
+        font-weight: normal;
+        src: url("{{ resource_path('static/fonts/THSarabunNew.ttf') }}") format('truetype');
+    }
+
+    @font-face {
+        font-family: 'THSarabunNew';
+        font-style: normal;
+        font-weight: bold;
+        src: url("{{ resource_path('static/fonts/THSarabunNew-Bold.ttf') }}") format('truetype');
+    }
+
+    @font-face {
+        font-family: 'THSarabunNew';
+        font-style: italic;
+        font-weight: normal;
+        src: url("{{ resource_path('static/fonts/THSarabunNew-Italic.ttf') }}") format('truetype');
+    }
+
+    @font-face {
+        font-family: 'THSarabunNew';
+        font-style: italic;
+        font-weight: bold;
+        src: url("{{ resource_path('static/fonts/THSarabunNew-BoldItalic.ttf') }}") format('truetype');
+    }
+
+    body {
+        font-family: "THSarabunNew", sans-serif !important;
+    }
+
+</style>
--- a/resources/views/app/pdf/payment/payment.blade.php
+++ b/resources/views/app/pdf/payment/payment.blade.php
@ -276,6 +276,10 @@
        }

    </style>
+
+    @if (App::isLocale('th'))
+        @include('app.pdf.locale.th')
+    @endif
 </head>

 <body>
--- a/resources/views/app/pdf/reports/expenses.blade.php
+++ b/resources/views/app/pdf/reports/expenses.blade.php
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <title>@lang('pdf_expense_report_label')</title>
    <style type="text/css">
@ -11,7 +12,7 @@
            border-collapse: collapse;
        }

-        .sub-container{
+        .sub-container {
            padding: 0px 20px;
        }

@ -133,7 +134,12 @@
            color: #5851D8;
        }
    </style>
+
+    @if (App::isLocale('th'))
+    @include('app.pdf.locale.th')
+    @endif
 </head>
+
 <body>
    <div class="sub-container">
        <table class="report-header">
@ -155,18 +161,18 @@
        <div class="expenses-table-container">
            <table class="expenses-table">
                @foreach ($expenseCategories as $expenseCategory)
-                    <tr>
-                        <td>
-                            <p class="expense-title">
-                                {{ $expenseCategory->category->name }}
-                            </p>
-                        </td>
-                        <td>
-                            <p class="expense-amount">
-                                {!! format_money_pdf($expenseCategory->total_amount) !!}
-                            </p>
-                        </td>
-                    </tr>
+                <tr>
+                    <td>
+                        <p class="expense-title">
+                            {{ $expenseCategory->category->name }}
+                        </p>
+                    </td>
+                    <td>
+                        <p class="expense-amount">
+                            {!! format_money_pdf($expenseCategory->total_amount, $currency) !!}
+                        </p>
+                    </td>
+                </tr>
                @endforeach
            </table>
        </div>
@ -175,7 +181,7 @@
    <table class="expense-total-table">
        <tr>
            <td class="expense-total-cell">
-                <p class="expense-total">{!! format_money_pdf($totalExpense) !!}</p>
+                <p class="expense-total">{!! format_money_pdf($totalExpense, $currency) !!}</p>
            </td>
        </tr>
    </table>
@ -185,9 +191,10 @@
                <p class="report-footer-label">@lang('pdf_total_expenses_label')</p>
            </td>
            <td>
-                <p class="report-footer-value">{!! format_money_pdf($totalExpense) !!}</p>
+                <p class="report-footer-value">{!! format_money_pdf($totalExpense, $currency) !!}</p>
            </td>
        </tr>
    </table>
 </body>
+
 </html>
--- a/resources/views/app/pdf/reports/profit-loss.blade.php
+++ b/resources/views/app/pdf/reports/profit-loss.blade.php
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <title>@lang('pdf_profit_loss_label')</title>
    <style type="text/css">
@ -11,7 +12,7 @@
            border-collapse: collapse;
        }

-        .sub-container{
+        .sub-container {
            padding: 0px 20px;
        }

@ -158,7 +159,12 @@
            color: #5851D8;
        }
    </style>
+
+    @if (App::isLocale('th'))
+    @include('app.pdf.locale.th')
+    @endif
 </head>
+
 <body>
    <div class="sub-container">
        <table class="report-header">
@ -183,7 +189,7 @@
                    <p class="income-title">@lang("pdf_income_label")</p>
                </td>
                <td>
-                    <p class="income-amount">{!! format_money_pdf($income) !!}</p>
+                    <p class="income-amount">{!! format_money_pdf($income, $currency) !!}</p>
                </td>
            </tr>
        </table>
@ -191,18 +197,18 @@
        <div class="expenses-table-container">
            <table class="expenses-table">
                @foreach ($expenseCategories as $expenseCategory)
-                    <tr>
-                        <td>
-                            <p class="expense-title">
-                                {{ $expenseCategory->category->name }}
-                            </p>
-                        </td>
-                        <td>
-                            <p class="expense-amount">
-                                {!! format_money_pdf($expenseCategory->total_amount) !!}
-                            </p>
-                        </td>
-                    </tr>
+                <tr>
+                    <td>
+                        <p class="expense-title">
+                            {{ $expenseCategory->category->name }}
+                        </p>
+                    </td>
+                    <td>
+                        <p class="expense-amount">
+                            {!! format_money_pdf($expenseCategory->total_amount, $currency) !!}
+                        </p>
+                    </td>
+                </tr>
                @endforeach

            </table>
@ -212,7 +218,7 @@
    <table class="expense-total-indicator-table">
        <tr>
            <td class="expense-total-cell">
-                <p class="expense-total">{!! format_money_pdf($totalExpense) !!}</p>
+                <p class="expense-total">{!! format_money_pdf($totalExpense, $currency) !!}</p>
            </td>
        </tr>
    </table>
@ -222,9 +228,10 @@
                <p class="report-footer-label">@lang("pdf_net_profit_label")</p>
            </td>
            <td>
-                <p class="report-footer-value">{!! format_money_pdf(($income-$totalExpense)) !!}</p>
+                <p class="report-footer-value">{!! format_money_pdf($income - $totalExpense, $currency) !!}</p>
            </td>
        </tr>
    </table>
 </body>
+
 </html>
--- a/resources/views/app/pdf/reports/sales-customers.blade.php
+++ b/resources/views/app/pdf/reports/sales-customers.blade.php
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <title>@lang('pdf_sales_customers_label')</title>
    <style type="text/css">
@ -11,7 +12,7 @@
            border-collapse: collapse;
        }

-        .sub-container{
+        .sub-container {
            padding: 0px 20px;
        }

@ -132,11 +133,17 @@
            line-height: 21px;
            color: #5851D8;
        }
+
        .text-center {
            text-align: center;
        }
    </style>
+
+    @if (App::isLocale('th'))
+    @include('app.pdf.locale.th')
+    @endif
 </head>
+
 <body>
    <div class="sub-container">
        <table class="report-header">
@ -156,34 +163,34 @@
        </table>

        @foreach ($customers as $customer)
-            <p class="sales-customer-name">{{ $customer->name }}</p>
-            <div class="sales-table-container">
-                <table class="sales-table">
-                    @foreach ($customer->invoices as $invoice)
-                        <tr>
-                            <td>
-                                <p class="sales-information-text">
-                                    {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }})
-                                </p>
-                            </td>
-                            <td>
-                                <p class="sales-amount">
-                                    {!! format_money_pdf($invoice->base_total) !!}
-                                </p>
-                            </td>
-                        </tr>
-                    @endforeach
-                </table>
-            </div>
-            <table class="sales-total-indicator-table">
+        <p class="sales-customer-name">{{ $customer->name }}</p>
+        <div class="sales-table-container">
+            <table class="sales-table">
+                @foreach ($customer->invoices as $invoice)
                <tr>
-                    <td class="sales-total-cell">
-                        <p class="sales-total-amount">
-                            {!! format_money_pdf($customer->totalAmount) !!}
+                    <td>
+                        <p class="sales-information-text">
+                            {{ $invoice->formattedInvoiceDate }} ({{ $invoice->invoice_number }})
+                        </p>
+                    </td>
+                    <td>
+                        <p class="sales-amount">
+                            {!! format_money_pdf($invoice->base_total, $currency) !!}
                        </p>
                    </td>
                </tr>
+                @endforeach
            </table>
+        </div>
+        <table class="sales-total-indicator-table">
+            <tr>
+                <td class="sales-total-cell">
+                    <p class="sales-total-amount">
+                        {!! format_money_pdf($customer->totalAmount, $currency) !!}
+                    </p>
+                </td>
+            </tr>
+        </table>
        @endforeach
    </div>

@ -195,10 +202,11 @@
            </td>
            <td>
                <p class="report-footer-value">
-                    {!! format_money_pdf($totalAmount) !!}
+                    {!! format_money_pdf($totalAmount, $currency) !!}
                </p>
            </td>
        </tr>
    </table>
 </body>
+
 </html>
--- a/resources/views/app/pdf/reports/sales-items.blade.php
+++ b/resources/views/app/pdf/reports/sales-items.blade.php
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <title>@lang('pdf_sales_items_label')</title>
    <style type="text/css">
@ -11,7 +12,7 @@
            border-collapse: collapse;
        }

-        .sub-container{
+        .sub-container {
            padding: 0px 20px;
        }

@ -132,11 +133,17 @@
            line-height: 21px;
            color: #5851D8;
        }
+
        .text-center {
            text-align: center;
        }
    </style>
+
+    @if (App::isLocale('th'))
+    @include('app.pdf.locale.th')
+    @endif
 </head>
+
 <body>
    <div class="sub-container">
        <table class="report-header">
@ -157,33 +164,33 @@

        <p class="sales-items-title">@lang('pdf_items_label')</p>
        @foreach ($items as $item)
-            <div class="items-table-container">
-                <table class="items-table">
-                    <tr>
-                        <td>
-                            <p class="item-title">
-                                {{ $item->name }}
-                            </p>
-                        </td>
-                        <td>
-                            <p class="item-sales-amount">
-                                {!! format_money_pdf($item->total_amount) !!}
-                            </p>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        @endforeach
-
-            <table class="sales-total-indicator-table">
+        <div class="items-table-container">
+            <table class="items-table">
                <tr>
-                    <td class="sales-total-cell">
-                        <p class="sales-total-amount">
-                            {!! format_money_pdf($totalAmount) !!}
+                    <td>
+                        <p class="item-title">
+                            {{ $item->name }}
+                        </p>
+                    </td>
+                    <td>
+                        <p class="item-sales-amount">
+                            {!! format_money_pdf($item->total_amount, $currency) !!}
                        </p>
                    </td>
                </tr>
            </table>
+        </div>
+        @endforeach
+
+        <table class="sales-total-indicator-table">
+            <tr>
+                <td class="sales-total-cell">
+                    <p class="sales-total-amount">
+                        {!! format_money_pdf($totalAmount, $currency) !!}
+                    </p>
+                </td>
+            </tr>
+        </table>
    </div>


@ -194,10 +201,11 @@
            </td>
            <td>
                <p class="report-footer-value">
-                    {!! format_money_pdf($totalAmount) !!}
+                    {!! format_money_pdf($totalAmount, $currency) !!}
                </p>
            </td>
        </tr>
    </table>
 </body>
+
 </html>
--- a/resources/views/app/pdf/reports/tax-summary.blade.php
+++ b/resources/views/app/pdf/reports/tax-summary.blade.php
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
    <title>@lang('pdf_tax_summery_label')</title>
    <style type="text/css">
@ -11,7 +12,7 @@
            border-collapse: collapse;
        }

-        .sub-container{
+        .sub-container {
            padding: 0px 20px;
        }

@ -134,7 +135,12 @@
            color: #5851D8;
        }
    </style>
+
+    @if (App::isLocale('th'))
+    @include('app.pdf.locale.th')
+    @endif
 </head>
+
 <body>
    <div class="sub-container">
        <table class="report-header">
@ -160,18 +166,18 @@
        <div class="tax-table-container">
            <table class="tax-table">
                @foreach ($taxTypes as $tax)
-                    <tr>
-                        <td>
-                            <p class="tax-title">
-                                {{ $tax->taxType->name }}
-                            </p>
-                        </td>
-                        <td>
-                            <p class="tax-amount">
-                                {!! format_money_pdf($tax->total_tax_amount) !!}
-                            </p>
-                        </td>
-                    </tr>
+                <tr>
+                    <td>
+                        <p class="tax-title">
+                            {{ $tax->taxType->name }}
+                        </p>
+                    </td>
+                    <td>
+                        <p class="tax-amount">
+                            {!! format_money_pdf($tax->total_tax_amount, $currency) !!}
+                        </p>
+                    </td>
+                </tr>
                @endforeach

            </table>
@ -182,7 +188,7 @@
        <tr>
            <td class="tax-total-cell">
                <p class="tax-total">
-                    {!! format_money_pdf($totalTaxAmount) !!}
+                    {!! format_money_pdf($totalTaxAmount, $currency) !!}
                </p>
            </td>
        </tr>
@ -194,10 +200,11 @@
            </td>
            <td>
                <p class="report-footer-value">
-                    {!! format_money_pdf($totalTaxAmount) !!}
+                    {!! format_money_pdf($totalTaxAmount, $currency) !!}
                </p>
            </td>
        </tr>
    </table>
 </body>
+
 </html>
--- a/storage/fonts/.gitkeep
+++ b/storage/fonts/.gitkeep
--- a/uffizzi/.env.example
+++ b/uffizzi/.env.example
@ -0,0 +1,40 @@
+APP_ENV=production
+APP_KEY=base64:kgk/4DW1vEVy7aEvet5FPp5un6PIGe/so8H0mvoUtW0=
+APP_DEBUG=true
+APP_LOG_LEVEL=debug
+APP_URL=http://crater.test
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=crater
+DB_USERNAME=crater
+DB_PASSWORD=crater
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_DRIVER=sync
+SESSION_DRIVER=cookie
+SESSION_LIFETIME=1440
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=
+MAIL_PORT=
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=
+
+PUSHER_APP_ID=
+PUSHER_KEY=
+PUSHER_SECRET=
+
+SANCTUM_STATEFUL_DOMAINS=crater.test
+SESSION_DOMAIN=crater.test
+
+TRUSTED_PROXIES="*"
+
+CRON_JOB_AUTH_TOKEN=""
--- a/uffizzi/Dockerfile
+++ b/uffizzi/Dockerfile
@ -0,0 +1,48 @@
+FROM php:8.1-fpm
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    zip \
+    unzip \
+    libzip-dev \
+    libmagickwand-dev \
+    mariadb-client
+
+# Clear cache
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN pecl install imagick \
+    && docker-php-ext-enable imagick
+
+# Install PHP extensions
+RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Create system user to run Composer and Artisan Commands
+RUN useradd -G www-data,root -u 1000 -d /home/crater-user crater-user
+RUN mkdir -p /home/crater-user/.composer && \
+    chown -R crater-user:crater-user /home/crater-user
+
+# Mounted volumes
+COPY ./ /var/www
+COPY ./docker-compose/php/uploads.ini /usr/local/etc/php/conf.d/uploads.ini
+COPY ./uffizzi/.env.example /var/www/.env
+
+# Set working directory
+WORKDIR /var/www
+
+RUN chown -R crater-user:crater-user ./
+RUN chmod -R 775 composer.json composer.lock \ 
+        composer.lock storage/framework/ \
+        storage/logs/ bootstrap/cache/ /home/crater-user/.composer
+RUN chown -R $(whoami):$(whoami) /var/log/
+RUN chmod -R 775 /var/log
+
+USER crater-user
--- a/uffizzi/crond/Dockerfile
+++ b/uffizzi/crond/Dockerfile
@ -0,0 +1,68 @@
+FROM php:8.1-fpm as build
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    curl \
+    libpng-dev \
+    libonig-dev \
+    libxml2-dev \
+    zip \
+    unzip \
+    libzip-dev \
+    libmagickwand-dev \
+    mariadb-client
+
+# Clear cache
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN pecl install imagick \
+    && docker-php-ext-enable imagick
+
+# Install PHP extensions
+RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd
+
+# Get latest Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Create system user to run Composer and Artisan Commands
+RUN useradd -G www-data,root -u 1000 -d /home/crater-user crater-user
+RUN mkdir -p /home/crater-user/.composer && \
+    chown -R crater-user:crater-user /home/crater-user
+
+# Mounted volumes
+COPY ./ /var/www
+COPY ./docker-compose/php/uploads.ini /usr/local/etc/php/conf.d/uploads.ini
+COPY ./uffizzi/.env.example /var/www/.env
+
+# Set working directory
+WORKDIR /var/www
+
+RUN chown -R crater-user:crater-user ./
+RUN chmod -R 775 composer.json composer.lock \ 
+        composer.lock storage/framework/ \
+        storage/logs/ bootstrap/cache/ /home/crater-user/.composer
+
+RUN composer config --no-plugins allow-plugins.pestphp/pest-plugin true && \
+    composer install --no-interaction --prefer-dist --optimize-autoloader && \
+    php artisan storage:link || true && \
+    php artisan key:generate
+
+FROM php:8.0-fpm-alpine
+
+RUN apk add --no-cache \
+    php8-bcmath
+
+RUN docker-php-ext-install pdo pdo_mysql bcmath
+
+COPY docker-compose/crontab /etc/crontabs/root
+
+# Mounted volumes
+COPY --from=build /var/www /var/www
+
+RUN chown -R $(whoami):$(whoami) /var/www/
+RUN chmod -R 775 /var/www/
+RUN chown -R $(whoami):$(whoami) /var/log/
+RUN chmod -R 775 /var/log/
+
+CMD ["crond", "-f"]
--- a/uffizzi/docker-compose.uffizzi.yml
+++ b/uffizzi/docker-compose.uffizzi.yml
@ -0,0 +1,58 @@
+version: '3'
+
+x-uffizzi:
+  ingress:
+    service: nginx
+    port: 80
+
+services:
+  app:
+    image: "${APP_IMAGE}"
+    restart: unless-stopped
+    working_dir: /var/www/
+    command: ["-c","
+            composer config --no-plugins allow-plugins.pestphp/pest-plugin true && 
+            composer install --no-interaction --prefer-dist --optimize-autoloader && 
+            php artisan storage:link || true && 
+            php artisan key:generate --force && 
+            php-fpm",
+            ]
+    entrypoint: /bin/sh
+    depends_on:
+      - db
+    deploy:
+      resources:
+        limits:
+          memory: 1000m
+
+  db:
+    image: mariadb
+    restart: always
+    environment:
+      MYSQL_USER: crater
+      MYSQL_PASSWORD: crater
+      MYSQL_DATABASE: crater
+      MYSQL_ROOT_PASSWORD: crater
+    ports:
+      - '33006:3306'
+    deploy:
+      resources:
+        limits:
+          memory: 500m
+
+  nginx:
+    image: "${NGINX_IMAGE}"
+    restart: unless-stopped
+    ports:
+      - 80:80
+    depends_on:
+      - app
+    resources:
+      limits:
+        memory: 500m
+
+  cron:
+    image: "${CROND_IMAGE}"
+    restart: always
+    
+
--- a/uffizzi/nginx/Dockerfile
+++ b/uffizzi/nginx/Dockerfile
@ -0,0 +1,7 @@
+FROM nginx:1.17-alpine
+
+RUN rm /etc/nginx/conf.d/default.conf
+
+COPY ./ /var/www
+COPY ./uffizzi/nginx/nginx /etc/nginx/conf.d/
+
--- a/uffizzi/nginx/nginx/nginx.conf
+++ b/uffizzi/nginx/nginx/nginx.conf
@ -0,0 +1,22 @@
+server {
+    client_max_body_size 64M;
+    listen 80;
+    index index.php index.html;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    root /var/www/public;
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass localhost:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_read_timeout 300;
+    }
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+        gzip_static on;
+    }
+}
--- a/yarn.lock
+++ b/yarn.lock
@ -367,6 +367,11 @@
  resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.17.tgz#2280ea4e8c50189c2729814d2ae484e58c712a36"
  integrity sha512-+WRd0RuCK4+jFKNVN+4rHTa5VMqqGDO2uc+TknkqhFqWp/z96OAGlpHJOwPrnW1fLbpjEBBQIr1vVYSw6KgcZg==

+"@tiptap/extension-text-align@^2.0.0-beta.29":
+  version "2.0.0-beta.202"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-text-align/-/extension-text-align-2.0.0-beta.202.tgz#37c73e884fb0d9ebe2a519d398b2da52672b7a4b"
+  integrity sha512-cB5SBKRTn730BBwtPQaKfc7uYgI7bGuD1UbsdF8UY93vIsRjdRO4McNlvgfDrb8WrD460PsOOXx18YwX1+3T/Q==
+
 "@tiptap/extension-text@^2.0.0-beta.13":
  version "2.0.0-beta.13"
  resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.13.tgz#da0af8d9a3f149d20076e15d88c6af21fb6d940f"
@ -1061,7 +1066,7 @@ commander@^6.0.0:
 concat-map@0.0.1:
  version "0.0.1"
  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==

 core-js@^3.6.5:
  version "3.18.1"
@ -2001,9 +2006,9 @@ mini-svg-data-uri@^1.2.3, mini-svg-data-uri@^1.3.3:
  integrity sha512-+fA2oRcR1dJI/7ITmeQJDrYWks0wodlOz0pAEhKYJ2IVc1z0AnwJUsKY2fzFmPAM3Jo9J0rBx8JAA9QQSJ5PuA==

 minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
  dependencies:
    brace-expansion "^1.1.7"
Author	SHA1	Message	Date
dependabot[bot]	55abd6d9d9	Bump minimatch from 3.0.4 to 3.1.2 Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-11-21 13:06:47 +00:00
Aramayis	7447cc24f9	feat: uffizzi integration (#1091 ) Co-authored-by: Aramayis <>	2022-11-21 18:35:59 +05:30
Neil Clack	889d22d92c	Update php version (#1083 ) Version 7.4 no longer works when running docker-compose/setup.sh. Updated to 8.1 in Dockerfile. Issue is now resolved and Crater sets up as expected without version conflicts.	2022-11-03 19:29:16 +05:30
HarshJagad20	bc8f2cd484	fix tax issue (#953 ) * fix tax issue * remove console log * update cs fixer package	2022-10-26 19:51:36 +05:30
Dhruv Bhatt	4e47f58bad	fixed - No query results for model [Crater\Models\Currency] (#1070 ) * fixed report pdf issue * Removed telescope service provider file	2022-10-26 19:33:25 +05:30
Mohit Panjwani	d8c429912e	fix composer issue with pest	2022-10-17 13:04:27 +05:30
Olivier Chemla	0aaf0e7e75	Adding object-fit rules so thumbnail image does not appear stretched. (#1065 )	2022-10-13 23:44:39 +05:30
Aramayis	3d0b89bb4d	bug: fix missing hyphen in setup.sh (#1067 ) Co-authored-by: Aramayis <>	2022-10-13 23:40:07 +05:30
albeanski	38c4b9ebce	Patch setup.sh script to deploy without plugins error. (#1034 )	2022-09-13 14:52:51 +05:30
Bram	7be59e78e0	Formatting + Netherlands rename (#973 ) * Formatting + Netherlands rename * Revert change	2022-07-09 20:03:08 +05:30
Ritthikrai W	204483836a	🌐Update: support Thai language (#768 ) * add thai language config * update thai translation * update thai translation * add THSarabunNew fonts to using in pdf * update: pdf file to support thai language by checking isLocale('th') and include thai font-family * update: thai translation * remove the index.php file (not used) * move THSarabunNew fonts to resoureces/static/fonts * Add .gitkeep to storage/fonts to pre-build the fonts directory Co-authored-by: Ritthikrai (Champ) Wiengchai <ritthikrai.w@aware.co.th>	2022-06-15 18:17:36 +05:30
dependabot[bot]	33bc9ded65	Bump guzzlehttp/guzzle from 7.4.1 to 7.4.3 (#936 ) Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.1 to 7.4.3. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/7.4.1...7.4.3) --- updated-dependencies: - dependency-name: guzzlehttp/guzzle dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-06-05 14:10:27 +05:30
edumicro	4271ef451e	Php 8 compliant (#914 )	2022-06-05 14:09:42 +05:30
Jack Bailey	6eb44fba93	Update cron.dockerfile (#949 )	2022-06-05 14:09:11 +05:30
Bram	96e7300583	Make unit clearable (#918 )	2022-05-28 11:55:09 +05:30
Kai Gohegan	a479d966d1	Update en.json (#925 ) Corrected sentence case from "Expiry date" to "Expiry Date"	2022-05-28 11:54:32 +05:30