Skip to content

add new vats #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EvgenPalich wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add new vats #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions upload/admin/controller/extension/payment/payselection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,8 @@ private function getCurrencyList()



private function getTaxTypeList()
private function getTaxTypeList()
{

return [
[
'numeric' => 0,
Expand All @@ -247,11 +246,18 @@ private function getTaxTypeList()
'numeric' => 2,
'alphabetic' => $this->language->get('entry_vat10')
],
[
'numeric' => 3,
'alphabetic' => $this->language->get('entry_vat5')
],
[
'numeric' => 4,
'alphabetic' => $this->language->get('entry_vat10_110')
],

[
'numeric' => 5,
'alphabetic' => $this->language->get('entry_vat7')
],
[
'numeric' => 6,
'alphabetic' => $this->language->get('entry_vat20')
Expand All @@ -260,6 +266,22 @@ private function getTaxTypeList()
'numeric' => 7,
'alphabetic' => $this->language->get('entry_vat20_120')
],
[
'numeric' => 8,
'alphabetic' => $this->language->get('entry_vat22')
],
[
'numeric' => 9,
'alphabetic' => $this->language->get('entry_vat5_105')
],
[
'numeric' => 10,
'alphabetic' => $this->language->get('entry_vat7_107')
],
[
'numeric' => 11,
'alphabetic' => $this->language->get('entry_vat22_122')
],
];
}

Expand Down
6 changes: 6 additions & 0 deletions upload/admin/language/en-gb/extension/payment/payselection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,18 @@

$_['entry_no_vat'] = 'No VAT';
$_['entry_vat0'] = 'VAT 0%';
$_['entry_vat5'] = 'VAT 5%';
$_['entry_vat7'] = 'VAT 7%';
$_['entry_vat10'] = 'VAT 10%';
$_['entry_vat18'] = 'VAT 18%';
$_['entry_vat20'] = 'VAT 20%';
$_['entry_vat22'] = 'VAT 22%';
$_['entry_vat5_105'] = 'VAT applicable rate 5/105';
$_['entry_vat7_107'] = 'VAT applicable rate 7/107';
$_['entry_vat10_110'] = 'VAT applicable rate 10/110';
$_['entry_vat18_118'] = 'VAT applicable rate 18/118';
$_['entry_vat20_120'] = 'VAT applicable rate 20/120';
$_['entry_vat22_122'] = 'VAT applicable rate 22/122';

$_['entry_tax_system'] = 'Tax system';
$_['entry_tax_system_1'] = 'General';
Expand Down
6 changes: 6 additions & 0 deletions upload/admin/language/ru-ru/extension/payment/payselection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,18 @@

$_['entry_no_vat'] = 'Без НДС';
$_['entry_vat0'] = 'НДС по ставке 0%';
$_['entry_vat5'] = 'НДС по ставке 5%';
$_['entry_vat7'] = 'НДС по ставке 7%';
$_['entry_vat10'] = 'НДС по ставке 10%';
$_['entry_vat18'] = 'НДС по ставке 18%';
$_['entry_vat20'] = 'НДС по ставке 20%';
$_['entry_vat22'] = 'НДС по ставке 22%';
$_['entry_vat5_105'] = 'НДС чека по расчетной ставке 5/105';
$_['entry_vat7_107'] = 'НДС чека по расчетной ставке 7/107';
$_['entry_vat10_110'] = 'НДС чека по расчетной ставке 10/110';
$_['entry_vat18_118'] = 'НДС чека по расчетной ставке 18/118';
$_['entry_vat20_120'] = 'НДС чека по расчетной ставке 20/120';
$_['entry_vat22_122'] = 'НДС чека по расчетной ставке 22/122';

$_['entry_tax_system'] = 'Система налогообложения';
$_['entry_tax_system_1'] = 'Общая';
Expand Down
22 changes: 20 additions & 2 deletions upload/catalog/controller/extension/payment/payselection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function payment()
break;
}

switch ($this->config->get('payment_payselection_taxType')) {
switch ($this->config->get('payment_payselection_taxType')) {
case 0:
$data['companyVAT'] = 'none';
break;
Expand All @@ -123,17 +123,35 @@ public function payment()
case 2:
$data['companyVAT'] = 'vat10';
break;
case 3:
$data['companyVAT'] = 'vat5';
break;
case 4:
$data['companyVAT'] = 'vat110';
break;
case 5:
$data['companyVAT'] = 'vat7';
break;
case 6:
$data['companyVAT'] = 'vat20';
break;
case 7:
$data['companyVAT'] = 'vat120';
break;
case 8:
$data['companyVAT'] = 'vat22';
break;
case 9:
$data['companyVAT'] = 'vat105';
break;
case 10:
$data['companyVAT'] = 'vat107';
break;
case 11:
$data['companyVAT'] = 'vat122';
break;
default:
$data['companyVAT'] = 'osn';
$data['companyVAT'] = 'none';
break;
}

Expand Down