Merge branch 'master'

2025-10-27 11:41:09 -04:00 · 2022-04-01 12:04:06 +05:30
parent 7718f77f3d ea41989034
commit bba14bf51a
16 changed files with 876 additions and 1297 deletions
--- a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
+++ b/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',
--- a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
+++ b/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();
--- a/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php
+++ b/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')
--- a/app/Http/Resources/EstimateResource.php
+++ b/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,
--- a/app/Http/Resources/PaymentResource.php
+++ b/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,
--- a/app/Models/Estimate.php
+++ b/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)
        ];
    }

--- a/app/Models/Expense.php
+++ b/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) {
@ -267,7 +267,7 @@ class Expense extends Model implements HasMedia
        }
        if ($request->hasFile('attachment_receipt')) {
            $this->clearMediaCollection('receipts');
-            $this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
+            $this->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts', 'local');
        }

        if ($request->customFields) {
--- a/app/Models/Invoice.php
+++ b/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'));
        }
@ -650,7 +668,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)
        ];
    }

--- a/app/Models/Payment.php
+++ b/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)
        ];
    }

--- a/package.json
+++ b/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,7 @@
    "mini-svg-data-uri": "^1.3.3",
    "moment": "^2.29.1",
    "pinia": "^2.0.4",
-    "v-money3": "^3.13.5",
+    "v-money3": "3.16.1",
    "v-tooltip": "^4.0.0-alpha.1",
    "vue": "^3.2.0-beta.5",
    "vue-flatpickr-component": "^9.0.3",
--- a/resources/scripts/admin/views/invoices/Index.vue
+++ b/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>
--- a/resources/scripts/admin/views/payments/Create.vue
+++ b/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
          }
        }
--- a/resources/scripts/components/base/BaseCustomInput.vue
+++ b/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,
--- a/resources/scripts/components/base/BaseTabGroup.vue
+++ b/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>
--- a/resources/scripts/helpers/use-popper.js
+++ b/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
--- a/yarn.lock
+++ b/yarn.lock