Merge pull request #8394 from turbo124/v5-develop

Update production routes

app/Console/Commands/DemoMode.php

@@ -188,6 +188,7 @@ class DemoMode extends Command
             $company_token->account_id = $account->id;
             $company_token->name = 'test token';
             $company_token->token = 'TOKEN';
+            $company_token->is_system = true;
             $company_token->save();
 
             $u2->companies()->attach($company->id, [

app/DataMapper/Tax/ClientTaxData.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\DataMapper\Tax\ZipTax\Response;
+
+class ClientTaxData
+{
+    public function __construct(public Response $origin, public Response $destination)
+    {
+    }
+}

app/DataMapper/Tax/CompanyTaxData.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\DataMapper\Tax\ZipTax\Response;
+
+class CompanyTaxData
+{
+    public function __construct(public Response $origin)
+    {
+    }
+}

app/DataMapper/Tax/InvoiceTaxData.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2023. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\DataMapper\Tax;
+
+use App\DataMapper\Tax\ZipTax\Response;
+
+class InvoiceTaxData
+{
+    public function __construct(public Response $origin)
+    {
+    }
+}

app/Helpers/Invoice/InvoiceSum.php

@@ -45,6 +45,8 @@ class InvoiceSum
 
     private $precision;
 
+    public InvoiceItemSum $invoice_items;
+    
     /**
      * Constructs the object with Invoice and Settings object.
      *

app/Http/Controllers/BaseController.php

@@ -1085,7 +1085,7 @@ class BaseController extends Controller
     {
         if ((bool) $this->checkAppSetup() !== false && $account = Account::first()) {
             //always redirect invoicing.co to invoicing.co
-            if (Ninja::isHosted() && !in_array(request()->getSchemeAndHttpHost(), ['https://staging.invoicing.co', 'https://invoicing.co', 'https://demo.invoicing.co'])) {
+            if (Ninja::isHosted() && !in_array(request()->getSchemeAndHttpHost(), ['https://staging.invoicing.co', 'https://invoicing.co', 'https://demo.invoicing.co', 'https://invoiceninja.net'])) {
                 return redirect()->secure('https://invoicing.co');
             }
 

app/Models/Company.php

@@ -429,6 +429,8 @@ class Company extends BaseModel
         'convert_payment_currency',
         'convert_expense_currency',
         'notify_vendor_when_paid',
+        'calculate_taxes',
+        'tax_all_products',
     ];
 
     protected $hidden = [

app/Models/Invoice.php

@@ -582,7 +582,7 @@ class Invoice extends BaseModel
     /**
      * Access the invoice calculator object.
      *
-     * @return stdClass The invoice calculator object getters
+     * @return \stdClass The invoice calculator object getters
      */
     public function calc()
     {

app/Models/Product.php

@@ -105,6 +105,13 @@ class Product extends BaseModel
     use SoftDeletes;
     use Filterable;
 
+    
+    public const PRODUCT_TYPE_PHYSICAL = 1;
+    public const PRODUCT_TYPE_SERVICE = 2;
+    public const PRODUCT_TYPE_DIGITAL = 3;
+    public const PRODUCT_TYPE_FREIGHT = 4;
+    public const PRODUCT_TAX_EXEMPT = 5;
+
     protected $fillable = [
         'custom_value1',
         'custom_value2',
@@ -126,6 +133,7 @@ class Product extends BaseModel
         'stock_notification',
         'max_quantity',
         'product_image',
+        'tax_id',
     ];
 
     protected $touches = [];

app/Transformers/CompanyTransformer.php

@@ -193,6 +193,8 @@ class CompanyTransformer extends EntityTransformer
             'convert_expense_currency' => (bool) $company->convert_expense_currency,
             'notify_vendor_when_paid' => (bool) $company->notify_vendor_when_paid,
             'invoice_task_hours' => (bool) $company->invoice_task_hours,
+            'calculate_taxes' => (bool) $company->calculate_taxes,
+            'tax_all_products' => (bool) $company->tax_all_products,
         ];
     }
 

app/Transformers/InvoiceTransformer.php

@@ -149,6 +149,7 @@ class InvoiceTransformer extends EntityTransformer
             'paid_to_date' => (float) $invoice->paid_to_date,
             'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id),
             'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
+            'tax_data' => $invoice->tax_data ?: '',            
         ];
     }
 }

app/Transformers/ProductTransformer.php

@@ -95,6 +95,7 @@ class ProductTransformer extends EntityTransformer
             'stock_notification_threshold' => (int) $product->stock_notification_threshold,
             'max_quantity' => (int) $product->max_quantity,
             'product_image' => (string) $product->product_image ?: '',
+            'tax_id' => (int) $product->tax_id ?: 1,     
         ];
     }
 }

database/migrations/2023_03_21_053933_tax_calculations_for_invoices.php

@@ -0,0 +1,45 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->mediumText('tax_data')->nullable(); //json object
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->boolean('calculate_taxes')->default(false); //setting to turn on/off tax calculations
+            $table->boolean('tax_all_products')->default(false); //globally tax all products if none defined
+            $table->boolean('tax_data');
+        });
+
+        Schema::table('products', function (Blueprint $table){
+            $table->unsignedInteger('tax_id')->nullable(); // the product tax constant
+        });
+
+        Schema::table('clients', function (Blueprint $table){
+            $table->boolean('tax_data');
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};

lang/en/texts.php

@@ -174,7 +174,6 @@ $LANG = array(
     'payment_gateway' => 'Payment Gateway',
     'gateway_id' => 'Gateway',
     'email_notifications' => 'Email Notifications',
-    'email_sent' => 'Email me when an invoice is <b>sent</b>',
     'email_viewed' => 'Email me when an invoice is <b>viewed</b>',
     'email_paid' => 'Email me when an invoice is <b>paid</b>',
     'site_updates' => 'Site Updates',
@@ -907,8 +906,6 @@ $LANG = array(
     'expense' => 'Expense',
     'expenses' => 'Expenses',
     'new_expense' => 'Enter Expense',
-    'enter_expense' => 'Enter Expense',
-    'vendors' => 'Vendors',
     'new_vendor' => 'New Vendor',
     'payment_terms_net' => 'Net',
     'vendor' => 'Vendor',
@@ -1203,7 +1200,6 @@ $LANG = array(
     'plan_pending_monthly' => 'Will switch to monthly on :date',
     'plan_refunded' => 'A refund has been issued.',
 
-    'live_preview' => 'Live Preview',
     'page_size' => 'Page Size',
     'live_preview_disabled' => 'Live preview has been disabled to support selected font',
     'invoice_number_padding' => 'Padding',
@@ -1460,40 +1456,6 @@ $LANG = array(
     'payment_type_GoCardless' => 'GoCardless',
     'payment_type_Zelle' => 'Zelle',
 
-    // Industries
-    'industry_Accounting & Legal' => 'Accounting & Legal',
-    'industry_Advertising' => 'Advertising',
-    'industry_Aerospace' => 'Aerospace',
-    'industry_Agriculture' => 'Agriculture',
-    'industry_Automotive' => 'Automotive',
-    'industry_Banking & Finance' => 'Banking & Finance',
-    'industry_Biotechnology' => 'Biotechnology',
-    'industry_Broadcasting' => 'Broadcasting',
-    'industry_Business Services' => 'Business Services',
-    'industry_Commodities & Chemicals' => 'Commodities & Chemicals',
-    'industry_Communications' => 'Communications',
-    'industry_Computers & Hightech' => 'Computers & Hightech',
-    'industry_Defense' => 'Defense',
-    'industry_Energy' => 'Energy',
-    'industry_Entertainment' => 'Entertainment',
-    'industry_Government' => 'Government',
-    'industry_Healthcare & Life Sciences' => 'Healthcare & Life Sciences',
-    'industry_Insurance' => 'Insurance',
-    'industry_Manufacturing' => 'Manufacturing',
-    'industry_Marketing' => 'Marketing',
-    'industry_Media' => 'Media',
-    'industry_Nonprofit & Higher Ed' => 'Nonprofit & Higher Ed',
-    'industry_Pharmaceuticals' => 'Pharmaceuticals',
-    'industry_Professional Services & Consulting' => 'Professional Services & Consulting',
-    'industry_Real Estate' => 'Real Estate',
-    'industry_Restaurant & Catering' => 'Restaurant & Catering',
-    'industry_Retail & Wholesale' => 'Retail & Wholesale',
-    'industry_Sports' => 'Sports',
-    'industry_Transportation' => 'Transportation',
-    'industry_Travel & Luxury' => 'Travel & Luxury',
-    'industry_Other' => 'Other',
-    'industry_Photography' => 'Photography',
-
     // Countries
     'country_Afghanistan' => 'Afghanistan',
     'country_Albania' => 'Albania',
@@ -4230,7 +4192,6 @@ $LANG = array(
     'activity_104' => ':user restored recurring invoice :recurring_invoice',
     'new_login_detected' => 'New login detected for your account.',
     'new_login_description' => 'You recently logged in to your Invoice Ninja account from a new location or device:<br><br><b>IP:</b> :ip<br><b>Time:</b> :time<br><b>Email:</b> :email',
-    'download_backup_subject' => 'Your company backup is ready for download',
     'contact_details' => 'Contact Details',
     'download_backup_subject' => 'Your company backup is ready for download',
     'account_passwordless_login' => 'Account passwordless login',
@@ -4355,7 +4316,6 @@ $LANG = array(
     'has_tasks' => 'Has Tasks',
     'registration' => 'Registration',
     'unauthorized_stripe_warning' => 'Please authorize Stripe to accept online payments.',
-    'fpx' => 'FPX',
     'update_all_records' => 'Update all records',
     'set_default_company' => 'Set Default Company',
     'updated_company' => 'Successfully updated company',
@@ -4546,7 +4506,6 @@ $LANG = array(
     'reminder_message' => 'Reminder for invoice :number for :balance',
     'gmail_credentials_invalid_subject' => 'Send with GMail invalid credentials',
     'gmail_credentials_invalid_body' => 'Your GMail credentials are not correct, please log into the administrator portal and navigate to Settings > User Details and disconnect and reconnect your GMail account. We will send you this notification daily until this issue is resolved',
-    'notification_invoice_sent' => 'The following client :client was emailed Invoice :invoice for :amount.',
     'total_columns' => 'Total Fields',
     'view_task' => 'View Task',
     'cancel_invoice' => 'Cancel',
@@ -5027,6 +4986,35 @@ $LANG = array(
     'notification_payment_emailed' => 'Payment :payment was emailed to :client',
     'notification_payment_emailed_subject' => 'Payment :payment was emailed',
     'record_not_found' => 'Record not found',
+    'product_tax_exempt' => 'Product Tax Exempt',
+    'product_type_physical' => 'Physical Goods',
+    'product_type_digital' => 'Digital Goods',
+    'product_type_service' => 'Services',
+    'product_type_freight' => 'Shipping',
+    'minimum_payment_amount' => 'Minimum Payment Amount',
+    'client_initiated_payments' => 'Client Initiated Payments',
+    'client_initiated_payments_help' => 'Support making a payment in the client portal without an invoice',
+    'share_invoice_quote_columns' => 'Share Invoice/Quote Columns',
+    'cc_email' => 'CC Email',
+    'payment_balance' => 'Payment Balance',
+    'view_report_permission' => 'Allow user to access the reports, data is limited to available permissions',
+    'activity_138' => 'Payment :payment was emailed to :client',
+    'one_time_products' => 'One-Time Products',
+    'optional_one_time_products' => 'Optional One-Time Products',
+    'required' => 'Required',
+    'hidden' => 'Hidden',
+    'payment_links' => 'Payment Links',
+    'payment_link' => 'Payment Link',
+    'new_payment_link' => 'New Payment Link',
+    'edit_payment_link' => 'Edit Payment Link',
+    'created_payment_link' => 'Successfully created payment link',
+    'updated_payment_link' => 'Successfully updated payment link',
+    'archived_payment_link' => 'Successfully archived payment link',
+    'deleted_payment_link' => 'Successfully deleted payment link',
+    'removed_payment_link' => 'Successfully removed payment link',
+    'restored_payment_link' => 'Successfully restored payment link',
+    'search_payment_link' => 'Search 1 Payment Link',
+    'search_payment_links' => 'Search :count Payment Links',
 );
 
 

resources/views/portal/ninja2020/pre_payments/index.blade.php

@@ -40,9 +40,13 @@
                         type="text"
                         class="input mt-0 mr-4 relative"
                         name="amount"
-                        placeholder="{{ $minimum_amount }}"
+                        placeholder=""
                         min="{{ $minimum_amount }}"/>
-                    
+                        
+                        @if($minimum_amount > 0) 
+                        <p>{{ ctrans('texts.minimum_required_payment', ['amount' => $minimum_amount])}}</p>
+                        @endif
+                        
                         @if($errors->has('amount'))
                             <p class="mt-2 text-red-900 border-red-300 px-2 py-1 bg-gray-100">{{ $errors->first('amount') }}</p>
                         @endif