Merge branch 'master' of https://github.com/bytefury/crater

.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
+

.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

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.1-fpm
 
 # Arguments defined in docker-compose.yml
 ARG user

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.
+     * Handle the incoming request.
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
+     * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
+     * @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');

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.
+     * Handle the incoming request.
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
+     * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
+     * @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');
 

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.
+     * Handle the incoming request.
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
+     * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
+     * @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');
 

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.
+     * Handle the incoming request.
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
+     * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
+     * @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');
 

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.
+     * Handle the incoming request.
-    *
+     *
-    * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
-    * @param  string  $hash
+     * @param  string  $hash
-    * @return \Illuminate\Http\JsonResponse
+     * @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');

composer.json

@@ -38,7 +38,7 @@
     "barryvdh/laravel-ide-helper": "^2.6",
     "beyondcode/laravel-dump-server": "^1.0",
     "facade/ignition": "^2.3.6",
-    "friendsofphp/php-cs-fixer": "^3.0",
+    "friendsofphp/php-cs-fixer": "^3.8",
     "fakerphp/faker": "^1.9.1",
     "mockery/mockery": "^1.3.1",
     "nunomaduro/collision": "^5.0",
@@ -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": {

docker-compose/setup.sh

@@ -1,6 +1,5 @@
 #!/bin/sh
 
-docker-compose exec app composer config --no-plugins allow-plugins.pestphp/pest-plugin true
 docker-compose exec app composer install --no-interaction --prefer-dist --optimize-autoloader
 
 docker-compose exec app php artisan storage:link || true

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="
+                  class="flex items-center justify-center w-5 h-5 mt-2 mr-2 text-gray-300 cursor-move  handle"
-                    flex
-                    items-center
-                    justify-center
-                    w-5
-                    h-5
-                    mt-2
-                    text-gray-300
-                    cursor-move
-                    handle
-                    mr-2
-                  "
                 >
                   <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>

resources/scripts/admin/components/estimate-invoice-common/CreateItemRowTax.vue

@@ -30,24 +30,13 @@
         <template v-if="userStore.hasAbilities(ability)" #action>
           <button
             type="button"
-            class="
+            class="flex items-center justify-center w-full px-2 py-2 bg-gray-200 border-none outline-none cursor-pointer "
-              flex
-              items-center
-              justify-center
-              w-full
-              px-2
-              cursor-pointer
-              py-2
-              bg-gray-200
-              border-none
-              outline-none
-            "
             @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) {
+  if (localTax.compound_tax && props.discountedTotal) {
-    return ((props.total + props.totalTax) * localTax.percent) / 100
+    return ((props.discountedTotal + props.totalTax) * localTax.percent) / 100
   }
 
-  if (props.total && localTax.percent) {
+  if (props.discountedTotal && localTax.percent) {
-    return (props.total * localTax.percent) / 100
+    return (props.discountedTotal * localTax.percent) / 100
   }
 
   return 0
 })
 
 watch(
-  () => props.total,
+  () => props.discountedTotal,
   () => {
     updateRowTax()
   }

resources/scripts/admin/components/estimate-invoice-common/CreateTotal.vue

@@ -29,14 +29,7 @@
 
       <label
         v-else
-        class="
+        class="flex items-center justify-center m-0 text-lg text-black uppercase "
-          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="
+        class="flex items-center justify-center m-0 text-lg text-black uppercase "
-          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="
+      class="flex items-center justify-between w-full pt-2 mt-5 border-t border-gray-200 border-solid "
-        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="
+        class="flex items-center justify-center text-lg uppercase  text-primary-400"
-          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) *

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

@@ -133,11 +133,10 @@
             line-height: 21px;
             color: #5851D8;
         }
-
     </style>
 
     @if (App::isLocale('th'))
-        @include('app.pdf.locale.th')
+    @include('app.pdf.locale.th')
     @endif
 </head>
 
@@ -162,18 +161,18 @@
         <div class="expenses-table-container">
             <table class="expenses-table">
                 @foreach ($expenseCategories as $expenseCategory)
-                    <tr>
+                <tr>
-                        <td>
+                    <td>
-                            <p class="expense-title">
+                        <p class="expense-title">
-                                {{ $expenseCategory->category->name }}
+                            {{ $expenseCategory->category->name }}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                        <td>
+                    <td>
-                            <p class="expense-amount">
+                        <p class="expense-amount">
-                                {!! format_money_pdf($expenseCategory->total_amount) !!}
+                            {!! format_money_pdf($expenseCategory->total_amount, $currency) !!}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                    </tr>
+                </tr>
                 @endforeach
             </table>
         </div>
@@ -182,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>
@@ -192,10 +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>
+</html>

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

@@ -158,11 +158,10 @@
             line-height: 21px;
             color: #5851D8;
         }
-
     </style>
 
     @if (App::isLocale('th'))
-        @include('app.pdf.locale.th')
+    @include('app.pdf.locale.th')
     @endif
 </head>
 
@@ -190,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>
@@ -198,18 +197,18 @@
         <div class="expenses-table-container">
             <table class="expenses-table">
                 @foreach ($expenseCategories as $expenseCategory)
-                    <tr>
+                <tr>
-                        <td>
+                    <td>
-                            <p class="expense-title">
+                        <p class="expense-title">
-                                {{ $expenseCategory->category->name }}
+                            {{ $expenseCategory->category->name }}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                        <td>
+                    <td>
-                            <p class="expense-amount">
+                        <p class="expense-amount">
-                                {!! format_money_pdf($expenseCategory->total_amount) !!}
+                            {!! format_money_pdf($expenseCategory->total_amount, $currency) !!}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                    </tr>
+                </tr>
                 @endforeach
 
             </table>
@@ -219,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>
@@ -229,10 +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>
+</html>

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

@@ -137,11 +137,10 @@
         .text-center {
             text-align: center;
         }
-
     </style>
 
     @if (App::isLocale('th'))
-        @include('app.pdf.locale.th')
+    @include('app.pdf.locale.th')
     @endif
 </head>
 
@@ -164,34 +163,34 @@
         </table>
 
         @foreach ($customers as $customer)
-            <p class="sales-customer-name">{{ $customer->name }}</p>
+        <p class="sales-customer-name">{{ $customer->name }}</p>
-            <div class="sales-table-container">
+        <div class="sales-table-container">
-                <table class="sales-table">
+            <table class="sales-table">
-                    @foreach ($customer->invoices as $invoice)
+                @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">
                 <tr>
-                    <td class="sales-total-cell">
+                    <td>
-                        <p class="sales-total-amount">
+                        <p class="sales-information-text">
-                            {!! format_money_pdf($customer->totalAmount) !!}
+                            {{ $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>
 
@@ -203,11 +202,11 @@
             </td>
             <td>
                 <p class="report-footer-value">
-                    {!! format_money_pdf($totalAmount) !!}
+                    {!! format_money_pdf($totalAmount, $currency) !!}
                 </p>
             </td>
         </tr>
     </table>
 </body>
 
-</html>
+</html>

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

@@ -137,11 +137,10 @@
         .text-center {
             text-align: center;
         }
-
     </style>
 
     @if (App::isLocale('th'))
-        @include('app.pdf.locale.th')
+    @include('app.pdf.locale.th')
     @endif
 </head>
 
@@ -165,29 +164,29 @@
 
         <p class="sales-items-title">@lang('pdf_items_label')</p>
         @foreach ($items as $item)
-            <div class="items-table-container">
+        <div class="items-table-container">
-                <table class="items-table">
+            <table class="items-table">
-                    <tr>
+                <tr>
-                        <td>
+                    <td>
-                            <p class="item-title">
+                        <p class="item-title">
-                                {{ $item->name }}
+                            {{ $item->name }}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                        <td>
+                    <td>
-                            <p class="item-sales-amount">
+                        <p class="item-sales-amount">
-                                {!! format_money_pdf($item->total_amount) !!}
+                            {!! format_money_pdf($item->total_amount, $currency) !!}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                    </tr>
+                </tr>
-                </table>
+            </table>
-            </div>
+        </div>
         @endforeach
 
         <table class="sales-total-indicator-table">
             <tr>
                 <td class="sales-total-cell">
                     <p class="sales-total-amount">
-                        {!! format_money_pdf($totalAmount) !!}
+                        {!! format_money_pdf($totalAmount, $currency) !!}
                     </p>
                 </td>
             </tr>
@@ -202,11 +201,11 @@
             </td>
             <td>
                 <p class="report-footer-value">
-                    {!! format_money_pdf($totalAmount) !!}
+                    {!! format_money_pdf($totalAmount, $currency) !!}
                 </p>
             </td>
         </tr>
     </table>
 </body>
 
-</html>
+</html>

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

@@ -134,11 +134,10 @@
             line-height: 21px;
             color: #5851D8;
         }
-
     </style>
 
     @if (App::isLocale('th'))
-        @include('app.pdf.locale.th')
+    @include('app.pdf.locale.th')
     @endif
 </head>
 
@@ -167,18 +166,18 @@
         <div class="tax-table-container">
             <table class="tax-table">
                 @foreach ($taxTypes as $tax)
-                    <tr>
+                <tr>
-                        <td>
+                    <td>
-                            <p class="tax-title">
+                        <p class="tax-title">
-                                {{ $tax->taxType->name }}
+                            {{ $tax->taxType->name }}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                        <td>
+                    <td>
-                            <p class="tax-amount">
+                        <p class="tax-amount">
-                                {!! format_money_pdf($tax->total_tax_amount) !!}
+                            {!! format_money_pdf($tax->total_tax_amount, $currency) !!}
-                            </p>
+                        </p>
-                        </td>
+                    </td>
-                    </tr>
+                </tr>
                 @endforeach
 
             </table>
@@ -189,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>
@@ -201,11 +200,11 @@
             </td>
             <td>
                 <p class="report-footer-value">
-                    {!! format_money_pdf($totalTaxAmount) !!}
+                    {!! format_money_pdf($totalTaxAmount, $currency) !!}
                 </p>
             </td>
         </tr>
     </table>
 </body>
 
-</html>
+</html>

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=""

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

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"]

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
+    
+

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/
+

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;
+    }
+}