Add billable prop

.github/workflows/react_release.yml

@@ -64,7 +64,7 @@ jobs:
       - name: Build project
         run: |
           shopt -s dotglob
-          tar --exclude='public/storage' --exclude='.htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/react-invoiceninja.tar *
+          tar --exclude='public/storage' --exclude='./htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/react-invoiceninja.tar *
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/release.yml

@@ -74,7 +74,7 @@ jobs:
         run: |
           zip -r /home/runner/work/invoiceninja/invoiceninja.zip .* -x "../*"
           shopt -s dotglob
-          tar --exclude='public/storage' --exclude='.htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/invoiceninja.tar *
+          tar --exclude='public/storage' --exclude='./htaccess' --exclude='invoiceninja.zip' -zcvf /home/runner/work/invoiceninja/invoiceninja.tar *
       - name: Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')

app/Export/CSV/BaseExport.php

@@ -448,6 +448,7 @@ class BaseExport
         'custom_value4' => 'task.custom_value4',
         'status' => 'task.status_id',
         'project' => 'task.project_id',
+        'billable' => 'task.billable',
     ];
 
     protected array $forced_client_fields = [

app/Jobs/Ninja/SendReminders.php

@@ -232,7 +232,6 @@ class SendReminders implements ShouldQueue
         }
         $invoice->service()->touchReminder($template)->save();
 
-        // $invoice->save();
     }
 
     /**

app/Livewire/BillingPortal/Authentication/ClientRegisterService.php

@@ -42,11 +42,11 @@ class ClientRegisterService
         }
 
         foreach ($rules as $field => $properties) {
-            if ($field === 'email') {
+            if ($field == 'email') {
                 $rules[$field] = array_merge($rules[$field], ['email:rfc', 'max:191', Rule::unique('client_contacts')->where('company_id', $this->company->id)]);
             }
 
-            if ($field === 'current_password' || $field === 'password') {
+            if ($field == 'current_password' || $field == 'password') {
                 $rules[$field] = array_merge($rules[$field], ['string', 'min:6', 'confirmed']);
             }
         }

app/Models/Quote.php

@@ -164,6 +164,7 @@ class Quote extends BaseModel
 
     protected $casts = [
         // 'date' => 'date:Y-m-d',
+        'tax_data' => 'object',
         'due_date' => 'date:Y-m-d',
         'partial_due_date' => 'date:Y-m-d',
         'line_items' => 'object',

app/PaymentDrivers/Authorize/AuthorizeTransaction.php

@@ -13,15 +13,16 @@
 namespace App\PaymentDrivers\Authorize;
 
 use App\Models\Invoice;
-use App\PaymentDrivers\AuthorizePaymentDriver;
 use App\Utils\Traits\MakesHash;
-use net\authorize\api\contract\v1\CreateTransactionRequest;
+use App\PaymentDrivers\Authorize\FDSReview;
-use net\authorize\api\contract\v1\ExtendedAmountType;
-use net\authorize\api\contract\v1\OpaqueDataType;
 use net\authorize\api\contract\v1\OrderType;
+use App\PaymentDrivers\AuthorizePaymentDriver;
 use net\authorize\api\contract\v1\PaymentType;
 use net\authorize\api\contract\v1\SettingType;
+use net\authorize\api\contract\v1\OpaqueDataType;
+use net\authorize\api\contract\v1\ExtendedAmountType;
 use net\authorize\api\contract\v1\TransactionRequestType;
+use net\authorize\api\contract\v1\CreateTransactionRequest;
 use net\authorize\api\controller\CreateTransactionController;
 
 /**
@@ -143,6 +144,12 @@ class AuthorizeTransaction
                 nlog(' Code : '.$tresponse->getMessages()[0]->getCode());
                 nlog(' Description : '.$tresponse->getMessages()[0]->getDescription());
                 nlog(print_r($tresponse->getMessages()[0], 1));
+
+                if($tresponse->getResponseCode() == "4"){
+                    //notify user that this transaction is being held under FDS review:
+                        FDSReview::dispatch((string)$tresponse->getTransId(), $this->authorize->payment_hash, $this->authorize->company_gateway->company->db);
+                }
+
             } else {
                 nlog('Transaction Failed ');
                 if ($tresponse->getErrors() != null) {