From 8d00142e14e2cd118d4da0426f40340169477917 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 6 May 2021 14:07:30 +0530 Subject: [PATCH] Packed Everything In One Package --- packages/Webkul/Admin/src/Config/system.php | 45 ----------------- packages/Webkul/Tax/src/Config/system.php | 50 +++++++++++++++++++ packages/Webkul/Tax/src/Helpers/Tax.php | 17 +++++-- .../Tax/src/Providers/TaxServiceProvider.php | 9 +++- .../Webkul/Tax/src/Resources/lang/ar/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/de/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/en/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/es/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/fa/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/it/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/nl/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/pl/app.php | 18 +++++++ .../Tax/src/Resources/lang/pt_BR/app.php | 18 +++++++ .../Webkul/Tax/src/Resources/lang/tr/app.php | 18 +++++++ .../Webkul/Tax/src/resources/manifest.php | 6 --- 15 files changed, 249 insertions(+), 58 deletions(-) create mode 100644 packages/Webkul/Tax/src/Config/system.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/ar/app.php create mode 100755 packages/Webkul/Tax/src/Resources/lang/de/app.php create mode 100755 packages/Webkul/Tax/src/Resources/lang/en/app.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/es/app.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/fa/app.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/it/app.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/nl/app.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/pl/app.php create mode 100755 packages/Webkul/Tax/src/Resources/lang/pt_BR/app.php create mode 100644 packages/Webkul/Tax/src/Resources/lang/tr/app.php delete mode 100644 packages/Webkul/Tax/src/resources/manifest.php diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php index 4368cac13..1fbcf9392 100644 --- a/packages/Webkul/Admin/src/Config/system.php +++ b/packages/Webkul/Admin/src/Config/system.php @@ -385,51 +385,6 @@ return [ 'type' => 'boolean', ], ], - ], [ - 'key' => 'taxes', - 'name' => 'admin::app.admin.system.taxes.taxes', - 'sort' => 5, - ], [ - 'key' => 'taxes.catalogue', - 'name' => 'admin::app.admin.system.taxes.catalogue', - 'sort' => 1, - ], [ - 'key' => 'taxes.catalogue.pricing', - 'name' => 'admin::app.admin.system.taxes.pricing', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'tax_inclusive', - 'title' => 'admin::app.admin.system.taxes.tax-inclusive', - 'type' => 'boolean', - 'validation' => 'required', - 'default' => false - ] - ], - ], [ - 'key' => 'taxes.catalogue.default-location-calculation', - 'name' => 'admin::app.admin.system.taxes.default-location-calculation', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'country', - 'title' => 'admin::app.admin.system.taxes.default-country', - 'type' => 'country', - 'default' => '', - ], - [ - 'name' => 'state', - 'title' => 'admin::app.admin.system.taxes.default-state', - 'type' => 'state', - 'default' => '', - ], - [ - 'name' => 'post_code', - 'title' => 'admin::app.admin.system.taxes.default-post-code', - 'type' => 'text', - 'default' => '', - ] - ], ], [ 'key' => 'emails', 'name' => 'admin::app.admin.emails.email', diff --git a/packages/Webkul/Tax/src/Config/system.php b/packages/Webkul/Tax/src/Config/system.php new file mode 100644 index 000000000..3f8d4ec88 --- /dev/null +++ b/packages/Webkul/Tax/src/Config/system.php @@ -0,0 +1,50 @@ + 'taxes', + 'name' => 'tax::app.admin.system.taxes.taxes', + 'sort' => 6, + ], [ + 'key' => 'taxes.catalogue', + 'name' => 'tax::app.admin.system.taxes.catalogue', + 'sort' => 1, + ], [ + 'key' => 'taxes.catalogue.pricing', + 'name' => 'tax::app.admin.system.taxes.pricing', + 'sort' => 1, + 'fields' => [ + [ + 'name' => 'tax_inclusive', + 'title' => 'tax::app.admin.system.taxes.tax-inclusive', + 'type' => 'boolean', + 'validation' => 'required', + 'default' => false + ] + ], + ], [ + 'key' => 'taxes.catalogue.default-location-calculation', + 'name' => 'tax::app.admin.system.taxes.default-location-calculation', + 'sort' => 1, + 'fields' => [ + [ + 'name' => 'country', + 'title' => 'tax::app.admin.system.taxes.default-country', + 'type' => 'country', + 'default' => '', + ], + [ + 'name' => 'state', + 'title' => 'tax::app.admin.system.taxes.default-state', + 'type' => 'state', + 'default' => '', + ], + [ + 'name' => 'post_code', + 'title' => 'tax::app.admin.system.taxes.default-post-code', + 'type' => 'text', + 'default' => '', + ] + ], + ] +]; \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Helpers/Tax.php b/packages/Webkul/Tax/src/Helpers/Tax.php index a52e056e9..123ffc527 100644 --- a/packages/Webkul/Tax/src/Helpers/Tax.php +++ b/packages/Webkul/Tax/src/Helpers/Tax.php @@ -5,17 +5,24 @@ namespace Webkul\Tax\Helpers; class Tax { /** + * Tax rate precission. + * * @var int */ private const TAX_RATE_PRECISION = 4; + + /** + * Tax amount precision. + * + * @var int + */ private const TAX_AMOUNT_PRECISION = 2; /** - * Returns an array with tax rates and tax amount - * - * @param object $that - * @param bool $asBase + * Returns an array with tax rates and tax amount. * + * @param object $that + * @param bool $asBase * @return array */ public static function getTaxRatesWithAmount(object $that, bool $asBase = false): array @@ -41,7 +48,7 @@ class Tax } /** - * Returns the total tax amount + * Returns the total tax amount. * * @param object $that * @param bool $asBase diff --git a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php index 181258405..c27eea21b 100755 --- a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php +++ b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php @@ -1,4 +1,5 @@ loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); + $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories'); + $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'tax'); } /** @@ -22,6 +25,8 @@ class TaxServiceProvider extends ServiceProvider */ public function register() { - $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories'); + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/system.php', 'core' + ); } -} \ No newline at end of file +} diff --git a/packages/Webkul/Tax/src/Resources/lang/ar/app.php b/packages/Webkul/Tax/src/Resources/lang/ar/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/ar/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/de/app.php b/packages/Webkul/Tax/src/Resources/lang/de/app.php new file mode 100755 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/de/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/en/app.php b/packages/Webkul/Tax/src/Resources/lang/en/app.php new file mode 100755 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/en/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/es/app.php b/packages/Webkul/Tax/src/Resources/lang/es/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/es/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/fa/app.php b/packages/Webkul/Tax/src/Resources/lang/fa/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/fa/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/it/app.php b/packages/Webkul/Tax/src/Resources/lang/it/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/it/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/nl/app.php b/packages/Webkul/Tax/src/Resources/lang/nl/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/nl/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/pl/app.php b/packages/Webkul/Tax/src/Resources/lang/pl/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/pl/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Tax/src/Resources/lang/pt_BR/app.php new file mode 100755 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/pt_BR/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/Resources/lang/tr/app.php b/packages/Webkul/Tax/src/Resources/lang/tr/app.php new file mode 100644 index 000000000..bf136b406 --- /dev/null +++ b/packages/Webkul/Tax/src/Resources/lang/tr/app.php @@ -0,0 +1,18 @@ + [ + 'system' => [ + 'taxes' => [ + 'taxes' => 'Taxes', + 'catalogue' => 'Catalogue', + 'pricing' => 'Pricing', + 'tax-inclusive' => 'Tax inclusive', + 'default-location-calculation' => 'Default Location Calculation', + 'default-country' => 'Default Country', + 'default-state' => 'Default State', + 'default-post-code' => 'Default Post Code', + ], + ] + ] +]; diff --git a/packages/Webkul/Tax/src/resources/manifest.php b/packages/Webkul/Tax/src/resources/manifest.php deleted file mode 100644 index 4d0ec1557..000000000 --- a/packages/Webkul/Tax/src/resources/manifest.php +++ /dev/null @@ -1,6 +0,0 @@ - 'Webkul Bagisto Tax', - 'version' => '0.0.1' - ];