1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 12:42:36 +01:00

Fixes for company gateways

This commit is contained in:
= 2020-12-28 17:04:44 +11:00
parent e83eb6d657
commit b4b28385e5
2 changed files with 4 additions and 4 deletions

View File

@ -232,6 +232,8 @@ class StepsController extends BaseController
'tax_rates' => $this->getTaxRates(),
'payment_terms' => $this->getPaymentTerms(),
'clients' => $this->getClients(),
'company_gateways' => $this->getCompanyGateways(),
'client_gateway_tokens' => $this->getClientGatewayTokens(),
'vendors' => $this->getVendors(),
'projects' => $this->getProjects(),
'products' => $this->getProducts(),
@ -241,8 +243,6 @@ class StepsController extends BaseController
'quotes' => $this->getQuotes(),
'payments' => array_merge($this->getPayments(), $this->getCredits()),
'documents' => $this->getDocuments(),
'company_gateways' => $this->getCompanyGateways(),
'client_gateway_tokens' => $this->getClientGatewayTokens(),
'expense_categories' => $this->getExpenseCategories(),
'task_statuses' => $this->getTaskStatuses(),
'expenses' => $this->getExpenses(),

View File

@ -1031,7 +1031,7 @@ trait GenerateMigrationResources
{
if($gateway_type == 'token')
continue;
$fees_and_limits = $this->transformFeesAndLimits($gateway_type);
$translated_gateway_type = $this->translateGatewayTypeId($gateway_type);
@ -1655,7 +1655,7 @@ trait GenerateMigrationResources
case 4;
return 4;
case 5:
return 1; // ?
return 2; // ?
case 6:
return 5;
case 7: