mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for company gateways
This commit is contained in:
parent
e83eb6d657
commit
b4b28385e5
@ -232,6 +232,8 @@ class StepsController extends BaseController
|
|||||||
'tax_rates' => $this->getTaxRates(),
|
'tax_rates' => $this->getTaxRates(),
|
||||||
'payment_terms' => $this->getPaymentTerms(),
|
'payment_terms' => $this->getPaymentTerms(),
|
||||||
'clients' => $this->getClients(),
|
'clients' => $this->getClients(),
|
||||||
|
'company_gateways' => $this->getCompanyGateways(),
|
||||||
|
'client_gateway_tokens' => $this->getClientGatewayTokens(),
|
||||||
'vendors' => $this->getVendors(),
|
'vendors' => $this->getVendors(),
|
||||||
'projects' => $this->getProjects(),
|
'projects' => $this->getProjects(),
|
||||||
'products' => $this->getProducts(),
|
'products' => $this->getProducts(),
|
||||||
@ -241,8 +243,6 @@ class StepsController extends BaseController
|
|||||||
'quotes' => $this->getQuotes(),
|
'quotes' => $this->getQuotes(),
|
||||||
'payments' => array_merge($this->getPayments(), $this->getCredits()),
|
'payments' => array_merge($this->getPayments(), $this->getCredits()),
|
||||||
'documents' => $this->getDocuments(),
|
'documents' => $this->getDocuments(),
|
||||||
'company_gateways' => $this->getCompanyGateways(),
|
|
||||||
'client_gateway_tokens' => $this->getClientGatewayTokens(),
|
|
||||||
'expense_categories' => $this->getExpenseCategories(),
|
'expense_categories' => $this->getExpenseCategories(),
|
||||||
'task_statuses' => $this->getTaskStatuses(),
|
'task_statuses' => $this->getTaskStatuses(),
|
||||||
'expenses' => $this->getExpenses(),
|
'expenses' => $this->getExpenses(),
|
||||||
|
@ -1031,7 +1031,7 @@ trait GenerateMigrationResources
|
|||||||
{
|
{
|
||||||
if($gateway_type == 'token')
|
if($gateway_type == 'token')
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
$fees_and_limits = $this->transformFeesAndLimits($gateway_type);
|
$fees_and_limits = $this->transformFeesAndLimits($gateway_type);
|
||||||
|
|
||||||
$translated_gateway_type = $this->translateGatewayTypeId($gateway_type);
|
$translated_gateway_type = $this->translateGatewayTypeId($gateway_type);
|
||||||
@ -1655,7 +1655,7 @@ trait GenerateMigrationResources
|
|||||||
case 4;
|
case 4;
|
||||||
return 4;
|
return 4;
|
||||||
case 5:
|
case 5:
|
||||||
return 1; // ?
|
return 2; // ?
|
||||||
case 6:
|
case 6:
|
||||||
return 5;
|
return 5;
|
||||||
case 7:
|
case 7:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user