diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1dacd12..e1e05f8 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,3 +18,5 @@ jobs: secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_PAT: ${{ secrets.GH_PAT }} + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + diff --git a/Admin/Install/Media/bill.pdf.php b/Admin/Install/Media/bill.pdf.php index c71d8f2..e60edad 100755 --- a/Admin/Install/Media/bill.pdf.php +++ b/Admin/Install/Media/bill.pdf.php @@ -260,8 +260,6 @@ foreach ($taxes as $rate => $tax) { $pdf->Ln(); } -// @todo: add currency - $pdf->setFillColor(255, 162, 7); $pdf->setTextColor(255); $pdf->setDrawColor(255, 162, 7); diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 6b6e789..2845692 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -197,21 +197,6 @@ } ] }, - { - "id": 1005107001, - "pid": "/sales/analysis", - "type": 3, - "subtype": 1, - "name": "Bill", - "uri": "{/base}/sales/analysis/bill", - "target": "self", - "icon": null, - "order": 15, - "from": "Billing", - "permission": { "permission": 2, "category": null, "element": null }, - "parent": 1001602001, - "children": [] - }, { "id": 1005108001, "pid": "/purchase/analysis", @@ -224,7 +209,7 @@ "order": 15, "from": "Billing", "permission": { "permission": 2, "category": null, "element": null }, - "parent": 1001602001, + "parent": 1002101001, "children": [] }, { @@ -232,8 +217,8 @@ "pid": "/", "type": 2, "subtype": 1, - "name": "Purchase", - "uri": "{/base}/private/purchase/billing/dashboard?{?}", + "name": "InvoiceRecognition", + "uri": "{/base}/private/purchase/recognition/dashboard?{?}", "target": "self", "icon": null, "order": 5, @@ -247,7 +232,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/private/purchase/billing/dashboard?{?}", + "uri": "{/base}/private/purchase/recognition/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -263,7 +248,7 @@ "type": 3, "subtype": 1, "name": "Upload", - "uri": "{/base}/private/purchase/billing/upload?{?}", + "uri": "{/base}/private/purchase/recognition/upload?{?}", "target": "self", "icon": null, "order": 5, @@ -274,5 +259,53 @@ ] } ] + }, + { + "id": 1005110001, + "pid": "/", + "type": 2, + "subtype": 1, + "name": "InvoiceRecognition", + "uri": "{/base}/purchase/recognition/dashboard?{?}", + "target": "self", + "icon": null, + "order": 5, + "from": "Billing", + "permission": { "permission": 2, "category": null, "element": null }, + "parent": 1003401001, + "children": [ + { + "id": 1005110101, + "pid": "/", + "type": 3, + "subtype": 1, + "name": "List", + "uri": "{/base}/purchase/recognition/dashboard?{?}", + "target": "self", + "icon": null, + "order": 1, + "from": "Billing", + "permission": { "permission": 2, "category": null, "element": null }, + "parent": 1005110001, + "children": [ + ] + }, + { + "id": 1005110201, + "pid": "/", + "type": 3, + "subtype": 1, + "name": "Upload", + "uri": "{/base}/purchase/recognition/upload?{?}", + "target": "self", + "icon": null, + "order": 5, + "from": "Billing", + "permission": { "permission": 2, "category": null, "element": null }, + "parent": 1005110001, + "children": [ + ] + } + ] } ] diff --git a/Admin/Installer.php b/Admin/Installer.php index 7ced5b7..38d9f93 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -135,7 +135,7 @@ final class Installer extends InstallerAbstract $module->apiBillAttributeTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; @@ -207,7 +207,7 @@ final class Installer extends InstallerAbstract $module->apiBillAttributeValueCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -293,7 +293,7 @@ final class Installer extends InstallerAbstract $module->apiTaxCombinationCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } @@ -345,7 +345,7 @@ final class Installer extends InstallerAbstract $module->apiBillTypeCreate($request, $response); - $responseData = $response->get(''); + $responseData = $response->getData(''); if (!\is_array($responseData)) { continue; } diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index fd20f01..082061c 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -131,41 +131,7 @@ return [ ], ], - '^.*/sales/analysis/bill(\?.*|$)$' => [ - [ - 'dest' => '\Modules\Billing\Controller\BackendController:viewBillAnalysis', - 'verb' => RouteVerb::GET, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::SALES_INVOICE, - ], - ], - ], - '^.*/sales/analysis/rep(\?.*|$)$' => [ - [ - 'dest' => '\Modules\Billing\Controller\BackendController:viewSalesRepAnalysis', - 'verb' => RouteVerb::GET, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::SALES_ANALYSIS, - ], - ], - ], - '^.*/sales/analysis/region(\?.*|$)$' => [ - [ - 'dest' => '\Modules\Billing\Controller\BackendController:viewRegionAnalysis', - 'verb' => RouteVerb::GET, - 'permission' => [ - 'module' => BackendController::NAME, - 'type' => PermissionType::READ, - 'state' => PermissionCategory::SALES_ANALYSIS, - ], - ], - ], - - '^.*/private/purchase/billing/dashboard.*$' => [ + '^.*/private/purchase/recognition/dashboard.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillDashboard', 'verb' => RouteVerb::GET, @@ -176,7 +142,7 @@ return [ ], ], ], - '^.*/private/purchase/billing/upload.*$' => [ + '^.*/private/purchase/recognition/upload.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillUpload', 'verb' => RouteVerb::GET, @@ -187,7 +153,40 @@ return [ ], ], ], - '^.*/private/purchase/billing/bill.*$' => [ + '^.*/private/purchase/recognition/bill.*$' => [ + [ + 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivateBillingPurchaseInvoice', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::PRIVATE_DASHBOARD, + ], + ], + ], + '^.*/purchase/recognition/dashboard.*$' => [ + [ + 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillDashboard', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::PRIVATE_DASHBOARD, + ], + ], + ], + '^.*/purchase/recognition/upload.*$' => [ + [ + 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivatePurchaseBillUpload', + 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => BackendController::NAME, + 'type' => PermissionType::READ, + 'state' => PermissionCategory::PRIVATE_BILL_UPLOAD, + ], + ], + ], + '^.*/purchase/recognition/bill.*$' => [ [ 'dest' => '\Modules\Billing\Controller\BackendController:viewPrivateBillingPurchaseInvoice', 'verb' => RouteVerb::GET, diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 318b120..d61aa61 100755 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -61,7 +61,8 @@ final class ApiAttributeController extends Controller return; } - $attribute = $this->createAttributeFromRequest($request); + $type = BillAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute(); + $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, BillAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); } @@ -358,7 +359,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $old */ - $old = BillAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = BillAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $new = $this->updateAttributeTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, BillAttributeTypeMapper::class, 'bill_attribute_type', $request->getOrigin()); @@ -390,7 +391,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $billAttributeType */ - $billAttributeType = BillAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $billAttributeType = BillAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $billAttributeType, BillAttributeTypeMapper::class, 'bill_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $billAttributeType); } diff --git a/Controller/ApiBillController.php b/Controller/ApiBillController.php index e0e1e11..984b8ba 100755 --- a/Controller/ApiBillController.php +++ b/Controller/ApiBillController.php @@ -182,8 +182,10 @@ final class ApiBillController extends Controller { $this->createModel($request->header->account, $bill, BillMapper::class, 'bill', $request->getOrigin()); - // We ned to get the bill again since the bill has a trigger which is executed on insert - // @todo: consider to remove the trigger and select the latest bill here and add + 1 to the new sequence since we have to tdo an update anyways + // We need to get the bill again since the bill has a trigger which is executed on insert + // Doing this manually would cause concurrency issues because there are times (up to 200ms) + // when the previous element doesn't have a sequence defined. + /** @var Bill $bill */ $tmp = BillMapper::get() ->where('id', $bill->id) @@ -192,7 +194,7 @@ final class ApiBillController extends Controller $bill->sequence = $tmp->sequence; $old = clone $bill; - $bill->buildNumber(); // The bill id is part of the number + $bill->buildNumber(); // The bill sequence number is part of the number $this->updateModel($request->header->account, $old, $bill, BillMapper::class, 'bill', $request->getOrigin()); } @@ -537,7 +539,7 @@ final class ApiBillController extends Controller ->execute(); if (\count($billCollection) !== 1) { - // For some reason there are multiple collections with the same virtual path? + // @todo: For some reason there are multiple collections with the same virtual path? // @todo: check if this is the correct way to handle it or if we need to make sure that it is a collection return; } diff --git a/Controller/ApiPriceController.php b/Controller/ApiPriceController.php index 9ed86ed..4ee4b38 100755 --- a/Controller/ApiPriceController.php +++ b/Controller/ApiPriceController.php @@ -106,7 +106,6 @@ final class ApiPriceController extends Controller } // Get all relevant prices - // @todo: allow to define NOT IN somehow (e.g. not in France -> simple solution to define export prices etc.) $queryMapper = PriceMapper::getAll(); if ($request->hasData('price_name')) { diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 09ead1d..3969848 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -367,320 +367,6 @@ final class BackendController extends Controller return $view; } - /** - * Routing end-point for application behaviour. - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param array $data Generic data - * - * @return RenderableInterface - * - * @since 1.0.0 - * @codeCoverageIgnore - */ - public function viewRegionAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface - { - $head = $response->data['Content']->head; - $nonce = $this->app->appSettings->getOption('script-nonce'); - - $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); - $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]); - $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']); - - $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Billing/Theme/Backend/region-analysis'); - $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response); - - $monthlySalesCosts = []; - for ($i = 1; $i < 13; ++$i) { - $monthlySalesCosts[] = [ - 'net_sales' => $sales = \mt_rand(1200000000, 2000000000), - 'net_costs' => (int) ($sales * \mt_rand(25, 55) / 100), - 'year' => 2020, - 'month' => $i, - ]; - } - - $view->data['monthlySalesCosts'] = $monthlySalesCosts; - - ///// - $currentCustomerRegion = [ - 'Europe' => (int) (\mt_rand(200, 400) / 4), - 'America' => (int) (\mt_rand(200, 400) / 4), - 'Asia' => (int) (\mt_rand(200, 400) / 4), - 'Africa' => (int) (\mt_rand(200, 400) / 4), - 'CIS' => (int) (\mt_rand(200, 400) / 4), - 'Other' => (int) (\mt_rand(200, 400) / 4), - ]; - - $view->data['currentCustomerRegion'] = $currentCustomerRegion; - - $annualCustomerRegion = []; - for ($i = 1; $i < 11; ++$i) { - $annualCustomerRegion[] = [ - 'year' => 2020 - 10 + $i, - 'Europe' => $a = (int) (\mt_rand(200, 400) / 4), - 'America' => $b = (int) (\mt_rand(200, 400) / 4), - 'Asia' => $c = (int) (\mt_rand(200, 400) / 4), - 'Africa' => $d = (int) (\mt_rand(200, 400) / 4), - 'CIS' => $e = (int) (\mt_rand(200, 400) / 4), - 'Other' => $f = (int) (\mt_rand(200, 400) / 4), - 'Total' => $a + $b + $c + $d + $e + $f, - ]; - } - - $view->data['annualCustomerRegion'] = $annualCustomerRegion; - - ///// - $monthlySalesCustomer = []; - for ($i = 1; $i < 13; ++$i) { - $monthlySalesCustomer[] = [ - 'net_sales' => $sales = \mt_rand(1200000000, 2000000000), - 'customers' => \mt_rand(200, 400), - 'year' => 2020, - 'month' => $i, - ]; - } - - $view->data['monthlySalesCustomer'] = $monthlySalesCustomer; - - $annualSalesCustomer = []; - for ($i = 1; $i < 11; ++$i) { - $annualSalesCustomer[] = [ - 'net_sales' => $sales = \mt_rand(1200000000, 2000000000) * 12, - 'customers' => \mt_rand(200, 400) * 6, - 'year' => 2020 - 10 + $i, - ]; - } - - $view->data['annualSalesCustomer'] = $annualSalesCustomer; - - ///// - $monthlyCustomerRetention = []; - for ($i = 1; $i < 10; ++$i) { - $monthlyCustomerRetention[] = [ - 'customers' => \mt_rand(200, 400), - 'year' => \date('y') - 9 + $i, - ]; - } - - $view->data['monthlyCustomerRetention'] = $monthlyCustomerRetention; - - ///// - $currentCustomerRegion = [ - 'Europe' => (int) (\mt_rand(200, 400) / 4), - 'America' => (int) (\mt_rand(200, 400) / 4), - 'Asia' => (int) (\mt_rand(200, 400) / 4), - 'Africa' => (int) (\mt_rand(200, 400) / 4), - 'CIS' => (int) (\mt_rand(200, 400) / 4), - 'Other' => (int) (\mt_rand(200, 400) / 4), - ]; - - $view->data['currentCustomerRegion'] = $currentCustomerRegion; - - $annualCustomerRegion = []; - for ($i = 1; $i < 11; ++$i) { - $annualCustomerRegion[] = [ - 'year' => 2020 - 10 + $i, - 'Europe' => $a = (int) (\mt_rand(200, 400) / 4), - 'America' => $b = (int) (\mt_rand(200, 400) / 4), - 'Asia' => $c = (int) (\mt_rand(200, 400) / 4), - 'Africa' => $d = (int) (\mt_rand(200, 400) / 4), - 'CIS' => $e = (int) (\mt_rand(200, 400) / 4), - 'Other' => $f = (int) (\mt_rand(200, 400) / 4), - 'Total' => $a + $b + $c + $d + $e + $f, - ]; - } - - $view->data['annualCustomerRegion'] = $annualCustomerRegion; - - ///// - $currentCustomersRep = []; - for ($i = 1; $i < 13; ++$i) { - $currentCustomersRep['Rep ' . $i] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - ]; - } - - \uasort($currentCustomersRep, function($a, $b) { - return $b['customers'] <=> $a['customers']; - }); - - $view->data['currentCustomersRep'] = $currentCustomersRep; - - $annualCustomersRep = []; - for ($i = 1; $i < 13; ++$i) { - $annualCustomersRep['Rep ' . $i] = []; - - for ($j = 1; $j < 11; ++$j) { - $annualCustomersRep['Rep ' . $i][] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - 'year' => 2020 - 10 + $j, - ]; - } - } - - $view->data['annualCustomersRep'] = $annualCustomersRep; - - ///// - $currentCustomersCountry = []; - for ($i = 1; $i < 51; ++$i) { - $country = (string) ISO3166NameEnum::getRandom(); - $currentCustomersCountry[\substr($country, 0, 20)] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - ]; - } - - \uasort($currentCustomersCountry, function($a, $b) { - return $b['customers'] <=> $a['customers']; - }); - - $view->data['currentCustomersCountry'] = $currentCustomersCountry; - - $annualCustomersCountry = []; - for ($i = 1; $i < 51; ++$i) { - $countryCode = ISO3166CharEnum::getRandom(); - $countryName = (string) ISO3166NameEnum::getByName('_' . $countryCode); - $annualCustomersCountry[\substr($countryName, 0, 20)] = []; - - for ($j = 1; $j < 11; ++$j) { - $annualCustomersCountry[\substr($countryName, 0, 20)][] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - 'year' => 2020 - 10 + $j, - 'name' => $countryName, - 'code' => $countryCode, - ]; - } - } - - $view->data['annualCustomersCountry'] = $annualCustomersCountry; - - ///// - $customerGroups = []; - for ($i = 1; $i < 7; ++$i) { - $customerGroups['Group ' . $i] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - ]; - } - - $view->data['customerGroups'] = $customerGroups; - - return $view; - } - - /** - * Routing end-point for application behaviour. - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param array $data Generic data - * - * @return RenderableInterface - * - * @since 1.0.0 - * @codeCoverageIgnore - */ - public function viewBillAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface - { - $head = $response->data['Content']->head; - $nonce = $this->app->appSettings->getOption('script-nonce'); - - $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); - $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]); - $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']); - - $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Billing/Theme/Backend/bill-analysis'); - $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response); - - return $view; - } - - /** - * Routing end-point for application behaviour. - * - * @param RequestAbstract $request Request - * @param ResponseAbstract $response Response - * @param array $data Generic data - * - * @return RenderableInterface - * - * @since 1.0.0 - * @codeCoverageIgnore - */ - public function viewSalesRepAnalysis(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface - { - $head = $response->data['Content']->head; - $nonce = $this->app->appSettings->getOption('script-nonce'); - - $head->addAsset(AssetType::CSS, 'Resources/chartjs/Chartjs/chart.css'); - $head->addAsset(AssetType::JSLATE, 'Resources/chartjs/Chartjs/chart.js', ['nonce' => $nonce]); - $head->addAsset(AssetType::JSLATE, 'Modules/ClientManagement/Controller.js', ['nonce' => $nonce, 'type' => 'module']); - - $view = new View($this->app->l11nManager, $request, $response); - $view->setTemplate('/Modules/Billing/Theme/Backend/rep-analysis'); - $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001602001, $request, $response); - - ///// - $currentCustomerRegion = [ - 'Europe' => (int) (\mt_rand(200, 400) / 4), - 'America' => (int) (\mt_rand(200, 400) / 4), - 'Asia' => (int) (\mt_rand(200, 400) / 4), - 'Africa' => (int) (\mt_rand(200, 400) / 4), - 'CIS' => (int) (\mt_rand(200, 400) / 4), - 'Other' => (int) (\mt_rand(200, 400) / 4), - ]; - - $view->data['currentCustomerRegion'] = $currentCustomerRegion; - - $annualCustomerRegion = []; - for ($i = 1; $i < 11; ++$i) { - $annualCustomerRegion[] = [ - 'year' => 2020 - 10 + $i, - 'Europe' => $a = (int) (\mt_rand(200, 400) / 4), - 'America' => $b = (int) (\mt_rand(200, 400) / 4), - 'Asia' => $c = (int) (\mt_rand(200, 400) / 4), - 'Africa' => $d = (int) (\mt_rand(200, 400) / 4), - 'CIS' => $e = (int) (\mt_rand(200, 400) / 4), - 'Other' => $f = (int) (\mt_rand(200, 400) / 4), - 'Total' => $a + $b + $c + $d + $e + $f, - ]; - } - - $view->data['annualCustomerRegion'] = $annualCustomerRegion; - - ///// - $currentCustomersRep = []; - for ($i = 1; $i < 13; ++$i) { - $currentCustomersRep['Rep ' . $i] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - ]; - } - - \uasort($currentCustomersRep, function($a, $b) { - return $b['customers'] <=> $a['customers']; - }); - - $view->data['currentCustomersRep'] = $currentCustomersRep; - - $annualCustomersRep = []; - for ($i = 1; $i < 13; ++$i) { - $annualCustomersRep['Rep ' . $i] = []; - - for ($j = 1; $j < 11; ++$j) { - $annualCustomersRep['Rep ' . $i][] = [ - 'customers' => (int) (\mt_rand(200, 400) / 12), - 'year' => 2020 - 10 + $j, - ]; - } - } - - $view->data['annualCustomersRep'] = $annualCustomersRep; - - return $view; - } - /** * Routing end-point for application behaviour. * diff --git a/Models/Bill.php b/Models/Bill.php index c00784b..5ed024f 100755 --- a/Models/Bill.php +++ b/Models/Bill.php @@ -414,7 +414,7 @@ class Bill implements \JsonSerializable * @var array * @since 1.0.0 */ - private array $vouchers = []; + public array $vouchers = []; /** * Tracking ids for shipping. @@ -422,7 +422,7 @@ class Bill implements \JsonSerializable * @var array * @since 1.0.0 */ - private array $trackings = []; + public array $trackings = []; /** * Bill elements / bill lines. diff --git a/Models/BillElement.php b/Models/BillElement.php index 9292ad7..059ecf2 100755 --- a/Models/BillElement.php +++ b/Models/BillElement.php @@ -48,7 +48,7 @@ class BillElement implements \JsonSerializable public string $itemDescription = ''; - protected int $quantity = 0; + public int $quantity = 0; public ?Subscription $subscription = null; @@ -257,7 +257,7 @@ class BillElement implements \JsonSerializable $element->totalPurchasePriceNet->setInt($element->quantity * $item->purchasePrice->getInt()); $element->singleProfitNet->setInt($element->singleSalesPriceNet->getInt() - $element->singlePurchasePriceNet->getInt()); - $element->totalProfitNet->setInt($element->quantity * ($element->totalSalesPriceNet->getInt() - $element->totalPurchasePriceNet->getInt())); + $element->totalProfitNet->setInt($element->totalSalesPriceNet->getInt() - $element->totalPurchasePriceNet->getInt()); $element->taxP = new FloatInt((int) (($code->percentageInvoice * $element->totalSalesPriceNet->getInt()) / 10000)); $element->taxR = new FloatInt($code->percentageInvoice); diff --git a/Models/BillType.php b/Models/BillType.php index ecf20f6..10e0574 100755 --- a/Models/BillType.php +++ b/Models/BillType.php @@ -57,7 +57,7 @@ class BillType implements \JsonSerializable * * @var string|BaseStringL11n */ - protected string | BaseStringL11n $l11n; + public string | BaseStringL11n $l11n; public bool $isTemplate = false; diff --git a/README.md b/README.md index f5e456e..af4f138 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,75 @@ -# Billing +

Logo

-Sample invoices as selection for offers promotions etc. +The Karaka software is a modular web application for small to mid sized companies that need CRM, ERP, Intranet and/or CMS functionalities and much more. -credit note by selecting invoice(s) via checkbox \ No newline at end of file +With Karaka you have one partner who can provide many tools and software solutions you are used to at fair and reasonable prices even for small organizations and companies/startups. Our solutions can be used independently from each other or fully integrated with other solutions we provide. By choosing Karaka as your partner you'll be able to adjust your software based on the changes in your requirements without worrying about integration and workflow optimization. + +## Table of Contents + +- [Table of Contents](#table-of-contents) +- [Requirements](#requirements) + - [Developer tools](#developer-tools) +- [Installation](#installation) +- [Philosophy & Demo](#philosophy--demo) +- [Development status](#development-status) +- [Tech stack](#tech-stack) +- [Become a contributor](#become-a-contributor) +- [Misc](#misc) + +## Requirements + +* PHP 8.1 +* PHP extension: php8.1-dev php8.1-cli php8.1-common php8.1-mysql php8.1-pgsql php8.1-xdebug php8.1-opcache php8.1-pdo php8.1-sqlite php8.1-mbstring php8.1-curl php8.1-imap php8.1-bcmath php8.1-zip php8.1-dom php8.1-xml php8.1-phar php8.1-gd php-pear +* apache2 (recommended) or nginx +* mysql-server (recommended) or postgresql postgresql-contrib +* Tools: tesseract-ocr, pdftotext, pdftoppm +* Make sure that URL rewriting is active! + +### Developer tools + +* Php extension: xdebug +* Tools: Composer, Npm +* Composer tools: phpstan, phpunit, phpcs +* Npm tools: eslint + +## Installation + +Detailed installation instructions can be found at: + +* [Developer Setup](https://github.com/Karaka-Management/Developer-Guide/blob/develop/general/setup.md) +* [User Setup](https://github.com/Karaka-Management/User-Guide/blob/develop/setup/install.md) + +## Philosophy & Demo + +We believe software should support a business in it's daily tasks and growth in a very efficient way without frustration. In order to achieve this we constantly take feedback from our customers and expand and improve our software solutions. + +You can find a freely available online demo at https://demo.karaka.app (user: admin, pass: orange) without any registration or inquiry. + +## Development status + +Currently Karaka is still developing the first Alpha version. As soon as we have a running Beta version we are allowing external testers to use our software and a selected amount of inhouse developed modules. + +General updates can be found in our info section at https://jingga.app/info and developer updates can be found in our developer section at https://jingga.app/dev. In our developer section you can also check out the automatically generated reports such as code coverage, code style, static analysis etc. as well as our code style guide lines and developer documentation. + +* [Project Status](https://github.com/Karaka-Management/Organization-Guide/blob/master/Project/PROJECT.md) + +## Tech stack + +* Language: php, js, c/c++, c#, html, css, markdown, shell script +* Database: Maria/MySQL, PostgreSQL, MSSQL/SQLSrv, SQLite +* Webserver: apache2, nginx +* Cache: Redis, Memcached + +## Become a contributor + +Karaka has a very open culture and we always welcome new people who share our philosophy in providing create solutions which just work. You can find the development process description which also describes how to become a contributer in the [Organization documentation](https://github.com/Karaka-Management/Organization-Guide/blob/master/Processes/Development.md). + +## Misc + +* End-User documentation: https://github.com/Karaka-Management/Documentation +* Developer documentation: https://github.com/Karaka-Management/Developer-Guide +* Organization documentation: https://github.com/Karaka-Management/Organization-Guide +* Website: [https://jingga.app](https://jingga.app) +* Demo: [https://jingga.app](https://jingga.app) (user: admin, pass: orange) +* Dev: [https://jingga.app/dev](https://jingga.app/dev) +* Contact: info@jingga.app diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index c03a246..7aa0f42 100755 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ b/Theme/Backend/Lang/Navigation.ar.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'أرشيف', - 'Bill' => 'فاتورة', - 'Billing' => 'الفواتير', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'أرشيف', + 'Bill' => 'فاتورة', + 'Billing' => 'الفواتير', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php index edabf77..ea42018 100755 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ b/Theme/Backend/Lang/Navigation.cs.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiv', - 'Bill' => 'Účtovat', - 'Billing' => 'Fakturační', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiv', + 'Bill' => 'Účtovat', + 'Billing' => 'Fakturační', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php index bdea83c..f877e46 100755 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ b/Theme/Backend/Lang/Navigation.da.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkiv', - 'Bill' => 'Regning', - 'Billing' => 'Fakturering', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkiv', + 'Bill' => 'Regning', + 'Billing' => 'Fakturering', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index eda8fab..38cca7d 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiv', - 'Bill' => 'Rechnung', - 'Billing' => 'Billing', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiv', + 'Bill' => 'Rechnung', + 'Billing' => 'Billing', + 'InvoiceRecognition' => 'Rechnungserkennung', + 'Open' => 'Offen', + 'Upload' => 'Hochladen', ]]; diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php index f511be7..d354442 100755 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ b/Theme/Backend/Lang/Navigation.el.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Αρχειοθέτηση', - 'Bill' => 'Νομοσχέδιο', - 'Billing' => 'Χρέωση', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Αρχειοθέτηση', + 'Bill' => 'Νομοσχέδιο', + 'Billing' => 'Χρέωση', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 6ea27d2..f446247 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archive', - 'Bill' => 'Bill', - 'Billing' => 'Billing', - 'Open' => 'Open', - 'Upload' => 'Upload', + 'Archive' => 'Archive', + 'Bill' => 'Bill', + 'Billing' => 'Billing', + 'InvoiceRecognition' => 'Invoice Recognition', + 'Open' => 'Open', + 'Upload' => 'Upload', ]]; diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php index c87183d..bb891a5 100755 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ b/Theme/Backend/Lang/Navigation.es.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archivo', - 'Bill' => 'Factura', - 'Billing' => 'Facturación', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archivo', + 'Bill' => 'Factura', + 'Billing' => 'Facturación', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php index 9d63807..af202a4 100755 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ b/Theme/Backend/Lang/Navigation.fi.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkisto', - 'Bill' => 'Laskuttaa', - 'Billing' => 'Laskutus', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkisto', + 'Bill' => 'Laskuttaa', + 'Billing' => 'Laskutus', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php index 6ee96e2..b03b3f9 100755 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ b/Theme/Backend/Lang/Navigation.fr.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiver', - 'Bill' => 'Facture', - 'Billing' => 'Facturation', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiver', + 'Bill' => 'Facture', + 'Billing' => 'Facturation', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php index 33229e9..3ed9664 100755 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ b/Theme/Backend/Lang/Navigation.hu.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archívum', - 'Bill' => 'Számla', - 'Billing' => 'Számlázás', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archívum', + 'Bill' => 'Számla', + 'Billing' => 'Számlázás', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php index ffb3031..b6b0fa5 100755 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ b/Theme/Backend/Lang/Navigation.it.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archivio', - 'Bill' => 'Conto', - 'Billing' => 'Fatturazione', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archivio', + 'Bill' => 'Conto', + 'Billing' => 'Fatturazione', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php index 1faecd1..cf31987 100755 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ b/Theme/Backend/Lang/Navigation.ja.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'アーカイブ', - 'Bill' => '明細書', - 'Billing' => '請求する', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'アーカイブ', + 'Bill' => '明細書', + 'Billing' => '請求する', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php index 12222ea..3bf7a27 100755 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ b/Theme/Backend/Lang/Navigation.ko.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => '보관소', - 'Bill' => '청구서', - 'Billing' => '청구자', - 'Open' => '', - 'Upload' => '', + 'Archive' => '보관소', + 'Bill' => '청구서', + 'Billing' => '청구자', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php index 181cf36..eff6adc 100755 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ b/Theme/Backend/Lang/Navigation.no.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkivet', - 'Bill' => 'Regning', - 'Billing' => 'Fakturering', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkivet', + 'Bill' => 'Regning', + 'Billing' => 'Fakturering', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php index dc706cf..c73685d 100755 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ b/Theme/Backend/Lang/Navigation.pl.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Archiwum.', - 'Bill' => 'Rachunek', - 'Billing' => 'Dane do faktury', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Archiwum.', + 'Bill' => 'Rachunek', + 'Billing' => 'Dane do faktury', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php index f7aac44..3b1a805 100755 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ b/Theme/Backend/Lang/Navigation.pt.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arquivo', - 'Bill' => 'Conta', - 'Billing' => 'Cobrança', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arquivo', + 'Bill' => 'Conta', + 'Billing' => 'Cobrança', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php index b3f20b5..34375fd 100755 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ b/Theme/Backend/Lang/Navigation.ru.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Архив', - 'Bill' => 'Счет', - 'Billing' => 'Биллинг', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Архив', + 'Bill' => 'Счет', + 'Billing' => 'Биллинг', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php index 5306ef0..2804b86 100755 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ b/Theme/Backend/Lang/Navigation.sv.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arkiv', - 'Bill' => 'Räkningen', - 'Billing' => 'Fakturering', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arkiv', + 'Bill' => 'Räkningen', + 'Billing' => 'Fakturering', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php index 57ae735..22105de 100755 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ b/Theme/Backend/Lang/Navigation.th.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'คลังเก็บเอกสารสำคัญ', - 'Bill' => 'ใบแจ้งหนี้', - 'Billing' => 'การเรียกเก็บเงิน', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'คลังเก็บเอกสารสำคัญ', + 'Bill' => 'ใบแจ้งหนี้', + 'Billing' => 'การเรียกเก็บเงิน', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php index 586f95f..6a59987 100755 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ b/Theme/Backend/Lang/Navigation.tr.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Arşiv', - 'Bill' => 'Fatura', - 'Billing' => 'Fatura', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Arşiv', + 'Bill' => 'Fatura', + 'Billing' => 'Fatura', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php index 05624c8..326287b 100755 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ b/Theme/Backend/Lang/Navigation.uk.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => 'Архів', - 'Bill' => 'Вексель', - 'Billing' => 'Платіж', - 'Open' => '', - 'Upload' => '', + 'Archive' => 'Архів', + 'Bill' => 'Вексель', + 'Billing' => 'Платіж', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php index 056f9dc..15de1af 100755 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ b/Theme/Backend/Lang/Navigation.zh.lang.php @@ -13,9 +13,10 @@ declare(strict_types=1); return ['Navigation' => [ - 'Archive' => '档案', - 'Bill' => '账单', - 'Billing' => '结算', - 'Open' => '', - 'Upload' => '', + 'Archive' => '档案', + 'Bill' => '账单', + 'Billing' => '结算', + 'InvoiceRecognition' => '', + 'Open' => '', + 'Upload' => '', ]]; diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 939edb0..1f81fe3 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'تبوك', 'Addresses' => 'عناوين', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'مدفوع بالفعل', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'فواتير', 'Bonus' => 'علاوة', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'استرداد النقدي', 'City' => 'مدينة', 'Client' => 'عميل', 'ClientID' => 'معرف العميل', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'تأكيد', 'Country' => 'دولة', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'بطاقة إئتمان', 'CreditNote' => 'اشعار دائن', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'تاريخ', 'Delivery' => 'توصيل', 'DeliveryNote' => 'مذكرة تسليم', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'خصم ٪', 'Due' => 'بسبب', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'شحن', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'أزداد', 'Invoice' => 'فاتورة', 'Invoices' => 'الفواتير', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'شبكة', 'Offer' => 'عرض', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'دفع', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'بريدي', 'Prepaid' => 'مسبقة الدفع', 'Preview' => 'معاينة', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'ربح', 'Quantity' => 'كمية', 'Recipient' => 'متلقي', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'يختار', 'Shipment' => 'شحنة', 'Source' => 'مصدر', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'نوع', 'Types' => '', 'Upload' => 'تحميل', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'تفاوت', 'Zip' => 'أزيز', ]]; diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index ea145db..0c5f3bd 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adresa', 'Addresses' => 'Adresy', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Již zaplatil', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Účtenka', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Hotovost', 'City' => 'Město', 'Client' => 'Klienta', 'ClientID' => 'ID klienta', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'potvrzení', 'Country' => 'Země', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Kreditní karta', 'CreditNote' => 'Dobropis', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'datum', 'Delivery' => 'dodávka', 'DeliveryNote' => 'Dodací list', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Sleva%', 'Due' => 'Způsoben', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Dopravné', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Hrubý', 'Invoice' => 'Faktura', 'Invoices' => 'Faktury', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Síť', 'Offer' => 'Nabídka', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Způsob platby', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Poštovní', 'Prepaid' => 'Předplacený', 'Preview' => 'Náhled', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Zisk', 'Quantity' => 'Množství', 'Recipient' => 'Příjemce', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Vybrat', 'Shipment' => 'náklad', 'Source' => 'Zdroj', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Typ', 'Types' => '', 'Upload' => 'nahrát', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variace', 'Zip' => 'Zip', ]]; diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index 170903f..3495b7f 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adresse', 'Addresses' => 'Adresser', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Allerede betalt', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Regninger.', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Penge tilbage', 'City' => 'City.', 'Client' => 'Klient', 'ClientID' => 'Klient ID.', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Bekræftelse', 'Country' => 'Land', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Kreditkort', 'CreditNote' => 'Kreditnota', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Dato', 'Delivery' => 'Levering', 'DeliveryNote' => 'Levering note', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Rabat%', 'Due' => 'På grund', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Gods', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Brutto', 'Invoice' => 'Faktura', 'Invoices' => 'Fakturaer.', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Net', 'Offer' => 'Tilbud', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Betaling', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal.', 'Prepaid' => 'Forudbetalt', 'Preview' => 'Preview.', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Profit', 'Quantity' => 'Antal', 'Recipient' => 'Modtager', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Vælg', 'Shipment' => 'Forsendelse', 'Source' => 'Kilde', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Type', 'Types' => '', 'Upload' => 'Upload', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variation', 'Zip' => 'Zip.', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 3bdbf2c..876e11e 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -31,7 +31,7 @@ return ['Billing' => [ 'CIS' => 'CIS', 'Cashback' => 'Kennzeichnen', 'City' => 'Stadt', - 'Client' => 'Klient', + 'Client' => 'Kunde', 'ClientID' => 'Kunden ID', 'ComparisonTime' => 'Vergleichszeit', 'Confirmation' => 'Bestätigung', @@ -70,8 +70,7 @@ return ['Billing' => [ 'Original' => 'Original', 'Other' => 'Sonstige', 'Payment' => 'Zahlung', - 'PaymentPlan' => '', - 'PazmentPlan' => 'Zahlplan', + 'PaymentPlan' => 'Zahlungsplan', 'Postal' => 'Post', 'Prepaid' => 'Vorausbezahlt', 'Preview' => 'Vorschau', diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index ae406bb0..f79d7b5 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Διεύθυνση', 'Addresses' => 'Διευθύνσεις', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Ήδη πληρωθεί', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Λογαριασμοί', 'Bonus' => 'Δώρο', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Επιστροφή μετρητών', 'City' => 'Πόλη', 'Client' => 'Πελάτης', 'ClientID' => 'ταυτότητα πελάτη', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Επιβεβαίωση', 'Country' => 'Χώρα', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Πιστωτική κάρτα', 'CreditNote' => 'Πιστωτικό σημείωμα', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Ημερομηνία', 'Delivery' => 'Διανομή', 'DeliveryNote' => 'Δελτίο παράδοσης', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Έκπτωση%', 'Due' => 'Λόγω', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Ναύλος', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Ακαθάριστο', 'Invoice' => 'Τιμολόγιο', 'Invoices' => 'Τιμολόγια', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Καθαρά', 'Offer' => 'Προσφορά', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Πληρωμή', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Ταχυδρομικός', 'Prepaid' => 'Προπληρωμένος', 'Preview' => 'Προεπισκόπηση', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Κέρδος', 'Quantity' => 'Ποσότητα', 'Recipient' => 'Παραλήπτης', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Επιλέγω', 'Shipment' => 'Αποστολή', 'Source' => 'Πηγή', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Τύπος', 'Types' => '', 'Upload' => 'Μεταφόρτω', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Παραλλαγή', 'Zip' => 'Φερμουάρ', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 71d82bd..5aa7212 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -71,7 +71,6 @@ return ['Billing' => [ 'Other' => 'Other', 'Payment' => 'Payment', 'PaymentPlan' => 'Payment Plan', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Prepaid', 'Preview' => 'Preview', diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 0f81877..4338aa8 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Habla a', 'Addresses' => 'Direcciones', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Ya pagado', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Facturas', 'Bonus' => 'Prima', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Devolución de dinero', 'City' => 'Ciudad', 'Client' => 'Cliente', 'ClientID' => 'Identificación del cliente', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Confirmación', 'Country' => 'País', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Tarjeta de crédito', 'CreditNote' => 'Nota de crédito', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Fecha', 'Delivery' => 'Entrega', 'DeliveryNote' => 'Nota de entrega', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Descuento%', 'Due' => 'Vencer', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Flete', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Bruto', 'Invoice' => 'Factura', 'Invoices' => 'Facturas', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Red', 'Offer' => 'Oferta', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Pago', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Pagado por adelantado', 'Preview' => 'Avance', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Lucro', 'Quantity' => 'Cantidad', 'Recipient' => 'Recipiente', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Seleccione', 'Shipment' => 'Envío', 'Source' => 'Fuente', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Escribe', 'Types' => '', 'Upload' => 'Subir', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variación', 'Zip' => 'Cremallera', ]]; diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 8c28bab..f026bb7 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Osoite', 'Addresses' => 'Osoitteet', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Jo maksettu', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Laskut', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Vaihtorahat', 'City' => 'Kaupunki', 'Client' => 'Asiakas', 'ClientID' => 'Asiakastunnus', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Vahvistus', 'Country' => 'Maa', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Luottokortti', 'CreditNote' => 'Luottoluotto', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Päivämäärä', 'Delivery' => 'Toimitus', 'DeliveryNote' => 'Saapumisilmoitus', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Alennus %', 'Due' => 'Takia', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Rahti', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Ällöttävä', 'Invoice' => 'Lasku', 'Invoices' => 'Laskut', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Netto', 'Offer' => 'Tarjous', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Maksu', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Posti-', 'Prepaid' => 'Prepaid', 'Preview' => 'Esikatselu', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Voitto', 'Quantity' => 'Määrä', 'Recipient' => 'Vastaanottaja', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Valitse', 'Shipment' => 'Lähetys', 'Source' => 'Lähde', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Tyyppi', 'Types' => '', 'Upload' => 'Ladata', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Vaihtelu', 'Zip' => 'Postinumero', ]]; diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index 5734b55..bfeff4d 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adresse', 'Addresses' => 'Adresses', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Déjà payé', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Factures', 'Bonus' => 'Prime', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Remise en argent', 'City' => 'Ville', 'Client' => 'Client', 'ClientID' => 'identité du client', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Confirmation', 'Country' => 'Pays', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Carte de crédit', 'CreditNote' => 'Note de crédit', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Date', 'Delivery' => 'Livraison', 'DeliveryNote' => 'Bon de livraison', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Remise %', 'Due' => 'Dû', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Fret', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Brut', 'Invoice' => 'Facture d\'achat', 'Invoices' => 'Factures', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Rapporter', 'Offer' => 'Offrir', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Paiement', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Prépayé', 'Preview' => 'Aperçu', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Profit', 'Quantity' => 'Quantité', 'Recipient' => 'Destinataire', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Sélectionner', 'Shipment' => 'Expédition', 'Source' => 'La source', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Taper', 'Types' => '', 'Upload' => 'Télécharger', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variation', 'Zip' => 'Zipper', ]]; diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index 0bf4fa7..f27a41b 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Cím', 'Addresses' => 'Címek', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Fizetve', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Számlák', 'Bonus' => 'Bónusz', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Pénzvisszafizetés', 'City' => 'Város', 'Client' => 'Ügyfél', 'ClientID' => 'Ügyfélazonosító', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Megerősítés', 'Country' => 'Ország', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Hitelkártya', 'CreditNote' => 'Jóváírás', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Dátum', 'Delivery' => 'Szállítás', 'DeliveryNote' => 'Fuvarlevél', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Árengedmény%', 'Due' => 'Esedékes', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Fuvardíj', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Bruttó', 'Invoice' => 'Számla', 'Invoices' => 'Számlák', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Háló', 'Offer' => 'Ajánlat', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Fizetés', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postai', 'Prepaid' => 'Előre kifizetett', 'Preview' => 'Előnézet', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Nyereség', 'Quantity' => 'Mennyiség', 'Recipient' => 'Befogadó', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Kiválaszt', 'Shipment' => 'Szállítmány', 'Source' => 'Forrás', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'típus', 'Types' => '', 'Upload' => 'Feltöltés', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variáció', 'Zip' => 'Postai irányítószám', ]]; diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index d778cf7..a4f4b6b 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Indirizzo', 'Addresses' => 'Indirizzi', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Già pagato', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Fatture', 'Bonus' => 'Bonus.', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Rimborso', 'City' => 'Città', 'Client' => 'Cliente', 'ClientID' => 'Identificativo cliente', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Conferma', 'Country' => 'Nazione', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Carta di credito', 'CreditNote' => 'Nota di credito', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Data', 'Delivery' => 'Consegna', 'DeliveryNote' => 'Bolla d\'accompagnamento', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Sconto%', 'Due' => 'Dovuto', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Liberare', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Schifoso', 'Invoice' => 'Fattura', 'Invoices' => 'Fatture', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Rete', 'Offer' => 'Offerta', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Pagamento', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'postale', 'Prepaid' => 'Prepagato', 'Preview' => 'Anteprima', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Profitto', 'Quantity' => 'Quantità', 'Recipient' => 'Destinatario', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Selezionare', 'Shipment' => 'Spedizione', 'Source' => 'Fonte', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Tipo', 'Types' => '', 'Upload' => 'Caricamento', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variazione', 'Zip' => 'Cerniera lampo', ]]; diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index 3f35552..301905e 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => '住所', 'Addresses' => 'アドレス', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => '既に支払いました', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'bill', 'Bonus' => 'ボーナス', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'キャッシュバック', 'City' => '市', 'Client' => 'クライアント', 'ClientID' => 'クライアントID', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => '確認', 'Country' => '国', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'クレジットカード', 'CreditNote' => 'クレジットノート', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => '日にち', 'Delivery' => '配達', 'DeliveryNote' => '配達メモ', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => '割引 ％', 'Due' => '期限', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'fre fre', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'きもい', 'Invoice' => '請求書', 'Invoices' => '請求書', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'ネット', 'Offer' => 'オファー', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => '支払い', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => '郵便', 'Prepaid' => '前払い', 'Preview' => 'プレビュー', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => '利益', 'Quantity' => '量', 'Recipient' => '受信者', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => '選択する', 'Shipment' => '出荷', 'Source' => 'ソース', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'タイプ', 'Types' => '', 'Upload' => 'アップロード', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => '変化', 'Zip' => 'ジップ', ]]; diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index a2dca1e..f168827 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => '주소', 'Addresses' => '구애', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => '이미 지불', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => '청구서', 'Bonus' => '보너스', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => '현금', 'City' => '도시', 'Client' => '고객', 'ClientID' => '클라이언트 ID.', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => '확인', 'Country' => '국가', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => '신용 카드', 'CreditNote' => '신용 노트', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => '날짜', 'Delivery' => '배달', 'DeliveryNote' => '배달 메모', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => '할인 %', 'Due' => '로 인한', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => '화물', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => '역겨운', 'Invoice' => '송장', 'Invoices' => '송장', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => '그물', 'Offer' => '권하다', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => '지불', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => '우편 엽서', 'Prepaid' => '선불', 'Preview' => '시사', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => '이익', 'Quantity' => '수량', 'Recipient' => '받는 사람', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => '선택하다', 'Shipment' => '선적', 'Source' => '원천', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => '유형', 'Types' => '', 'Upload' => '업로드', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => '변화', 'Zip' => '지퍼', ]]; diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index 3ff3d0c..5211e39 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adresse', 'Addresses' => 'Adresser', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Allerede betalt', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Regninger', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Penger tilbake', 'City' => 'By', 'Client' => 'Klient', 'ClientID' => 'klient-ID', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Bekreftelse', 'Country' => 'Land', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Kredittkort', 'CreditNote' => 'Kredittnota', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Dato', 'Delivery' => 'Leveranse', 'DeliveryNote' => 'Leveringsnotat', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Rabatt%', 'Due' => 'På grunn av det', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Frakt', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Ekkelt', 'Invoice' => 'Faktura', 'Invoices' => 'Fakturaer', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Nett', 'Offer' => 'By på', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'innbetaling', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal.', 'Prepaid' => 'Forhåndsbetalt', 'Preview' => 'Forhåndsvisning', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Profitt', 'Quantity' => 'Mengde', 'Recipient' => 'Mottaker', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Plukke ut', 'Shipment' => 'Forsendelse', 'Source' => 'Kilde', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Type', 'Types' => '', 'Upload' => 'Laste opp', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variasjon', 'Zip' => 'Glidelås', ]]; diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 9ee287c..90fcfa8 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adres', 'Addresses' => 'Adresy', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Już zapłacone', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Rachunki', 'Bonus' => 'Premia', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Zwrot gotówki', 'City' => 'Miasto', 'Client' => 'Klient', 'ClientID' => 'Identyfikator klienta', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Potwierdzenie', 'Country' => 'Kraj', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Karta kredytowa', 'CreditNote' => 'Uwaga kredytowa', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Data', 'Delivery' => 'Dostawa', 'DeliveryNote' => 'Dowód dostawy', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Zniżka %', 'Due' => 'Z powodu', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Frachtowanie', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Brutto', 'Invoice' => 'Faktura', 'Invoices' => 'Faktury', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Internet', 'Offer' => 'Oferta', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Zapłata', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Pocztowy', 'Prepaid' => 'Opłacony z góry', 'Preview' => 'Zapowiedź', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Zysk', 'Quantity' => 'Ilość', 'Recipient' => 'Odbiorca', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Wybierać', 'Shipment' => 'Wysyłka', 'Source' => 'Źródło', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Rodzaj', 'Types' => '', 'Upload' => 'Wgrywać', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Zmiana', 'Zip' => 'Zamek błyskawiczny', ]]; diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index 3d53b1f..b411655 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Endereço', 'Addresses' => 'Endereços', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Já pago', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Notas', 'Bonus' => 'Bônus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Dinheiro de volta', 'City' => 'Cidade', 'Client' => 'Cliente', 'ClientID' => 'ID do Cliente', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Confirmação', 'Country' => 'País', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Cartão de crédito', 'CreditNote' => 'Nota de crédito', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Encontro', 'Delivery' => 'Entrega', 'DeliveryNote' => 'Nota de entrega', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Desconto%', 'Due' => 'Vencimento', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Freightage', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Bruto', 'Invoice' => 'Fatura', 'Invoices' => 'Faturas', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Internet', 'Offer' => 'Oferta', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Pagamento', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Postal', 'Prepaid' => 'Pré-pago', 'Preview' => 'Pré-visualização', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Lucro', 'Quantity' => 'Quantidade', 'Recipient' => 'Destinatário', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Selecione.', 'Shipment' => 'envio', 'Source' => 'Fonte', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Modelo', 'Types' => '', 'Upload' => 'Envio', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variação', 'Zip' => 'Fecho eclair', ]]; diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 6dde069..385b0a8 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Адрес', 'Addresses' => 'Адреса', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Уже оплачено', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Счета', 'Bonus' => 'Бонус', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Возврат наличных', 'City' => 'Город', 'Client' => 'Клиент', 'ClientID' => 'ID клиента', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Подтверждение', 'Country' => 'Страна', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Кредитная карта', 'CreditNote' => 'Кредитная нота', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Дата', 'Delivery' => 'Доставка', 'DeliveryNote' => 'Накладная', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Скидка %', 'Due' => 'Должное', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Фрахты', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Валовой', 'Invoice' => 'Счет', 'Invoices' => 'Счета', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Сеть', 'Offer' => 'Предложение', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Оплата', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Почтовый', 'Prepaid' => 'Предоплаты', 'Preview' => 'Превью', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Выгода', 'Quantity' => 'Количество', 'Recipient' => 'Получатель', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Выбирать', 'Shipment' => 'Отгрузка', 'Source' => 'Источник', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Тип', 'Types' => '', 'Upload' => 'Загрузить', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Вариация', 'Zip' => 'Zip.', ]]; diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index a7c395f..22c7ea2 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adress', 'Addresses' => 'Adresser', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Redan betalat', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Räkningar', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Pengar tillbaka', 'City' => 'Stad', 'Client' => 'Klient', 'ClientID' => 'Klient ID', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Bekräftelse', 'Country' => 'Land', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Kreditkort', 'CreditNote' => 'Kreditanteckning', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Datum', 'Delivery' => 'Leverans', 'DeliveryNote' => 'Leveransanteckning', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Rabatt%', 'Due' => 'På grund av', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Frakt', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Äckligt', 'Invoice' => 'Faktura', 'Invoices' => 'Fakturor', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Netto', 'Offer' => 'Erbjudande', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Betalning', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Post', 'Prepaid' => 'Förbetalt', 'Preview' => 'Förhandsvisning', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Vinst', 'Quantity' => 'Kvantitet', 'Recipient' => 'Mottagare', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Välj', 'Shipment' => 'Sändning', 'Source' => 'Källa', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Typ', 'Types' => '', 'Upload' => 'Ladda upp', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Variation', 'Zip' => 'Blixtlås', ]]; diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 16a28c5..82955dc 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'ที่อยู่', 'Addresses' => 'ที่อยู่', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'จ่ายแล้ว', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'การเรียกเก็บเงิน', 'Bonus' => 'โบนัส', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'เงินคืน', 'City' => 'เมือง', 'Client' => 'ลูกค้า', 'ClientID' => 'รหัสลูกค้า', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'การยืนยัน', 'Country' => 'ประเทศ', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'บัตรเครดิต', 'CreditNote' => 'ใบลดหนี้', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'วันที่', 'Delivery' => 'จัดส่ง', 'DeliveryNote' => 'บันทึกการส่งมอบ', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'การลดราคา %', 'Due' => 'เนื่องจาก', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'การขนส่งสินค้า', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'ทั้งหมด', 'Invoice' => 'ใบแจ้งหนี้', 'Invoices' => 'ใบแจ้งหนี้', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'สุทธิ', 'Offer' => 'เสนอ', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'การชำระเงิน', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'เกี่ยวกับการไปรษณีย์', 'Prepaid' => 'ชำระล่วงหน้า', 'Preview' => 'ดูตัวอย่าง', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'กำไร', 'Quantity' => 'ปริมาณ', 'Recipient' => 'ผู้รับ', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'เลือก', 'Shipment' => 'การจัดส่ง', 'Source' => 'แหล่งที่มา', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'พิมพ์', 'Types' => '', 'Upload' => 'ที่อัพโหลด', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'การเปลี่ยนแปลง', 'Zip' => 'ซิป', ]]; diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 0c91ec3..7d4a468 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Adres', 'Addresses' => 'Adresler', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Zaten ödendi', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Faturalar', 'Bonus' => 'Bonus', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Nakit para', 'City' => 'Şehir', 'Client' => 'Müşteri', 'ClientID' => 'Müşteri Kimliği', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Onayla', 'Country' => 'Ülke', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Kredi kartı', 'CreditNote' => 'Kredi notu', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Tarih', 'Delivery' => 'Teslimat', 'DeliveryNote' => 'Teslimat notu', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'İndirim %', 'Due' => 'Vadesi dolmuş', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Yük', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Brüt', 'Invoice' => 'Fatura', 'Invoices' => 'Faturalar', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Ağ', 'Offer' => 'Teklif', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Ödeme', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Posta', 'Prepaid' => 'Ön ödemeli', 'Preview' => 'Ön izleme', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Kâr', 'Quantity' => 'Miktar', 'Recipient' => 'Alıcı', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Seçme', 'Shipment' => 'gönderi', 'Source' => 'Kaynak', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Tip', 'Types' => '', 'Upload' => 'Yüklemek', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'varyasyon', 'Zip' => 'Zip', ]]; diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index c1046fe..bd1dafd 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => 'Адреса', 'Addresses' => 'Адреси', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => 'Вже оплачено', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => 'Векселі', 'Bonus' => 'Бонус', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => 'Готівка', 'City' => 'Місто', 'Client' => 'Клієнт', 'ClientID' => 'Ідентифікатор клієнта', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => 'Підтвердження', 'Country' => 'Країна', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => 'Кредитна карта', 'CreditNote' => 'Кредитове авізо', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => 'Дата', 'Delivery' => 'Доставка', 'DeliveryNote' => 'Накладна', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => 'Знижка%', 'Due' => 'Заборгованість', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'Фрахт', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => 'Валовий', 'Invoice' => 'Рахунок-фактура', 'Invoices' => 'Рахунки-фактури', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => 'Сітка', 'Offer' => 'Пропозиція', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => 'Платіж', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => 'Поштовий', 'Prepaid' => 'Передплачений', 'Preview' => 'Попередній перегляд', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => 'Прибуток', 'Quantity' => 'Кількість', 'Recipient' => 'Одержувач', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => 'Вибирати', 'Shipment' => 'Відвантаження', 'Source' => 'Джерело', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => 'Тип', 'Types' => '', 'Upload' => 'Завантажувати', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => 'Зміна', 'Zip' => 'Блиск', ]]; diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index 8fb9a47..57a23db 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -15,25 +15,25 @@ declare(strict_types=1); return ['Billing' => [ 'Address' => '地址', 'Addresses' => '地址', - 'Africa' => '#VALUE!', + 'Africa' => '', 'AlreadyPaid' => '已付款', - 'America' => '#VALUE!', + 'America' => '', 'Amount' => '', - 'Analyse' => '#VALUE!', + 'Analyse' => '', 'Archive' => '', - 'Articles' => '#VALUE!', - 'Asia' => '#VALUE!', - 'Attribute' => '#VALUE!', - 'BaseTime' => '#VALUE!', + 'Articles' => '', + 'Asia' => '', + 'Attribute' => '', + 'BaseTime' => '', 'Billing' => '', 'Bills' => '账单', 'Bonus' => '奖金', - 'CIS' => '#VALUE!', + 'CIS' => '', 'Cashback' => '返现金', 'City' => '城市', 'Client' => '客户', 'ClientID' => '客户ID', - 'ComparisonTime' => '#VALUE!', + 'ComparisonTime' => '', 'Confirmation' => '确认', 'Country' => '国家', 'CreateBill' => '', @@ -41,7 +41,7 @@ return ['Billing' => [ 'CreditCard' => '信用卡', 'CreditNote' => '信用票据', 'Currency' => '', - 'Customers' => '#VALUE!', + 'Customers' => '', 'Date' => '日期', 'Delivery' => '交货', 'DeliveryNote' => '送货单', @@ -50,10 +50,10 @@ return ['Billing' => [ 'DiscountP' => '折扣 ％', 'Due' => '到期的', 'Email' => '', - 'Europe' => '#VALUE!', - 'Filter' => '#VALUE!', + 'Europe' => '', + 'Filter' => '', 'Freightage' => 'FRIGUTAGE.', - 'General' => '#VALUE!', + 'General' => '', 'Gross' => '总的', 'Invoice' => '发票', 'Invoices' => '发票', @@ -68,10 +68,9 @@ return ['Billing' => [ 'Net' => '网', 'Offer' => '提供', 'Original' => '', - 'Other' => '#VALUE!', + 'Other' => '', 'Payment' => '支付', 'PaymentPlan' => '', - 'PazmentPlan' => '', 'Postal' => '邮政', 'Prepaid' => '预付款', 'Preview' => '预览', @@ -79,9 +78,9 @@ return ['Billing' => [ 'Profit' => '利润', 'Quantity' => '数量', 'Recipient' => '接受者', - 'Region' => '#VALUE!', - 'Rep' => '#VALUE!', - 'Sales' => '#VALUE!', + 'Region' => '', + 'Rep' => '', + 'Sales' => '', 'Select' => '选择', 'Shipment' => '运输', 'Source' => '来源', @@ -93,7 +92,7 @@ return ['Billing' => [ 'Type' => '类型', 'Types' => '', 'Upload' => '上传', - 'Value' => '#VALUE!', + 'Value' => '', 'Variation' => '变化', 'Zip' => '压缩', ]]; diff --git a/Theme/Backend/bill-analysis.tpl.php b/Theme/Backend/bill-analysis.tpl.php deleted file mode 100755 index 73eea63..0000000 --- a/Theme/Backend/bill-analysis.tpl.php +++ /dev/null @@ -1,21 +0,0 @@ -data['nav']->render(); diff --git a/Theme/Backend/purchase-bill.tpl.php b/Theme/Backend/purchase-bill.tpl.php index b696646..f84badb 100755 --- a/Theme/Backend/purchase-bill.tpl.php +++ b/Theme/Backend/purchase-bill.tpl.php @@ -22,6 +22,7 @@ include __DIR__ . '/../../../Media/Theme/Backend/template-functions.php'; * @var \phpOMS\Views\View $this */ +/** @var \Modules\Billing\Models\Bill $bill */ $bill = $this->data['bill']; $elements = $bill->getElements(); @@ -29,7 +30,7 @@ $previewType = $this->data['previewType']; $originalType = $this->data['originalType']; $billPdf = $bill->getFileByType($previewType); $original = $bill->getFileByType($originalType); -$media = $bill->getMedia(); +$media = $bill->files; echo $this->data['nav']->render(); ?> @@ -219,7 +220,7 @@ echo $this->data['nav']->render(); ?>
id > 0) : ?> - +
diff --git a/Theme/Backend/region-analysis.tpl.php b/Theme/Backend/region-analysis.tpl.php deleted file mode 100755 index de64e04..0000000 --- a/Theme/Backend/region-analysis.tpl.php +++ /dev/null @@ -1,1756 +0,0 @@ -data['nav']->render(); -?> - -
-
- -
-
- request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>> -
-
-
-
-
-
getHtml('Filter'); ?>
-
-
- - -
- -
-
- - -
- -
- - -
-
- -
-
- - -
- -
- - -
-
- -
- - -
- -
- - -
- -
- - -
-
-
-
-
-
-
-
- - request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>> -
-
-
-
-
- Sales per Region - Current - -
- data['currentCustomerRegion']; ?> -
- , - , - , - , - , - - ], - "backgroundColor": [ - "rgb(255, 99, 132)", - "rgb(255, 159, 64)", - "rgb(255, 205, 86)", - "rgb(75, 192, 192)", - "rgb(54, 162, 235)", - "rgb(153, 102, 255)" - ] - }] - }, - "options": { - "title": { - "display": false, - "text": "Customers per Region - Currently" - } - } - }'> - -
- - -
- - - - - $values) : $sum += $values; ?> - - -
Region - Customer count -
- - -
Total - -
-
-
-
-
-
- -
-
-
- Sales per Region - Annual - -
- data['annualCustomerRegion']; ?> -
- - - ], - "datasets": [ - { - "label": "getHtml('Total'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(139, 139, 139)", - "backgroundColor": "rgb(139, 139, 139)", - "tension": 0.0 - }, - { - "label": "getHtml('Europe'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('America'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 159, 64)", - "backgroundColor": "rgb(255, 159, 64)", - "tension": 0.0 - }, - { - "label": "getHtml('Asia'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 205, 86)", - "backgroundColor": "rgb(255, 205, 86)", - "tension": 0.0 - }, - { - "label": "getHtml('Africa'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(75, 192, 192)", - "backgroundColor": "rgb(75, 192, 192)", - "tension": 0.0 - }, - { - "label": "getHtml('CIS'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - }, - { - "label": "getHtml('Other'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(153, 102, 255)", - "backgroundColor": "rgb(153, 102, 255)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Sales per Region - Annual" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - } - ] - } - } - }'> - -
- - -
- - - - - - -
Region - $values) : ?> - - -
- $annual) : ?> - - -
-
-
-
-
-
-
- -
-
-
-
- Profit per Region - Current - -
- data['currentCustomerRegion']; ?> -
- , - , - , - , - , - - ], - "backgroundColor": [ - "rgb(255, 99, 132)", - "rgb(255, 159, 64)", - "rgb(255, 205, 86)", - "rgb(75, 192, 192)", - "rgb(54, 162, 235)", - "rgb(153, 102, 255)" - ] - }] - }, - "options": { - "title": { - "display": false, - "text": "Customers per Region - Currently" - } - } - }'> - -
- - -
- - - - - $values) : $sum += $values; ?> - - -
Region - Customer count -
- - -
Total - -
-
-
-
-
-
- -
-
-
- Profit per Region - Annual - -
- data['annualCustomerRegion']; ?> -
- - - ], - "datasets": [ - { - "label": "getHtml('Total'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(139, 139, 139)", - "backgroundColor": "rgb(139, 139, 139)", - "tension": 0.0 - }, - { - "label": "getHtml('Europe'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('America'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 159, 64)", - "backgroundColor": "rgb(255, 159, 64)", - "tension": 0.0 - }, - { - "label": "getHtml('Asia'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 205, 86)", - "backgroundColor": "rgb(255, 205, 86)", - "tension": 0.0 - }, - { - "label": "getHtml('Africa'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(75, 192, 192)", - "backgroundColor": "rgb(75, 192, 192)", - "tension": 0.0 - }, - { - "label": "getHtml('CIS'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - }, - { - "label": "getHtml('Other'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(153, 102, 255)", - "backgroundColor": "rgb(153, 102, 255)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Sales per Region - Annual" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - } - ] - } - } - }'> - -
- - -
- - - - - - -
Region - $values) : ?> - - -
- $annual) : ?> - - -
-
-
-
-
-
-
- -
-
-
-
- Sales / Region - -
- - - - -
Country - Sales PY - Sales B - Sales A - Diff PY - Diff B -
-
-
-
-
- - request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>> -
-
-
-
-
-
getHtml('Filter'); ?>
-
-
- - -
-
-
-
-
-
-
- -
-
-
-
- Sales / Profit - Monthly - -
- data['monthlySaleCustomer']; ?> -
- - - ], - "datasets": [ - { - "label": "getHtml('Profit'); ?>", - "type": "line", - "data": [ - - - ], - "yAxisID": "axis-2", - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('Sales'); ?>", - "type": "bar", - "data": [ - - - ], - "yAxisID": "axis-1", - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Sales / Profit" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - }, - { - "id": "axis-2", - "display": true, - "position": "right", - "scaleLabel": { - "display": true, - "labelString": "getHtml('Profit'); ?>" - }, - "gridLines": { - "display": false - } - } - ] - } - } - }'> -
- - -
- - - - - - - -
Month - Sales - Profit - Profit % -
- getCurrency(); ?> - - - -
Total - getCurrency(); ?> - - -
-
-
-
-
-
- -
-
-
- Sales / Profit - Annual - -
- data['annualSaleCustomer']; ?> -
- - - ], - "datasets": [ - { - "label": "getHtml('Profit'); ?>", - "type": "line", - "data": [ - - - ], - "yAxisID": "axis-2", - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('Sales'); ?>", - "type": "bar", - "data": [ - - - ], - "yAxisID": "axis-1", - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Sales / Profit" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - }, - { - "id": "axis-2", - "display": true, - "position": "right", - "scaleLabel": { - "display": true, - "labelString": "getHtml('Profit'); ?>" - }, - "gridLines": { - "display": false - } - } - ] - } - } - }'> -
- - -
- - - - - - -
Year - Sales - Profit - Profit % -
- getCurrency(); ?> - - - -
-
-
-
-
-
- -
-
-
- Sales per Attribute - Current - -
- data['customerGroups']; ?> -
-
- - -
- -
- - ], - "datasets": [{ - "data": [ - - - ], - "backgroundColor": [ - "rgb(255, 99, 132)", - "rgb(255, 159, 64)", - "rgb(255, 205, 86)", - "rgb(75, 192, 192)", - "rgb(54, 162, 235)", - "rgb(153, 102, 255)" - ] - }] - }, - "options": { - "title": { - "display": false, - "text": "Customers per group" - } - } - }'> -
- -
- - -
- - - - - $values) : $sum += $values['customers']; ?> - - -
Groups - Customer count -
- - -
Total - -
-
-
-
-
-
- -
-
-
- Sales per Attribute - Annual - -
- data['annualCustomerRegion']; ?> -
-
- - -
- -
- - - ], - "datasets": [ - { - "label": "getHtml('Total'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(139, 139, 139)", - "backgroundColor": "rgb(139, 139, 139)", - "tension": 0.0 - }, - { - "label": "getHtml('Europe'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('America'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 159, 64)", - "backgroundColor": "rgb(255, 159, 64)", - "tension": 0.0 - }, - { - "label": "getHtml('Asia'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 205, 86)", - "backgroundColor": "rgb(255, 205, 86)", - "tension": 0.0 - }, - { - "label": "getHtml('Africa'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(75, 192, 192)", - "backgroundColor": "rgb(75, 192, 192)", - "tension": 0.0 - }, - { - "label": "getHtml('CIS'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - }, - { - "label": "getHtml('Other'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(153, 102, 255)", - "backgroundColor": "rgb(153, 102, 255)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Customers per Region - Annual" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - } - ] - } - } - }'> -
- -
- - -
- - - - - - -
Region - $values) : ?> - - -
- $annual) : ?> - - -
-
-
-
-
-
- -
-
-
- Profit per Attribute - Current - -
- data['customerGroups']; ?> -
-
- - -
- -
- - ], - "datasets": [{ - "data": [ - - - ], - "backgroundColor": [ - "rgb(255, 99, 132)", - "rgb(255, 159, 64)", - "rgb(255, 205, 86)", - "rgb(75, 192, 192)", - "rgb(54, 162, 235)", - "rgb(153, 102, 255)" - ] - }] - }, - "options": { - "title": { - "display": false, - "text": "Customers per group" - } - } - }'> -
- -
- - -
- - - - - $values) : $sum += $values['customers']; ?> - - -
Groups - Customer count -
- - -
Total - -
-
-
-
-
-
- -
-
-
- Profit per Attribute - Annual - -
- data['annualCustomerRegion']; ?> -
-
- - -
- -
- - - ], - "datasets": [ - { - "label": "getHtml('Total'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(139, 139, 139)", - "backgroundColor": "rgb(139, 139, 139)", - "tension": 0.0 - }, - { - "label": "getHtml('Europe'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('America'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 159, 64)", - "backgroundColor": "rgb(255, 159, 64)", - "tension": 0.0 - }, - { - "label": "getHtml('Asia'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(255, 205, 86)", - "backgroundColor": "rgb(255, 205, 86)", - "tension": 0.0 - }, - { - "label": "getHtml('Africa'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(75, 192, 192)", - "backgroundColor": "rgb(75, 192, 192)", - "tension": 0.0 - }, - { - "label": "getHtml('CIS'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - }, - { - "label": "getHtml('Other'); ?>", - "type": "line", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(153, 102, 255)", - "backgroundColor": "rgb(153, 102, 255)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Customers per Region - Annual" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - } - ] - } - } - }'> -
- -
- - -
- - - - - - -
Region - $values) : ?> - - -
- $annual) : ?> - - -
-
-
-
-
-
- -
-
-
- Invoices / Articles - Monthly - -
- data['monthlySaleCustomer']; ?> -
- - - ], - "datasets": [ - { - "label": "getHtml('Articles'); ?>", - "type": "line", - "data": [ - - - ], - "yAxisID": "axis-2", - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('Sales'); ?>", - "type": "bar", - "data": [ - - - ], - "yAxisID": "axis-1", - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Sales / Articles" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - }, - { - "id": "axis-2", - "display": true, - "position": "right", - "scaleLabel": { - "display": true, - "labelString": "getHtml('Articles'); ?>" - }, - "gridLines": { - "display": false - } - } - ] - } - } - }'> -
- - -
- - - - - - - -
Month - Sales - Articles -
- getCurrency(); ?> - - - -
Total - getCurrency(); ?> - - -
-
-
-
-
-
- -
-
-
- Invoices / Articles - Annual - -
- data['annualSaleCustomer']; ?> -
- - - ], - "datasets": [ - { - "label": "getHtml('Articles'); ?>", - "type": "line", - "data": [ - - - ], - "yAxisID": "axis-2", - "fill": false, - "borderColor": "rgb(255, 99, 132)", - "backgroundColor": "rgb(255, 99, 132)", - "tension": 0.0 - }, - { - "label": "getHtml('Sales'); ?>", - "type": "bar", - "data": [ - - - ], - "yAxisID": "axis-1", - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Sales / Articles" - }, - "scales": { - "yAxes": [ - { - "id": "axis-1", - "display": true, - "position": "left" - }, - { - "id": "axis-2", - "display": true, - "position": "right", - "scaleLabel": { - "display": true, - "labelString": "getHtml('Articles'); ?>" - }, - "gridLines": { - "display": false - } - } - ] - } - } - }'> -
- - -
- - - - - - -
Year - Sales - Articles -
- getCurrency(); ?> - - - -
-
-
-
-
-
-
-
- -
-
\ No newline at end of file diff --git a/Theme/Backend/rep-analysis.tpl.php b/Theme/Backend/rep-analysis.tpl.php deleted file mode 100755 index af2af5c..0000000 --- a/Theme/Backend/rep-analysis.tpl.php +++ /dev/null @@ -1,344 +0,0 @@ -data['nav']->render(); -?> - -
-
- -
-
- request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>> -
-
-
-
-
-
getHtml('Filter'); ?>
-
-
- - -
- -
-
- - -
- -
- - -
-
- -
-
- - -
- -
- - -
-
- -
- - -
- -
- - -
- -
- - -
-
-
-
-
-
-
-
- - request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>> -
-
-
-
-
- Sales per Rep - Current - -
- data['currentCustomersRep']; ?> -
- - ], - "datasets": [ - { - "label": "getHtml('Customers'); ?>", - "type": "horizontalBar", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Customers per rep" - } - } - }'> - -
- - -
- - - - - $values) : $sum += $values['customers']; ?> - - -
Rep - Customer count -
- - -
Total - -
-
-
-
-
-
- -
-
-
- Sales per Rep - Annual - -
- data['annualCustomersRep']; ?> - - - - - $annual) : ?> - - -
Rep - - - -
- $values) : - $sum[$values['year']] = ($sum[$values['year']] ?? 0) + $values['customers']; ?> - - - -
Total - - - -
-
-
-
- -
-
-
-
- Profit per Rep - Current - -
- data['currentCustomersRep']; ?> -
- - ], - "datasets": [ - { - "label": "getHtml('Customers'); ?>", - "type": "horizontalBar", - "data": [ - - - ], - "fill": false, - "borderColor": "rgb(54, 162, 235)", - "backgroundColor": "rgb(54, 162, 235)", - "tension": 0.0 - } - ] - }, - "options": { - "title": { - "display": false, - "text": "Customers per rep" - } - } - }'> - -
- - -
- - - - - $values) : $sum += $values['customers']; ?> - - -
Rep - Customer count -
- - -
Total - -
-
-
-
-
-
- -
-
-
- Profit per Rep - Annual - -
- data['annualCustomersRep']; ?> - - - - - $annual) : ?> - - -
Rep - - - -
- $values) : - $sum[$values['year']] = ($sum[$values['year']] ?? 0) + $values['customers']; ?> - - - -
Total - - - -
-
-
-
- -
-
-
-
- Sales / Rep - -
- - - - -
Rep - Sales PY - Sales B - Sales A - Diff PY - Diff B -
-
-
-
-
-
-
\ No newline at end of file diff --git a/tests/Autoloader.php b/tests/Autoloader.php index 3b81f59..96d8c02 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -79,7 +79,7 @@ final class Autoloader $class = \strtr($class, '_\\', '//'); if (\stripos($class, 'Web/Backend') !== false || \stripos($class, 'Web/Api') !== false) { - $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'Karaka/Web/', $class); + $class = \is_dir(__DIR__ . '/Web') ? $class : \str_replace('Web/', 'MainRepository/Web/', $class); } $class2 = $class; diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index f817e99..ddc049d 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -7,7 +7,10 @@ declare(strict_types=1); \error_reporting(\E_ALL); \setlocale(\LC_ALL, 'en_US.UTF-8'); -require_once __DIR__ . '/../vendor/autoload.php'; +if (\is_file(__DIR__ . '/../vendor/autoload.php')) { + require_once __DIR__ . '/../vendor/autoload.php'; +} + require_once __DIR__ . '/Autoloader.php'; use phpOMS\DataStorage\Database\DatabasePool; @@ -71,9 +74,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -81,9 +84,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -91,9 +94,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -101,9 +104,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -111,9 +114,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -121,9 +124,9 @@ $CONFIG = [ 'db' => 'mysql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '3306', /* db host port */ - 'login' => 'root', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -133,9 +136,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -143,9 +146,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -153,9 +156,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -163,9 +166,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -173,9 +176,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -183,9 +186,9 @@ $CONFIG = [ 'db' => 'pgsql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '5432', /* db host port */ - 'login' => 'postgres', /* db login name */ - 'password' => 'root', /* db login password */ - 'database' => 'oms', /* db name */ + 'login' => 'test', /* db login name */ + 'password' => 'orange', /* db login password */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -233,9 +236,9 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -243,9 +246,9 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -253,9 +256,9 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -263,9 +266,9 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -273,9 +276,9 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], @@ -283,9 +286,9 @@ $CONFIG = [ 'db' => 'mssql', /* db type */ 'host' => '127.0.0.1', /* db host address */ 'port' => '1433', /* db host port */ - 'login' => 'sa', /* db login name */ + 'login' => 'test', /* db login name */ 'password' => 'c0MplicatedP@ssword', /* db login password */ - 'database' => 'oms', /* db name */ + 'database' => 'omt', /* db name */ 'weight' => 1000, /* db table prefix */ 'datetimeformat' => 'Y-m-d H:i:s', ], diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index f7040bd..341509c 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -123,7 +123,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiBillCreate($request, $response); - $bId = $response->get('')['response']->id; + $bId = $response->getDataArray('')['response']->id; self::assertGreaterThan(0, $bId); for ($k = 0; $k < 10; ++$k) { @@ -151,7 +151,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase } $this->module->apiBillElementCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } $response = new HttpResponse(); @@ -162,7 +162,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiBillPdfArchiveCreate($request, $response); - $result = $response->get(''); + $result = $response->getData(''); self::assertGreaterThan(0, $result === null ? -1 : $result['response']?->id); } */ @@ -199,7 +199,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiBillCreate($request, $response); - $bId = $response->get('')['response']->id; + $bId = $response->getDataArray('')['response']->id; self::assertGreaterThan(0, $bId); for ($k = 0; $k < 10; ++$k) { @@ -227,7 +227,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase } $this->module->apiBillElementCreate($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } $response = new HttpResponse(); @@ -238,7 +238,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->module->apiBillPdfArchiveCreate($request, $response); - $result = $response->get(''); + $result = $response->getData(''); self::assertGreaterThan(0, $result === null ? -1 : $result['response']?->id); } */ diff --git a/tests/phpunit_default.xml b/tests/phpunit_default.xml index ad47a51..d350430 100755 --- a/tests/phpunit_default.xml +++ b/tests/phpunit_default.xml @@ -7,6 +7,7 @@ ../vendor* ../MainRepository* + ../Karaka* ../Admin/Install/Application* ../phpOMS* ../tests*