mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 23:17:32 -05:00 
			
		
		
		
	Fixes for frequenceis
This commit is contained in:
		
							parent
							
								
									5eb3f89650
								
							
						
					
					
						commit
						3efb8cf252
					
				@ -62,6 +62,7 @@ class ExportMigrations extends Command
 | 
				
			|||||||
        $users = User::all();
 | 
					        $users = User::all();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        foreach($users as $user) {
 | 
					        foreach($users as $user) {
 | 
				
			||||||
 | 
					            Auth::login($user);
 | 
				
			||||||
            $this->export($user);
 | 
					            $this->export($user);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@ -78,18 +79,28 @@ class ExportMigrations extends Command
 | 
				
			|||||||
        $fileName = "{$accountKey}-{$date}-invoiceninja";
 | 
					        $fileName = "{$accountKey}-{$date}-invoiceninja";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $data['data'] = [
 | 
					        $data['data'] = [
 | 
				
			||||||
 | 
					            'account' => $this->getAccount(),
 | 
				
			||||||
            'company' => $this->getCompany(),
 | 
					            'company' => $this->getCompany(),
 | 
				
			||||||
            'users' => $this->getUsers(),
 | 
					            'users' => $this->getUsers(),
 | 
				
			||||||
            'tax_rates' => $this->getTaxRates(),
 | 
					            'tax_rates' => $this->getTaxRates(),
 | 
				
			||||||
 | 
					            'payment_terms' => $this->getPaymentTerms(),
 | 
				
			||||||
            'clients' => $this->getClients(),
 | 
					            'clients' => $this->getClients(),
 | 
				
			||||||
            'products' => $this->getProducts(),
 | 
					 | 
				
			||||||
            'invoices' => $this->getInvoices(),
 | 
					 | 
				
			||||||
            'quotes' => $this->getQuotes(),
 | 
					 | 
				
			||||||
            'payments' => array_merge($this->getPayments(), $this->getCredits()),
 | 
					 | 
				
			||||||
            'credits' => $this->getCreditsNotes(),
 | 
					 | 
				
			||||||
            'documents' => $this->getDocuments(),
 | 
					 | 
				
			||||||
            'company_gateways' => $this->getCompanyGateways(),
 | 
					            'company_gateways' => $this->getCompanyGateways(),
 | 
				
			||||||
            'client_gateway_tokens' => $this->getClientGatewayTokens(),
 | 
					            'client_gateway_tokens' => $this->getClientGatewayTokens(),
 | 
				
			||||||
 | 
					            'vendors' => $this->getVendors(),
 | 
				
			||||||
 | 
					            'projects' => $this->getProjects(),
 | 
				
			||||||
 | 
					            'products' => $this->getProducts(),
 | 
				
			||||||
 | 
					            'credits' => $this->getCreditsNotes(),
 | 
				
			||||||
 | 
					            'invoices' => $this->getInvoices(),
 | 
				
			||||||
 | 
					            'recurring_invoices' => $this->getRecurringInvoices(),
 | 
				
			||||||
 | 
					            'quotes' => $this->getQuotes(),
 | 
				
			||||||
 | 
					            'payments' => array_merge($this->getPayments(), $this->getCredits()),
 | 
				
			||||||
 | 
					            'documents' => $this->getDocuments(),
 | 
				
			||||||
 | 
					            'expense_categories' => $this->getExpenseCategories(),
 | 
				
			||||||
 | 
					            'task_statuses' => $this->getTaskStatuses(),
 | 
				
			||||||
 | 
					            'expenses' => $this->getExpenses(),
 | 
				
			||||||
 | 
					            'tasks' => $this->getTasks(),
 | 
				
			||||||
 | 
					            'documents' => $this->getDocuments(),
 | 
				
			||||||
        ];
 | 
					        ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $file = storage_path("migrations/{$fileName}.zip");
 | 
					        $file = storage_path("migrations/{$fileName}.zip");
 | 
				
			||||||
 | 
				
			|||||||
@ -713,7 +713,7 @@ info("get company");
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            default:
 | 
					            default:
 | 
				
			||||||
                # code...
 | 
					               return 5;
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@ -981,6 +981,7 @@ info("get company");
 | 
				
			|||||||
        $transformed = [];
 | 
					        $transformed = [];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $payments = Payment::where('account_id', $this->account->id)
 | 
					        $payments = Payment::where('account_id', $this->account->id)
 | 
				
			||||||
 | 
					            ->where('payment_status_id', '!=', PAYMENT_STATUS_VOIDED)
 | 
				
			||||||
            ->withTrashed()
 | 
					            ->withTrashed()
 | 
				
			||||||
            ->get();
 | 
					            ->get();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user