increase series param length to 6

fix payment update issue

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

app/Models/Payment.php

@@ -183,7 +183,7 @@ class Payment extends Model implements HasMedia
 
     public function updatePayment($request)
     {
-        $data = $request->all();
+        $data = $request->getPaymentPayload();
 
         if ($request->invoice_id && (! $this->invoice_id || $this->invoice_id !== $request->invoice_id)) {
             $invoice = Invoice::find($request->invoice_id);

app/Services/SerialNumberFormatter.php

@@ -156,7 +156,7 @@ class SerialNumberFormatter
 
     public static function getPlaceholders(string $format)
     {
-        $regex = "/{{([A-Z_]{1,})(?::)?([a-zA-Z0-9_]{1,4}|.{1})?}}/";
+        $regex = "/{{([A-Z_]{1,})(?::)?([a-zA-Z0-9_]{1,6}|.{1})?}}/";
 
         preg_match_all($regex, $format, $placeholders);
         array_shift($placeholders);

database/migrations/2021_12_13_055813_calculate_base_amount_of_payments_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Crater\Models\Payment;
+use Illuminate\Database\Migrations\Migration;
+
+class CalculateBaseAmountOfPaymentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $payments = Payment::all();
+
+        if ($payments) {
+            foreach ($payments as $payment) {
+                $payment->base_amount = $payment->exchange_rate * $payment->amount;
+                $payment->save();
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

readme.md

@@ -55,8 +55,6 @@ Join the Crater discord server to discuss:
 - [x] Multiple Companies
 - [x] Recurring Invoices
 - [ ] Modules
-- [ ] Blockchain Integration
-- [ ] Web 3.0 Accounting
 - [ ] White Labeling (Easy Invoice, Email & Consumer Portal Theme customisation)
 - [ ] Vendors, Inventory & Bills
 - [ ] Payment Reminders

resources/scripts/components/dropdowns/InvoiceIndexDropdown.vue

@@ -153,6 +153,7 @@ const utils = inject('utils')
 function canReSendInvoice(row) {
   return (
     (row.status == 'SENT' || row.status == 'VIEWED') &&
+    route.name !== 'invoices.view' &&
     userStore.hasAbilities(abilities.SEND_INVOICE)
   )
 }

resources/scripts/locales/en.json

@@ -861,7 +861,7 @@
       "component": "Component",
       "Parameter": "Parameter",
       "series": "Series",
-      "series_description": "To set a static prefix/postfix like 'INV' across your company. It supports character length of up to 4 chars.",
+      "series_description": "To set a static prefix/postfix like 'INV' across your company. It supports character length of up to 6 chars.",
       "series_param_label": "Series Value",
       "delimiter": "Delimiter",
       "delimiter_description": "Single character for specifying the boundary between 2 separate components. By default its set to -",
@@ -870,7 +870,7 @@
       "date_format_description": "A local date and time field which accepts a format parameter. The default format: 'Y' renders the current year.",
       "date_format_param_label": "Format",
       "sequence": "Sequence",
-      "sequence_description": "Consecutive sequence of numbers across your company. You can specify the length on the given paramter.",
+      "sequence_description": "Consecutive sequence of numbers across your company. You can specify the length on the given parameter.",
       "sequence_param_label": "Sequence Length",
       "customer_series": "Customer Series",
       "customer_series_description": "To set a different prefix/postfix for each customer.",
@@ -878,7 +878,7 @@
       "customer_sequence_description": "Consecutive sequence of numbers for each of your customer.",
       "customer_sequence_param_label": "Sequence Length",
       "random_sequence": "Random Sequence",
-      "random_sequence_description": "Random alphanumeric string. You can specify the length on the given paramter.",
+      "random_sequence_description": "Random alphanumeric string. You can specify the length on the given parameter.",
       "random_sequence_param_label": "Sequence Length",
       "invoices": {
         "title": "Invoices",

resources/scripts/views/expenses/Index.vue

@@ -185,6 +185,10 @@
           />
         </template>
 
+        <template #cell-expense_date="{ row }">
+          {{ row.data.formatted_expense_date }}
+        </template>
+
         <template #cell-user_name="{ row }">
           <BaseText
             :text="row.data.customer ? row.data.customer.name : '-'"

resources/scripts/views/payments/Index.vue

@@ -151,6 +151,10 @@
           </div>
         </template>
 
+        <template #cell-payment_date="{ row }">
+          {{ row.data.formatted_payment_date }}
+        </template>
+
         <template #cell-payment_number="{ row }">
           <router-link
             :to="{ path: `payments/${row.data.id}/view` }"
@@ -161,11 +165,7 @@
         </template>
 
         <template #cell-name="{ row }">
-          <BaseText
-            :text="row.data.customer.name"
-            :length="30"
-            tag="span"
-          />
+          <BaseText :text="row.data.customer.name" :length="30" tag="span" />
         </template>
 
         <template #cell-payment_mode="{ row }">

resources/scripts/views/payments/View.vue

@@ -163,7 +163,7 @@
           >
             <div class="flex-2">
               <BaseText
-                :text="payment?.customer?.name "
+                :text="payment?.customer?.name"
                 :length="30"
                 class="
                   pr-2
@@ -219,11 +219,11 @@
                   text-right text-gray-900
                 "
                 :amount="payment?.amount"
-                :currency="payment?.currency"
+                :currency="payment.customer.currency"
               />
 
               <div class="text-sm text-right text-gray-500 non-italic">
-                {{ paymentDate }}
+                {{ payment.formatted_payment_date }}
               </div>
             </div>
           </router-link>

resources/scripts/views/settings/customization/NumberCustomizer.vue

@@ -386,8 +386,8 @@ function removeComponent(component) {
 function onUpdate(val, element) {
   switch (element.name) {
     case 'SERIES':
-      if (val.length >= 4) {
-        val = val.substring(0, 4)
+      if (val.length >= 6) {
+        val = val.substring(0, 6)
       }
       break
     case 'DELIMITER':