add dark mode in base select action

* add dark mode in sidebar and header

* add dark theme in blade file

.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/Customer/CustomerStatsController.php

@@ -103,6 +103,7 @@ class CustomerStatsController extends Controller
         )
             ->whereCompany()
             ->whereCustomer($customer->id)
+            ->where('status', '<>', Invoice::STATUS_DRAFT)
             ->sum('total');
         $totalReceipts = Payment::whereBetween(
             'payment_date',

app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php

@@ -104,6 +104,7 @@ class DashboardController extends Controller
             'invoice_date',
             [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
         )
+            ->where('status', '<>', Invoice::STATUS_DRAFT)
             ->whereCompany()
             ->sum('base_total');
 
@@ -141,6 +142,7 @@ class DashboardController extends Controller
         $recent_due_invoices = Invoice::with('customer')
             ->whereCompany()
             ->where('base_due_amount', '>', 0)
+            ->where('status', '<>', Invoice::STATUS_DRAFT)
             ->take(5)
             ->latest()
             ->get();

app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php

@@ -24,6 +24,7 @@ class InvoicesController extends Controller
         $limit = $request->has('limit') ? $request->limit : 10;
 
         $invoices = Invoice::whereCompany()
+            ->whereTabFilters($request->tab_status)
             ->join('customers', 'customers.id', '=', 'invoices.customer_id')
             ->applyFilters($request->all())
             ->select('invoices.*', 'customers.name')

app/Http/Requests/CompaniesRequest.php

@@ -3,7 +3,6 @@
 namespace Crater\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
 class CompaniesRequest extends FormRequest
@@ -34,6 +33,10 @@ class CompaniesRequest extends FormRequest
             'currency' => [
                 'required'
             ],
+            'slug' => [
+                'required',
+                Rule::unique('companies')
+            ],
             'address.name' => [
                 'nullable',
             ],
@@ -68,11 +71,11 @@ class CompaniesRequest extends FormRequest
     {
         return collect($this->validated())
             ->only([
-                'name'
+                'name',
+                'slug'
             ])
             ->merge([
-                'owner_id' => $this->user()->id,
-                'slug' => Str::slug($this->name)
+                'owner_id' => $this->user()->id
             ])
             ->toArray();
     }

app/Http/Requests/CompanyRequest.php

@@ -30,7 +30,8 @@ class CompanyRequest extends FormRequest
                 Rule::unique('companies')->ignore($this->header('company'), 'id'),
             ],
             'slug' => [
-                'nullable'
+                'required',
+                Rule::unique('companies')->ignore($this->header('company'), 'id'),
             ],
             'address.country_id' => [
                 'required',

app/Http/Resources/EstimateResource.php

@@ -23,7 +23,7 @@ class EstimateResource extends JsonResource
             'reference_number' => $this->reference_number,
             'tax_per_item' => $this->tax_per_item,
             'discount_per_item' => $this->discount_per_item,
-            'notes' => $this->getNotes(),
+            'notes' => $this->notes,
             'discount' => $this->discount,
             'discount_type' => $this->discount_type,
             'discount_val' => $this->discount_val,

app/Http/Resources/PaymentResource.php

@@ -18,7 +18,7 @@ class PaymentResource extends JsonResource
             'id' => $this->id,
             'payment_number' => $this->payment_number,
             'payment_date' => $this->payment_date,
-            'notes' => $this->getNotes(),
+            'notes' => $this->notes,
             'amount' => $this->amount,
             'unique_hash' => $this->unique_hash,
             'invoice_id' => $this->invoice_id,

app/Models/Company.php

@@ -217,7 +217,7 @@ class Company extends Model implements HasMedia
             'estimate_billing_address_format' => $billingAddressFormat,
             'payment_company_address_format' => $companyAddressFormat,
             'payment_from_customer_address_format' => $paymentFromCustomerAddress,
-            'currency' => request()->currency ?? 13,
+            'currency' => request()->currency ?? 1,
             'time_zone' => 'Asia/Kolkata',
             'language' => 'en',
             'fiscal_year' => '1-12',

app/Models/Estimate.php

@@ -483,7 +483,8 @@ class Estimate extends Model implements HasMedia
             '{ESTIMATE_DATE}' => $this->formattedEstimateDate,
             '{ESTIMATE_EXPIRY_DATE}' => $this->formattedExpiryDate,
             '{ESTIMATE_NUMBER}' => $this->estimate_number,
-            '{ESTIMATE_REF_NUMBER}' => $this->reference_number,
+            '{PDF_LINK}' => $this->estimatePdfUrl,
+            '{TOTAL_AMOUNT}' => format_money_pdf($this->total, $this->customer->currency)
         ];
     }
 

app/Models/Expense.php

@@ -240,7 +240,7 @@ class Expense extends Model implements HasMedia
         }
 
         if ($request->hasFile('attachment_receipt')) {
-            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
+            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts', 'local');
         }
 
         if ($request->customFields) {
@@ -262,12 +262,12 @@ class Expense extends Model implements HasMedia
             ExchangeRateLog::addExchangeRateLog($this);
         }
 
-        if (isset($request->is_attachment_receipt_removed) && (bool) $request->is_attachment_receipt_removed) {
+        if (isset($request->is_attachment_receipt_removed) && $request->is_attachment_receipt_removed == "true") {
             $this->clearMediaCollection('receipts');
         }
         if ($request->hasFile('attachment_receipt')) {
             $this->clearMediaCollection('receipts');
-            $this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
+            $this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts', 'local');
         }
 
         if ($request->customFields) {

app/Models/Invoice.php

@@ -187,16 +187,6 @@ class Invoice extends Model implements HasMedia
         return Carbon::parse($this->invoice_date)->format($dateFormat);
     }
 
-    public function scopeWhereStatus($query, $status)
-    {
-        return $query->where('invoices.status', $status);
-    }
-
-    public function scopeWherePaidStatus($query, $status)
-    {
-        return $query->where('invoices.paid_status', $status);
-    }
-
     public function scopeWhereDueStatus($query, $status)
     {
         return $query->whereIn('invoices.paid_status', [
@@ -234,6 +224,40 @@ class Invoice extends Model implements HasMedia
         $query->orderBy($orderByField, $orderBy);
     }
 
+    public function scopeWhereStatus($query, $status)
+    {
+        return $query->where('invoices.status', $status);
+    }
+
+    public function scopeWherePaidStatus($query, $status)
+    {
+        return $query->where('invoices.paid_status', $status);
+    }
+
+    public function scopeWhereTabFilters($query, $status)
+    {
+        if ($status == "DRAFT") {
+            return $query->where('invoices.status', $status);
+        }
+
+        if ($status == "SENT") {
+            return $query->whereIn('invoices.status', [
+                self::STATUS_SENT,
+                self::STATUS_VIEWED,
+                self::STATUS_COMPLETED
+            ]);
+        }
+
+        if ($status == 'DUE') {
+            return $query->whereIn('invoices.paid_status', [
+                self::STATUS_UNPAID,
+                self::STATUS_PARTIALLY_PAID,
+            ]);
+        }
+
+        return ;
+    }
+
     public function scopeApplyFilters($query, array $filters)
     {
         $filters = collect($filters);
@@ -249,17 +273,11 @@ class Invoice extends Model implements HasMedia
                 $filters->get('status') == self::STATUS_PAID
             ) {
                 $query->wherePaidStatus($filters->get('status'));
-            } elseif ($filters->get('status') == 'DUE') {
-                $query->whereDueStatus($filters->get('status'));
             } else {
                 $query->whereStatus($filters->get('status'));
             }
         }
 
-        if ($filters->get('paid_status')) {
-            $query->wherePaidStatus($filters->get('status'));
-        }
-
         if ($filters->get('invoice_id')) {
             $query->whereInvoice($filters->get('invoice_id'));
         }
@@ -651,7 +669,9 @@ class Invoice extends Model implements HasMedia
             '{INVOICE_DATE}' => $this->formattedInvoiceDate,
             '{INVOICE_DUE_DATE}' => $this->formattedDueDate,
             '{INVOICE_NUMBER}' => $this->invoice_number,
-            '{INVOICE_REF_NUMBER}' => $this->reference_number,
+            '{PDF_LINK}' => $this->invoicePdfUrl,
+            '{DUE_AMOUNT}' => format_money_pdf($this->due_amount, $this->customer->currency),
+            '{TOTAL_AMOUNT}' => format_money_pdf($this->total, $this->customer->currency)
         ];
     }
 

app/Models/Payment.php

@@ -435,7 +435,8 @@ class Payment extends Model implements HasMedia
             '{PAYMENT_DATE}' => $this->formattedPaymentDate,
             '{PAYMENT_MODE}' => $this->paymentMethod ? $this->paymentMethod->name : null,
             '{PAYMENT_NUMBER}' => $this->payment_number,
-            '{PAYMENT_AMOUNT}' => $this->reference_number,
+            '{PDF_LINK}' => $this->paymentPdfUrl,
+            '{PAYMENT_AMOUNT}' => format_money_pdf($this->amount, $this->customer->currency)
         ];
     }
 

package.json

@@ -27,7 +27,7 @@
     "vite": "^2.6.1"
   },
   "dependencies": {
-    "@headlessui/vue": "^1.4.0",
+    "@headlessui/vue": "^1.5.0",
     "@heroicons/vue": "^1.0.1",
     "@popperjs/core": "^2.9.2",
     "@stripe/stripe-js": "^1.21.2",
@@ -48,7 +48,8 @@
     "mini-svg-data-uri": "^1.3.3",
     "moment": "^2.29.1",
     "pinia": "^2.0.4",
-    "v-money3": "^3.13.5",
+    "v-calendar": "3.0.0-alpha.8",
+    "v-money3": "3.16.1",
     "v-tooltip": "^4.0.0-alpha.1",
     "vue": "^3.2.0-beta.5",
     "vue-flatpickr-component": "^9.0.3",

resources/scripts/admin/components/custom-fields/CreateCustomFields.vue

@@ -64,7 +64,7 @@ function mergeExistingValues() {
   if (props.isEdit) {
     props.store[props.storeProp].fields.forEach((field) => {
       const existingIndex = props.store[props.storeProp].customFields.findIndex(
-        (f) => f.id === field.custom_field_id
+        (f) => f.id == field.custom_field_id
       )
 
       if (existingIndex > -1) {

resources/scripts/admin/components/custom-fields/types/DateTimeType.vue

@@ -9,7 +9,7 @@ import { computed } from 'vue'
 const props = defineProps({
   modelValue: {
     type: String,
-    default: moment().format('YYYY-MM-DD hh:MM'),
+    default: moment().format('YYYY-MM-DD HH:mm'),
   },
 })
 

resources/scripts/admin/components/modal-components/CompanyModal.vue

@@ -48,6 +48,24 @@
             />
           </BaseInputGroup>
 
+          <BaseInputGroup
+            :label="$tc('settings.company_info.company_slug')"
+            :help-text="$t('settings.company_info.company_slug_help_text')"
+            :error="
+              v$.newCompanyForm.slug.$error &&
+              v$.newCompanyForm.slug.$errors[0].$message
+            "
+            :content-loading="isFetchingInitialData"
+            required
+          >
+            <BaseInput
+              v-model="newCompanyForm.slug"
+              :invalid="v$.newCompanyForm.slug.$error"
+              :content-loading="isFetchingInitialData"
+              @input="v$.newCompanyForm.slug.$touch()"
+            />
+          </BaseInputGroup>
+
           <BaseInputGroup
             :content-loading="isFetchingInitialData"
             :label="$tc('settings.company_info.country')"
@@ -130,7 +148,7 @@
 
 <script setup>
 import { useModalStore } from '@/scripts/stores/modal'
-import { computed, onMounted, ref, reactive } from 'vue'
+import { computed, onMounted, ref, reactive, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { required, minLength, helpers } from '@vuelidate/validators'
 import { useVuelidate } from '@vuelidate/core'
@@ -152,6 +170,7 @@ let companyLogoName = ref(null)
 
 const newCompanyForm = reactive({
   name: null,
+  slug: null,
   currency: '',
   address: {
     country_id: null,
@@ -162,6 +181,9 @@ const modalActive = computed(() => {
   return modalStore.active && modalStore.componentName === 'CompanyModal'
 })
 
+const slugValidator = (value) => {
+  return value == slugify(value)
+}
 const rules = {
   newCompanyForm: {
     name: {
@@ -171,6 +193,17 @@ const rules = {
         minLength(3)
       ),
     },
+    slug: {
+      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+      slugValidator: helpers.withMessage(
+        t('validation.invalid_slug'),
+        slugValidator
+      ),
+    },
     address: {
       country_id: {
         required: helpers.withMessage(t('validation.required'), required),
@@ -243,6 +276,7 @@ async function submitCompanyData() {
 
 function resetNewCompanyForm() {
   newCompanyForm.name = ''
+  newCompanyForm.slug = ''
   newCompanyForm.currency = ''
   newCompanyForm.address.country_id = ''
 
@@ -257,4 +291,24 @@ function closeCompanyModal() {
     v$.value.$reset()
   }, 300)
 }
+
+// watcher for if change company name then auto fill company slug value
+watch(
+  () => newCompanyForm.name,
+  (currentValue) => {
+    newCompanyForm.slug = slugify(currentValue)
+  }
+)
+
+function slugify(string) {
+  return string
+    .toString()
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^\w\-]+/g, '')
+    .replace(/\-\-+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '')
+}
 </script>

resources/scripts/admin/layouts/partials/TheSiteHeader.vue

@@ -15,6 +15,13 @@
       bg-gradient-to-r
       from-primary-500
       to-primary-400
+      dark:from-gray-700/70 dark:to-gray-800/70
+      bg-primary-500
+      dark:bg-transparent
+      dark:backdrop-blur-xl
+      dark:shadow-glass
+      dark:border
+      dark:border-white/10
     "
   >
     <router-link
@@ -53,6 +60,7 @@
         cursor-pointer
         md:hidden md:ml-0
         hover:bg-gray-100
+        dark:bg-gray-800 dark:border-gray-500 dark:border
       "
       @click.prevent="onToggle"
     >

resources/scripts/admin/layouts/partials/TheSiteSidebar.vue

@@ -15,7 +15,9 @@
         leave-from="opacity-100"
         leave-to="opacity-0"
       >
-        <DialogOverlay class="fixed inset-0 bg-gray-600 bg-opacity-75" />
+        <DialogOverlay
+          class="fixed inset-0 bg-gray-600 bg-opacity-75 dark:bg-gray-900/90"
+        />
       </TransitionChild>
 
       <TransitionChild
@@ -27,7 +29,9 @@
         leave-from="translate-x-0"
         leave-to="-translate-x-full"
       >
-        <div class="relative flex flex-col flex-1 w-full max-w-xs bg-white">
+        <div
+          class="relative flex flex-col flex-1 w-full max-w-xs bg-white dark:bg-gray-800"
+        >
           <TransitionChild
             as="template"
             enter="ease-in-out duration-300"
@@ -40,18 +44,17 @@
             <div class="absolute top-0 right-0 pt-2 -mr-12">
               <button
                 class="
-                  flex
-                  items-center
-                  justify-center
-                  w-10
-                  h-10
-                  ml-1
-                  rounded-full
-                  focus:outline-none
-                  focus:ring-2
-                  focus:ring-inset
-                  focus:ring-white
-                "
+                flex
+                items-center
+                justify-center
+                w-10
+                h-10
+                ml-1
+                rounded-full
+                focus:outline-none
+                focus:ring-2
+                focus:ring-inset
+                focus:ring-white"
                 @click="globalStore.setSidebarVisibility(false)"
               >
                 <span class="sr-only">Close sidebar</span>
@@ -82,8 +85,8 @@
                 :to="item.link"
                 :class="[
                   hasActiveUrl(item.link)
-                    ? 'text-primary-500 border-primary-500 bg-gray-100 '
-                    : 'text-black',
+                    ? 'text-primary-500 border-primary-500 bg-gray-100 dark:shadow-glass dark:backdrop-blur-xl dark:hover:bg-gray-700  dark:bg-gray-700/50 dark:text-primary-400 dark:font-medium'
+                    : 'text-black dark:text-gray-300',
                   'cursor-pointer px-0 pl-4 py-3 border-transparent flex items-center border-l-4 border-solid text-sm not-italic font-medium',
                 ]"
                 @click="globalStore.setSidebarVisibility(false)"
@@ -100,6 +103,10 @@
                 />
                 {{ $t(item.title) }}
               </router-link>
+              <LightDarkSwitch
+                :show-label="false"
+                class="absolute right-6 top-6 !w-auto"
+              />
             </nav>
           </div>
         </div>
@@ -113,17 +120,16 @@
   <!-- DESKTOP MENU -->
   <div
     class="
-      hidden
-      w-56
-      h-screen
-      pb-32
-      overflow-y-auto
-      bg-white
-      border-r border-gray-200 border-solid
-      xl:w-64
-      md:fixed md:flex md:flex-col md:inset-y-0
-      pt-16
-    "
+    hidden
+    w-56
+    h-screen
+    bg-white
+    border-r border-gray-200 border-solid
+    xl:w-64
+    md:fixed md:flex md:flex-col md:inset-y-0
+    pt-16
+    dark:border-gray-800
+    dark:bg-gray-800/80"
   >
     <div
       v-for="menu in globalStore.menuGroups"
@@ -136,8 +142,8 @@
         :to="item.link"
         :class="[
           hasActiveUrl(item.link)
-            ? 'text-primary-500 border-primary-500 bg-gray-100 '
-            : 'text-black',
+            ? 'text-primary-500 border-primary-500 bg-gray-100 dark:border-primary-400 dark:shadow-glass dark:backdrop-blur-xl dark:hover:bg-gray-700 dark:bg-gray-700/50 dark:text-primary-400 dark:font-medium'
+            : 'text-black dark:hover:bg-transparent dark:hover:text-white dark:text-gray-300',
           'cursor-pointer px-0 pl-6 hover:bg-gray-50 py-3 group flex items-center border-l-4 border-solid border-transparent text-sm not-italic font-medium',
         ]"
       >
@@ -145,8 +151,8 @@
           :name="item.icon"
           :class="[
             hasActiveUrl(item.link)
-              ? 'text-primary-500 group-hover:text-primary-500 '
-              : 'text-gray-400 group-hover:text-black',
+              ? 'text-primary-500 group-hover:text-primary-500 dark:text-primary-400 dark:group-hover:text-primary-500 '
+              : 'text-gray-400 group-hover:text-black dark:text-gray-400 dark:group-hover:text-white',
             'mr-4 shrink-0 h-5 w-5 ',
           ]"
         />
@@ -154,6 +160,9 @@
         {{ $t(item.title) }}
       </router-link>
     </div>
+    <LightDarkSwitch
+      class="absolute bottom-0 py-4 border-t border-gray-200 dark:border-gray-700"
+    />
   </div>
 </template>
 
@@ -169,6 +178,7 @@ import {
 
 import { useRoute } from 'vue-router'
 import { useGlobalStore } from '@/scripts/admin/stores/global'
+import LightDarkSwitch from '@/scripts/components/LightDarkSwitcher.vue'
 
 const route = useRoute()
 const globalStore = useGlobalStore()

resources/scripts/admin/stores/company.js

@@ -184,6 +184,20 @@ export const useCompanyStore = (useWindow = false) => {
       setDefaultCurrency(data) {
         this.defaultCurrency = data.currency
       },
+
+      checkCompanyHasCurrencyTransactions() {
+        return new Promise((resolve, reject) => {
+          axios
+            .get(`/api/v1/company/has-transactions`)
+            .then((response) => {
+              resolve(response)
+            })
+            .catch((err) => {
+              handleError(err)
+              reject(err)
+            })
+        })
+      },
     },
   })()
 }

resources/scripts/admin/stores/global.js

@@ -34,6 +34,7 @@ export const useGlobalStore = (useWindow = false) => {
       isAppLoaded: false,
       isSidebarOpen: false,
       areCurrenciesLoading: false,
+      isDarkModeOn: false,
 
       downloadReport: null,
     }),
@@ -70,8 +71,8 @@ export const useGlobalStore = (useWindow = false) => {
               moduleStore.apiToken = response.data.global_settings.api_token
               moduleStore.enableModules = response.data.modules
 
-                // company store
-                companyStore.companies = response.data.companies
+              // company store
+              companyStore.companies = response.data.companies
               companyStore.selectedCompany = response.data.current_company
               companyStore.setSelectedCompany(response.data.current_company)
               companyStore.selectedCompanySettings =

resources/scripts/admin/views/estimates/create/EstimateCreateBasicFields.vue

@@ -32,6 +32,8 @@
           :content-loading="isLoading"
           :calendar-button="true"
           calendar-button-icon="calendar"
+          :show-extra-options="true"
+          :source-date="estimateStore.newEstimate.estimate_date"
         />
       </BaseInputGroup>
 

resources/scripts/admin/views/installation/Step7CompanyInfo.vue

@@ -34,6 +34,24 @@
           />
         </BaseInputGroup>
 
+        <BaseInputGroup
+          :label="$tc('wizard.company_slug')"
+          :help-text="$t('wizard.company_slug_help_text')"
+          :error="
+            v$.companyForm.slug.$error &&
+            v$.companyForm.slug.$errors[0].$message
+          "
+          required
+        >
+          <BaseInput
+            v-model="companyForm.slug"
+            :invalid="v$.companyForm.slug.$error"
+            type="text"
+            name="slug"
+            @input="v$.companyForm.slug.$touch()"
+          />
+        </BaseInputGroup>
+
         <BaseInputGroup
           :label="$t('wizard.country')"
           :error="
@@ -57,9 +75,7 @@
             track-by="name"
           />
         </BaseInputGroup>
-      </div>
 
-      <div class="grid grid-cols-1 gap-4 mb-4 md:grid-cols-2 md:mb-6">
         <BaseInputGroup :label="$t('wizard.state')">
           <BaseInput
             v-model="companyForm.address.state"
@@ -144,9 +160,9 @@
 </template>
 
 <script setup>
-import { ref, computed, onMounted, reactive } from 'vue'
+import { ref, computed, onMounted, reactive, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { required, maxLength, helpers } from '@vuelidate/validators'
+import { required, minLength, maxLength, helpers } from '@vuelidate/validators'
 import { useVuelidate } from '@vuelidate/core'
 import { useGlobalStore } from '@/scripts/admin/stores/global'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
@@ -162,6 +178,7 @@ let logoFileName = ref(null)
 
 const companyForm = reactive({
   name: null,
+  slug: null,
   address: {
     address_street_1: '',
     address_street_2: '',
@@ -188,10 +205,28 @@ onMounted(async () => {
   })?.id
 })
 
+const slugValidator = (value) => {
+  return value == slugify(value)
+}
 const rules = {
   companyForm: {
     name: {
       required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+    },
+    slug: {
+      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+      slugValidator: helpers.withMessage(
+        t('validation.invalid_slug'),
+        slugValidator
+      ),
     },
     address: {
       country_id: {
@@ -249,4 +284,24 @@ async function next() {
     emit('next', 7)
   }
 }
+
+// watcher for if change company name then auto fill company slug value
+watch(
+  () => companyForm.name,
+  (currentValue) => {
+    companyForm.slug = slugify(currentValue)
+  }
+)
+
+function slugify(string) {
+  return string
+    .toString()
+    .trim()
+    .toLowerCase()
+    .replace(/\s+/g, '-')
+    .replace(/[^\w\-]+/g, '')
+    .replace(/\-\-+/g, '-')
+    .replace(/^-+/, '')
+    .replace(/-+$/, '')
+}
 </script>

resources/scripts/admin/views/invoices/Index.vue

@@ -56,7 +56,7 @@
         <BaseMultiselect
           v-model="filters.status"
           :groups="true"
-          :options="status"
+          :options="invoiceStatus"
           searchable
           :placeholder="$t('general.select_a_status')"
           @update:modelValue="setActiveTab"
@@ -130,11 +130,27 @@
         "
       >
         <!-- Tabs -->
-        <BaseTabGroup class="-mb-5" @change="setStatusFilter">
-          <BaseTab :title="$t('general.all')" filter="" />
-          <BaseTab :title="$t('general.draft')" filter="DRAFT" />
-          <BaseTab :title="$t('general.sent')" filter="SENT" />
-          <BaseTab :title="$t('general.due')" filter="DUE" />
+        <BaseTabGroup
+          class="-mb-5"
+          :selected-index="selectedIndex"
+          @change="changeTabStatus"
+        >
+          <BaseTab
+            :title="invoiceTabStatus[0].title"
+            :tab-status="invoiceTabStatus[0].value"
+          />
+          <BaseTab
+            :title="invoiceTabStatus[1].title"
+            :tab-status="invoiceTabStatus[1].value"
+          />
+          <BaseTab
+            :title="invoiceTabStatus[2].title"
+            :tab-status="invoiceTabStatus[2].value"
+          />
+          <BaseTab
+            :title="invoiceTabStatus[3].title"
+            :tab-status="invoiceTabStatus[3].value"
+          />
         </BaseTabGroup>
 
         <BaseDropdown
@@ -289,10 +305,10 @@ const utils = inject('$utils')
 const table = ref(null)
 const showFilters = ref(false)
 
-const status = ref([
+const invoiceStatus = ref([
   {
     label: 'Status',
-    options: ['DRAFT', 'DUE', 'SENT', 'VIEWED', 'COMPLETED'],
+    options: ['DRAFT', 'SENT', 'VIEWED', 'COMPLETED'],
   },
   {
     label: 'Paid Status',
@@ -300,10 +316,29 @@ const status = ref([
   },
   ,
 ])
+
+const invoiceTabStatus = {
+  0: {
+    title: t('general.all'),
+    value: '',
+  },
+  1: {
+    title: t('general.draft'),
+    value: 'DRAFT',
+  },
+  2: {
+    title: t('general.sent'),
+    value: 'SENT',
+  },
+  3: {
+    title: t('general.due'),
+    value: 'DUE',
+  },
+}
 const isRequestOngoing = ref(true)
-const activeTab = ref('general.draft')
 const router = useRouter()
 const userStore = useUserStore()
+const selectedIndex = ref(0)
 
 let filters = reactive({
   customer_id: '',
@@ -311,6 +346,7 @@ let filters = reactive({
   from_date: '',
   to_date: '',
   invoice_number: '',
+  tab_status: '',
 })
 
 const showEmptyScreen = computed(
@@ -401,6 +437,7 @@ async function fetchData({ page, filter, sort }) {
     from_date: filters.from_date,
     to_date: filters.to_date,
     invoice_number: filters.invoice_number,
+    tab_status: filters.tab_status,
     orderByField: sort.fieldName || 'created_at',
     orderBy: sort.order || 'desc',
     page,
@@ -423,29 +460,9 @@ async function fetchData({ page, filter, sort }) {
   }
 }
 
-function setStatusFilter(val) {
-  if (activeTab.value == val.title) {
-    return true
-  }
-
-  activeTab.value = val.title
-
-  switch (val.title) {
-    case t('general.draft'):
-      filters.status = 'DRAFT'
-      break
-    case t('general.sent'):
-      filters.status = 'SENT'
-      break
-
-    case t('general.due'):
-      filters.status = 'DUE'
-      break
-
-    default:
-      filters.status = ''
-      break
-  }
+function changeTabStatus(val, index) {
+  filters.tab_status = val['tab-status']
+  selectedIndex.value = index
 }
 
 function setFilters() {
@@ -463,8 +480,6 @@ function clearFilter() {
   filters.from_date = ''
   filters.to_date = ''
   filters.invoice_number = ''
-
-  activeTab.value = t('general.all')
 }
 
 async function removeMultipleInvoices() {
@@ -505,39 +520,21 @@ function toggleFilter() {
 function setActiveTab(val) {
   switch (val) {
     case 'DRAFT':
-      activeTab.value = t('general.draft')
+      selectedIndex.value = 1
       break
+
     case 'SENT':
-      activeTab.value = t('general.sent')
-      break
-
-    case 'DUE':
-      activeTab.value = t('general.due')
-      break
-
+    case 'VIEWED':
     case 'COMPLETED':
-      activeTab.value = t('invoices.completed')
-      break
-
     case 'PAID':
-      activeTab.value = t('invoices.paid')
+      selectedIndex.value = 2
       break
 
     case 'UNPAID':
-      activeTab.value = t('invoices.unpaid')
-      break
-
     case 'PARTIALLY_PAID':
-      activeTab.value = t('invoices.partially_paid')
-      break
-
-    case 'VIEWED':
-      activeTab.value = t('invoices.viewed')
-      break
-
-    default:
-      activeTab.value = t('general.all')
+      selectedIndex.value = 3
       break
   }
+  filters.tab_status = invoiceTabStatus[selectedIndex.value].value
 }
 </script>

resources/scripts/admin/views/invoices/create/InvoiceCreateBasicFields.vue

@@ -32,6 +32,8 @@
           :content-loading="isLoading"
           :calendar-button="true"
           calendar-button-icon="calendar"
+          :show-extra-options="true"
+          :source-date="invoiceStore.newInvoice.invoice_date"
         />
       </BaseInputGroup>
 

resources/scripts/admin/views/payments/Create.vue

@@ -82,9 +82,9 @@
             required
           >
             <BaseCustomerSelectInput
+              v-if="!isLoadingContent"
               v-model="paymentStore.currentPayment.customer_id"
               :content-loading="isLoadingContent"
-              v-if="!isLoadingContent"
               :invalid="v$.currentPayment.customer_id.$error"
               :placeholder="$t('customers.select_a_customer')"
               show-action
@@ -423,7 +423,7 @@ function onCustomerChange(customer_id) {
   if (customer_id) {
     let data = {
       customer_id: customer_id,
-      status: 'DUE',
+      tab_status: 'DUE',
       limit: 'all',
     }
 
@@ -446,7 +446,11 @@ function onCustomerChange(customer_id) {
           paymentStore.currentPayment.selectedCustomer = res2.data.data
           paymentStore.currentPayment.customer = res2.data.data
           paymentStore.currentPayment.currency = res2.data.data.currency
-          if(isEdit.value && !customerStore.editCustomer && paymentStore.currentPayment.customer_id) {
+          if (
+            isEdit.value &&
+            !customerStore.editCustomer &&
+            paymentStore.currentPayment.customer_id
+          ) {
             customerStore.editCustomer = res2.data.data
           }
         }

resources/scripts/admin/views/settings/CompanyInfoSettings.vue

@@ -28,6 +28,19 @@
           />
         </BaseInputGroup>
 
+        <BaseInputGroup
+          :label="$tc('settings.company_info.company_slug')"
+          :help-text="$t('settings.company_info.company_slug_help_text')"
+          :error="v$.slug.$error && v$.slug.$errors[0].$message"
+          required
+        >
+          <BaseInput
+            v-model="companyForm.slug"
+            :invalid="v$.slug.$error"
+            @blur="v$.slug.$touch()"
+          />
+        </BaseInputGroup>
+
         <BaseInputGroup :label="$tc('settings.company_info.phone')">
           <BaseInput v-model="companyForm.address.phone" />
         </BaseInputGroup>
@@ -160,6 +173,7 @@ let isSaving = ref(false)
 
 const companyForm = reactive({
   name: null,
+  slug: null,
   logo: null,
   address: {
     address_street_1: '',
@@ -193,7 +207,14 @@ const rules = computed(() => {
     name: {
       required: helpers.withMessage(t('validation.required'), required),
       minLength: helpers.withMessage(
-        t('validation.name_min_length'),
+        t('validation.name_min_length', { count: 3 }),
+        minLength(3)
+      ),
+    },
+    slug: {
+      required: helpers.withMessage(t('validation.required'), required),
+      minLength: helpers.withMessage(
+        t('validation.name_min_length', { count: 3 }),
         minLength(3)
       ),
     },

resources/scripts/admin/views/settings/PreferencesSetting.vue

@@ -8,7 +8,11 @@
         <BaseInputGroup
           :content-loading="isFetchingInitialData"
           :label="$tc('settings.preferences.currency')"
-          :help-text="$t('settings.preferences.company_currency_unchangeable')"
+          :help-text="
+            isCurrencyDisabled
+              ? $t('settings.preferences.company_currency_unchangeable')
+              : ''
+          "
           :error="v$.currency.$error && v$.currency.$errors[0].$message"
           required
         >
@@ -21,7 +25,7 @@
             :searchable="true"
             track-by="name"
             :invalid="v$.currency.$error"
-            disabled
+            :disabled="isCurrencyDisabled"
             class="w-full"
           >
           </BaseMultiselect>
@@ -187,6 +191,7 @@ const { t, tm } = useI18n()
 let isSaving = ref(false)
 let isDataSaving = ref(false)
 let isFetchingInitialData = ref(false)
+let isCurrencyDisabled = ref(true)
 
 const settingsForm = reactive({ ...companyStore.selectedCompanySettings })
 
@@ -282,10 +287,14 @@ setInitialData()
 async function setInitialData() {
   isFetchingInitialData.value = true
   Promise.all([
+    companyStore.checkCompanyHasCurrencyTransactions(),
     globalStore.fetchCurrencies(),
     globalStore.fetchDateFormats(),
     globalStore.fetchTimeZones(),
   ]).then(([res1]) => {
+    if (res1.data?.has_transactions == false) {
+      isCurrencyDisabled.value = false
+    }
     isFetchingInitialData.value = false
   })
 }

resources/scripts/components/LightDarkSwitcher.vue

@@ -0,0 +1,101 @@
+<!-- This example requires Tailwind CSS v2.0+ -->
+<script lang="ts" setup>
+import { Switch, SwitchGroup, SwitchLabel } from '@headlessui/vue'
+import { useGlobalStore } from '@/scripts/admin/stores/global'
+import { computed, ref } from 'vue'
+defineProps({
+  showLabel: {
+    type: Boolean,
+    default: true,
+  },
+  vertical: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+const globalStore = useGlobalStore()
+
+const enabled = ref(
+  localStorage.getItem('theme') === 'dark' ||
+    document.documentElement.classList.contains('dark')
+)
+
+globalStore.isDarkModeOn = enabled
+
+function onChange(val) {
+  if (val) {
+    localStorage.theme = 'dark'
+    document.documentElement.classList.add('dark')
+    document.documentElement.style.setProperty('color-scheme', 'dark')
+    globalStore.isDarkModeOn = true
+  } else {
+    localStorage.theme = 'light'
+    document.documentElement.classList.remove('dark')
+    document.documentElement.style.setProperty('color-scheme', 'light')
+    globalStore.isDarkModeOn = false
+  }
+}
+</script>
+
+<template>
+  <div class="w-full flex justify-center">
+    <SwitchGroup
+      as="div"
+      class="flex items-center"
+      :class="vertical ? 'flex-col justify-center' : 'flex-row'"
+    >
+      <Switch
+        v-model="enabled"
+        class="relative inline-flex flex-shrink-0 h-6 w-11 border-2 border-transparent rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 dark:ring-offset-gray-700"
+        :class="[enabled ? 'bg-primary-600' : 'bg-gray-200']"
+        @update:modelValue="onChange"
+      >
+        <span class="sr-only">Use setting</span>
+        <span
+          class="pointer-events-none relative inline-block h-5 w-5 rounded-full bg-white shadow transform ring-0 transition ease-in-out duration-200"
+          :class="[enabled ? 'translate-x-5' : 'translate-x-0']"
+        >
+          <span
+            class="absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
+            :class="[
+              enabled
+                ? 'opacity-0 ease-out duration-100'
+                : 'opacity-100 ease-in duration-200',
+            ]"
+            aria-hidden="true"
+          >
+            <BaseIcon class="h-3 w-3 text-yellow-500" name="SunIcon" />
+          </span>
+          <span
+            class="absolute inset-0 h-full w-full flex items-center justify-center transition-opacity"
+            :class="[
+              enabled
+                ? 'opacity-100 ease-in duration-200'
+                : 'opacity-0 ease-out duration-100',
+            ]"
+            aria-hidden="true"
+          >
+            <BaseIcon class="h-3 w-3 text-primary-500" name="MoonIcon" />
+          </span>
+        </span>
+      </Switch>
+      <SwitchLabel
+        v-if="showLabel"
+        as="span"
+        class="cursor-pointer"
+        :class="vertical ? 'px-1 text-center mt-2' : 'ml-3'"
+      >
+        <span
+          v-if="enabled"
+          class="text-sm font-medium text-gray-500 dark:text-gray-400"
+        >
+          Dark Mode
+        </span>
+        <span v-else class="text-sm font-medium text-gray-500">
+          Light Mode
+        </span>
+      </SwitchLabel>
+    </SwitchGroup>
+  </div>
+</template>

resources/scripts/components/base/BaseCustomInput.vue

@@ -126,7 +126,7 @@ onMounted(() => {
 })
 
 const value = computed({
-  get: () => props.modelValue,
+  get: () => (props.modelValue ? props.modelValue : ''),
   set: (value) => {
     emit('update:modelValue', value)
   },
@@ -195,7 +195,9 @@ async function getFields() {
           { label: 'Date', value: 'INVOICE_DATE' },
           { label: 'Due Date', value: 'INVOICE_DUE_DATE' },
           { label: 'Number', value: 'INVOICE_NUMBER' },
-          { label: 'Ref Number', value: 'INVOICE_REF_NUMBER' },
+          { label: 'PDF Link', value: 'PDF_LINK' },
+          { label: 'Due Amount', value: 'DUE_AMOUNT' },
+          { label: 'Total Amount', value: 'TOTAL_AMOUNT' },
           ...invoiceFields.value.map((i) => ({
             label: i.label,
             value: i.slug,
@@ -211,7 +213,8 @@ async function getFields() {
           { label: 'Date', value: 'ESTIMATE_DATE' },
           { label: 'Expiry Date', value: 'ESTIMATE_EXPIRY_DATE' },
           { label: 'Number', value: 'ESTIMATE_NUMBER' },
-          { label: 'Ref Number', value: 'ESTIMATE_REF_NUMBER' },
+          { label: 'PDF Link', value: 'PDF_LINK' },
+          { label: 'Total Amount', value: 'TOTAL_AMOUNT' },
           ...estimateFields.value.map((i) => ({
             label: i.label,
             value: i.slug,
@@ -228,6 +231,7 @@ async function getFields() {
           { label: 'Number', value: 'PAYMENT_NUMBER' },
           { label: 'Mode', value: 'PAYMENT_MODE' },
           { label: 'Amount', value: 'PAYMENT_AMOUNT' },
+          { label: 'PDF Link', value: 'PDF_LINK' },
           ...paymentFields.value.map((i) => ({
             label: i.label,
             value: i.slug,

resources/scripts/components/base/BaseDatePicker.vue

@@ -7,52 +7,108 @@
     />
   </BaseContentPlaceholders>
 
-  <div v-else :class="computedContainerClass" class="relative flex flex-row">
-    <svg
-      v-if="showCalendarIcon && !hasIconSlot"
-      viewBox="0 0 20 20"
-      fill="currentColor"
-      class="
-        absolute
-        w-4
-        h-4
-        mx-2
-        my-2.5
-        text-sm
-        not-italic
-        font-black
-        text-gray-400
-        cursor-pointer
-      "
-      @click="onClickDp"
-    >
-      <path
-        fill-rule="evenodd"
-        d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
-        clip-rule="evenodd"
-      ></path>
-    </svg>
-
-    <slot v-if="showCalendarIcon && hasIconSlot" name="icon" />
-
-    <FlatPickr
-      ref="dp"
+  <div v-else :class="computedContainerClass">
+    <date-picker
+      ref="vCalendar"
       v-model="date"
-      v-bind="$attrs"
-      :disabled="disabled"
-      :config="config"
-      :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
-    />
+      :mode="mode"
+      :is24hr="time24hr"
+      class="w-full"
+      color="indigo"
+      :input-debounce="500"
+      :update-on-input="false"
+      :is-range="false"
+      trim-weeks
+      :is-required="isRequired"
+      :popover="{
+        visibility: disabled ? 'hidden' : 'focus',
+        showDelay: 0,
+        hideDelay: 1,
+      }"
+      :attributes="attrs"
+      :model-config="config"
+      :masks="masks"
+      :locale="global.locale"
+    >
+      <template
+        #default="{ inputValue, inputEvents, togglePopover, hidePopover }"
+      >
+        <!-- calendar icon -->
+        <svg
+          v-if="showCalendarIcon && !hasIconSlot"
+          viewBox="0 0 20 20"
+          fill="currentColor"
+          class="
+            absolute
+            w-4
+            h-4
+            mx-2
+            my-2.5
+            text-sm
+            not-italic
+            font-black
+            text-gray-400
+            cursor-pointer
+          "
+          @click="togglePopover()"
+        >
+          <path
+            fill-rule="evenodd"
+            d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
+            clip-rule="evenodd"
+          ></path>
+        </svg>
+
+        <slot v-if="showCalendarIcon && hasIconSlot" name="icon" />
+
+        <input
+          :value="inputValue"
+          :class="[defaultInputClass, inputInvalidClass, inputDisabledClass]"
+          readonly
+          v-on="inputEvents"
+          @blur="hidePopover()"
+        />
+      </template>
+
+      <template v-if="showExtraOptions" #footer>
+        <div
+          class="bg-gray-100 grid grid-cols-3 gap-2 p-2 border-t rounded-b-lg"
+        >
+          <button type="button" class="extra-button" @click="moveToDate(sourceDate)">
+            {{ global.t('date_picker.same_day') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(7)">
+            {{ global.t('date_picker.within_7_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(15)">
+            {{ global.t('date_picker.within_15_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(30)">
+            {{ global.t('date_picker.within_30_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(45)">
+            {{ global.t('date_picker.within_45_days') }}
+          </button>
+
+          <button type="button" class="extra-button" @click="withInDays(60)">
+            {{ global.t('date_picker.within_60_days') }}
+          </button>
+        </div>
+      </template>
+    </date-picker>
   </div>
 </template>
 
 <script type="text/babel" setup>
-import FlatPickr from 'vue-flatpickr-component'
-import 'flatpickr/dist/flatpickr.css'
+import { Calendar, DatePicker } from 'v-calendar'
+import 'v-calendar/dist/style.css'
 import { computed, reactive, watch, ref, useSlots } from 'vue'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
-
-const dp = ref(null)
+import moment from 'moment'
 
 const props = defineProps({
   modelValue: {
@@ -90,36 +146,31 @@ const props = defineProps({
   defaultInputClass: {
     type: String,
     default:
-      'font-base pl-8 py-2 outline-none focus:ring-primary-400 focus:outline-none focus:border-primary-400 block w-full sm:text-sm border-gray-200 rounded-md text-black',
+      'border-2 font-base pl-8 py-2 outline-none focus:ring-primary-400 focus:outline-none focus:border-primary-400 block w-full sm:text-sm border-gray-200 rounded-md text-black',
   },
   time24hr: {
     type: Boolean,
     default: false,
   },
+  isRequired: {
+    type: Boolean,
+    default: false,
+  },
+  showExtraOptions: {
+    type: Boolean,
+    default: false,
+  },
+  sourceDate: {
+    type: [String, Date],
+    default: () => new Date(),
+  }
 })
 
 const emit = defineEmits(['update:modelValue'])
-
 const slots = useSlots()
-
 const companyStore = useCompanyStore()
-
-let config = reactive({
-  altInput: true,
-  enableTime: props.enableTime,
-  time_24hr: props.time24hr,
-})
-
-const date = computed({
-  get: () => props.modelValue,
-  set: (value) => {
-    emit('update:modelValue', value)
-  },
-})
-
-const carbonFormat = computed(() => {
-  return companyStore.selectedCompanySettings?.carbon_date_format
-})
+const { global } = window.i18n
+const vCalendar = ref(null)
 
 const hasIconSlot = computed(() => {
   return !!slots.icon
@@ -135,7 +186,6 @@ const inputInvalidClass = computed(() => {
   if (props.invalid) {
     return 'border-red-400 ring-red-400 focus:ring-red-400 focus:border-red-400'
   }
-
   return ''
 })
 
@@ -143,35 +193,97 @@ const inputDisabledClass = computed(() => {
   if (props.disabled) {
     return 'border border-solid rounded-md outline-none input-field box-border-2 base-date-picker-input placeholder-gray-400 bg-gray-200 text-gray-600 border-gray-200'
   }
-
   return ''
 })
 
-function onClickDp(params) {
-  dp.value.fp.open()
+// to convert YYYY-MM-DD | YYYY-MM-DD HH:mm format
+function convertYMDFormat(date) {
+  let format = props.enableTime ? 'YYYY-MM-DD HH:mm' : 'YYYY-MM-DD'
+  return date ? moment(date).format(format) : date
 }
 
-watch(
-  () => props.enableTime,
-  (val) => {
-    if (props.enableTime) {
-      config.enableTime = props.enableTime
-    }
+const date = computed({
+  get: () => props.modelValue,
+  set: (value) => {
+    emit('update:modelValue', value)
   },
-  { immediate: true }
-)
+})
+
+const mode = computed(() => {
+  return props.enableTime ? 'dateTime' : 'date'
+})
+
+const config = reactive({
+  type: 'string',
+  mask: 'YYYY-MM-DD', // Uses 'iso' if missing
+  //timeAdjust: '00:00:00',
+})
+
+const masks = reactive({
+  input: null,
+  inputDateTime: null,
+  inputDateTime24hr: null,
+})
+
+const attrs = reactive([
+  {
+    dates: new Date(),
+    highlight: {
+      fillMode: 'outline',
+    },
+    /* popover: {
+      label: 'Today Date',
+      visibility: 'hover',
+    }, */
+  },
+])
+
+const carbonFormat = computed(() => {
+  return companyStore.selectedCompanySettings?.moment_date_format
+})
 
 watch(
   () => carbonFormat,
   () => {
     if (!props.enableTime) {
-      config.altFormat = carbonFormat.value ? carbonFormat.value : 'd M Y'
+      masks.input = carbonFormat.value ? carbonFormat.value : 'DD MMM YYYY'
+      config.mask = 'YYYY-MM-DD'
     } else {
-      config.altFormat = carbonFormat.value
-        ? `${carbonFormat.value} H:i `
-        : 'd M Y H:i'
+      let timeFormat = 'HH:mm'
+      if (props.time24hr) {
+        masks.inputDateTime24hr = carbonFormat.value
+          ? `${carbonFormat.value} ${timeFormat}`
+          : `DD MMM YYYY ${timeFormat}`
+      } else {
+        masks.inputDateTime = carbonFormat.value
+          ? `${carbonFormat.value} ${timeFormat}`
+          : `DD MMM YYYY ${timeFormat}`
+      }
+      config.mask = `YYYY-MM-DD ${timeFormat}`
     }
   },
   { immediate: true }
 )
+
+async function moveToDate(_date) {
+  const calendar = vCalendar.value
+  _date = _date ? _date : convertYMDFormat(new Date())
+  date.value = _date
+  // await calendar.move(_date)
+  calendar.hidePopover()
+}
+
+async function withInDays(noOfDays) {
+  if (!noOfDays) return false
+
+  let newDate = moment(props.sourceDate).add(noOfDays, 'days').toDate()
+  newDate = convertYMDFormat(newDate)
+  moveToDate(newDate)
+}
 </script>
+
+<style scoped>
+.extra-button {
+  @apply bg-primary-500 text-white text-sm font-semibold px-2 py-1 rounded hover:bg-primary-700;
+}
+</style>

resources/scripts/components/base/BaseSelectAction.vue

@@ -11,6 +11,10 @@
       bg-gray-200
       cursor-pointer
       text-primary-400
+      dark:bg-gray-600/70
+      dark:backdrop-blur-xl
+      dark:shadow-glass
+      dark:hover:bg-gray-600/80
     "
   >
     <slot />

resources/scripts/components/base/BaseTabGroup.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-    <TabGroup :default-index="defaultIndex" @change="onChange">
+    <TabGroup
+      :selected-index="selectedIndex"
+      :default-index="defaultIndex"
+      @change="onChange"
+    >
       <TabList
         :class="[
           'flex border-b border-grey-light',
@@ -54,6 +58,10 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  selectedIndex: {
+    type: Number,
+    default: 0,
+  },
   filter: {
     type: String,
     default: null,
@@ -67,6 +75,6 @@ const slots = useSlots()
 const tabs = computed(() => slots.default().map((tab) => tab.props))
 
 function onChange(d) {
-  emit('change', tabs.value[d])
+  emit('change', tabs.value[d], d)
 }
 </script>

resources/scripts/helpers/use-popper.js

@@ -7,12 +7,12 @@ export function usePopper(options) {
   let popper = ref(null)
 
   onMounted(() => {
-    watchEffect(onInvalidate => {
+    watchEffect((onInvalidate) => {
       if (!container.value) return
       if (!activator.value) return
 
       let containerEl = container.value.el || container.value
-      let activatorEl = activator.value.el || activator.value
+      let activatorEl = activator.value.$el || activator.value
 
       if (!(activatorEl instanceof HTMLElement)) return
       if (!(containerEl instanceof HTMLElement)) return

resources/scripts/locales/en.json

@@ -863,6 +863,8 @@
     "company_info": {
       "company_info": "Company info",
       "company_name": "Company Name",
+      "company_slug": "Company Slug",
+      "company_slug_help_text": "A unique URL friendly name for your company (It will appear on Customer Portal URL)",
       "company_logo": "Company Logo",
       "section_description": "Information about your company that will be displayed on invoices, estimates and other documents created by Crater.",
       "phone": "Phone",
@@ -1324,6 +1326,8 @@
     "company_info": "Company Information",
     "company_info_desc": "This information will be displayed on invoices. Note that you can edit this later on settings page.",
     "company_name": "Company Name",
+    "company_slug": "Company Slug",
+    "company_slug_help_text": "A unique URL friendly name for your company (It will appear on Customer Portal URL)",
     "company_logo": "Company Logo",
     "logo_preview": "Logo Preview",
     "preferences": "Company Preferences",
@@ -1454,7 +1458,8 @@
     "at_least_one_ability": "Please select atleast one Permission.",
     "valid_driver_key": "Please enter a valid {driver} key.",
     "valid_exchange_rate": "Please enter a valid exchange rate.",
-    "company_name_not_same": "Company name must match with given name."
+    "company_name_not_same": "Company name must match with given name.",
+    "invalid_slug": "Invalid Slug"
   },
   "errors": {
     "starter_plan": "This feature is available on Starter plan and onwards!",
@@ -1522,5 +1527,13 @@
   "pdf_bill_to": "Bill to,",
   "pdf_ship_to": "Ship to,",
   "pdf_received_from": "Received from:",
-  "pdf_tax_label": "Tax"
+  "pdf_tax_label": "Tax",
+  "date_picker": {
+    "same_day": "Same Day",
+    "within_7_days": "Within 7 Days",
+    "within_15_days": "Within 15 Days",
+    "within_30_days": "Within 30 Days",
+    "within_45_days": "Within 45 Days",
+    "within_60_days": "Within 60 Days"
+  }
 }

resources/views/app.blade.php

@@ -17,7 +17,7 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <!-- Module Styles -->
-    @foreach(\Crater\Services\Module\ModuleFacade::allStyles() as $name => $path)
+    @foreach (\Crater\Services\Module\ModuleFacade::allStyles() as $name => $path)
         <link rel="stylesheet" href="/modules/styles/{{ $name }}">
     @endforeach
 
@@ -25,8 +25,8 @@
 </head>
 
 <body
-    class="h-full overflow-hidden bg-gray-100 font-base
-    @if(isset($current_theme)) theme-{{ $current_theme }} @else theme-{{get_app_setting('admin_portal_theme') ?? 'crater'}} @endif ">
+    class="h-full overflow-hidden bg-gray-100 dark:bg-gray-900 dark:text-white font-base
+    @if (isset($current_theme)) theme-{{ $current_theme }} @else theme-{{ get_app_setting('admin_portal_theme') ?? 'crater' }} @endif ">
 
     <!-- Module Scripts -->
     @foreach (\Crater\Services\Module\ModuleFacade::allScripts() as $name => $path)
@@ -38,6 +38,14 @@
     @endforeach
 
     <script type="module">
+        if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
+            document.documentElement.classList.add('dark')
+            document.documentElement.style.setProperty('color-scheme', 'dark');
+        } else {
+            document.documentElement.classList.remove('dark')
+            document.documentElement.style.setProperty('color-scheme', 'light')
+        }
+
         @if(isset($customer_logo))
 
         window.customer_logo = "/storage/{{$customer_logo}}"
@@ -57,12 +65,12 @@
 
         window.login_page_description = "{{$login_page_description}}"
 
-        @endif     
+        @endif
         @if(isset($copyright_text))
 
         window.copyright_text = "{{$copyright_text}}"
 
-        @endif    
+        @endif
 
         window.Crater.start()
     </script>

tailwind.config.js

@@ -19,6 +19,7 @@ module.exports = {
     './resources/scripts/**/*.js',
     './resources/scripts/**/*.vue',
   ],
+  darkMode: 'class',
   theme: {
     extend: {
       colors: {

tests/Feature/Admin/EstimateTest.php

@@ -415,32 +415,31 @@ test('update estimate with EUR currency', function () {
 
     $response = putJson('api/v1/estimates/'.$estimate->id, $estimate2);
 
-    $this->assertDatabaseHas('estimates', [
-        'id' => $estimate['id'],
-        'template_name' => $estimate2['template_name'],
-        'estimate_number' => $estimate2['estimate_number'],
-        'discount_type' => $estimate2['discount_type'],
-        'discount_val' => $estimate2['discount_val'],
-        'sub_total' => $estimate2['sub_total'],
-        'discount' => $estimate2['discount'],
-        'customer_id' => $estimate2['customer_id'],
-        'total' => $estimate2['total'],
-        'tax' => $estimate2['tax'],
-        'exchange_rate' => $estimate2['exchange_rate'],
-        'base_discount_val' => $estimate2['base_discount_val'],
-        'base_sub_total' => $estimate2['base_sub_total'],
-        'base_total' => $estimate2['base_total'],
-        'base_tax' => $estimate2['base_tax'],
-    ]);
+    $estimate_assert = collect($estimate2)
+        ->only([
+            'id',
+            'template_name',
+            'estimate_number',
+            'discount_type',
+            'discount_val',
+            'sub_total',
+            'discount',
+            'customer_id',
+            'total',
+            'tax'
+        ])
+        ->toArray();
 
-    $this->assertDatabaseHas('estimate_items', [
-        'estimate_id' => $estimate2['items'][0]['estimate_id'],
-        'exchange_rate' => $estimate2['items'][0]['exchange_rate'],
-        'base_price' => $estimate2['items'][0]['base_price'],
-        'base_discount_val' => $estimate2['items'][0]['base_discount_val'],
-        'base_tax' => $estimate2['items'][0]['base_tax'],
-        'base_total' => $estimate2['items'][0]['base_total'],
-    ]);
+    $this->assertDatabaseHas('estimates', $estimate_assert);
+
+    $estimate_item_assert = collect($estimate2['items'][0])
+        ->only([
+            'estimate_id',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('estimate_items', $estimate_item_assert);
 
     $response->assertStatus(200);
 });

tests/Feature/Admin/ExpenseTest.php

@@ -37,13 +37,15 @@ test('create expense', function () {
 
     postJson('api/v1/expenses', $expense)->assertStatus(201);
 
-    $this->assertDatabaseHas('expenses', [
-        'notes' => $expense['notes'],
-        'expense_category_id' => $expense['expense_category_id'],
-        'amount' => $expense['amount'],
-        'exchange_rate' => $expense['exchange_rate'],
-        'base_amount' => $expense['base_amount'],
-    ]);
+    $expense = collect($expense)
+        ->only([
+            'notes',
+            'expense_category_id',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('expenses', $expense);
 });
 
 test('store validates using a form request', function () {
@@ -146,11 +148,13 @@ test('update expense with EUR currency', function () {
 
     putJson('api/v1/expenses/'.$expense->id, $expense2)->assertOk();
 
-    $this->assertDatabaseHas('expenses', [
-        'id' => $expense->id,
-        'expense_category_id' => $expense2['expense_category_id'],
-        'amount' => $expense2['amount'],
-        'exchange_rate' => $expense2['exchange_rate'],
-        'base_amount' => $expense2['base_amount'],
-    ]);
+    $expense2 = collect($expense2)
+        ->only([
+            'id',
+            'expense_category_id',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('expenses', $expense2);
 });

tests/Feature/Admin/InvoiceTest.php

@@ -9,7 +9,6 @@ use Crater\Models\Tax;
 use Crater\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
-
 use function Pest\Laravel\getJson;
 use function Pest\Laravel\postJson;
 use function Pest\Laravel\putJson;
@@ -431,31 +430,36 @@ test('update invoice with EUR currency', function () {
 
     putJson('api/v1/invoices/'.$invoice->id, $invoice2)->assertOk();
 
-    $this->assertDatabaseHas('invoices', [
-        'id' => $invoice['id'],
-        'invoice_number' => $invoice2['invoice_number'],
-        'sub_total' => $invoice2['sub_total'],
-        'total' => $invoice2['total'],
-        'tax' => $invoice2['tax'],
-        'discount' => $invoice2['discount'],
-        'customer_id' => $invoice2['customer_id'],
-        'template_name' => $invoice2['template_name'],
-        'exchange_rate' => $invoice2['exchange_rate'],
-        'base_total' => $invoice2['base_total'],
-    ]);
+    $invoice_assert = collect($invoice2)
+        ->only([
+            'invoice_number',
+            'template_name',
+            'sub_total',
+            'total',
+            'tax',
+            'discount',
+            'customer_id',
+        ])
+        ->toArray();
 
-    $this->assertDatabaseHas('invoice_items', [
-        'invoice_id' => $invoice2['items'][0]['invoice_id'],
-        'item_id' => $invoice2['items'][0]['item_id'],
-        'name' => $invoice2['items'][0]['name'],
-        'exchange_rate' => $invoice2['items'][0]['exchange_rate'],
-        'base_price' => $invoice2['items'][0]['base_price'],
-        'base_total' => $invoice2['items'][0]['base_total'],
-    ]);
+    $this->assertDatabaseHas('invoices', $invoice_assert);
 
-    $this->assertDatabaseHas('taxes', [
-        'amount' => $invoice2['taxes'][0]['amount'],
-        'name' => $invoice2['taxes'][0]['name'],
-        'base_amount' => $invoice2['taxes'][0]['base_amount'],
-    ]);
+    $invoice_item_assert = collect($invoice2['items'][0])
+        ->only([
+            'invoice_id',
+            'item_id',
+            'name',
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('invoice_items', $invoice_item_assert);
+
+    $invoice_tax_assert = collect($invoice2['taxes'][0])
+        ->only([
+            'name',
+            'amount'
+        ])
+        ->toArray();
+
+    $this->assertDatabaseHas('taxes', $invoice_tax_assert);
 });

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