Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

New release - GCJ Billing fixes #14664

Merged
merged 4 commits into from
Dec 23, 2024
Merged

New release - GCJ Billing fixes #14664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d6413c
fix(billing): fix hasautorenew2016 is not a function (#14554)
MaximeBajeux Dec 19, 2024
1cecb92
fix(billing): dead link on order tracking (#14613)
MaximeBajeux Dec 19, 2024
7b8344f
fix(billing): added wuc dependency to fix injection error (#14560)
JacquesLarique Dec 19, 2024
cca9e52
fix(billing): added auth information on currentUser (#14688)
JacquesLarique Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/manager/apps/billing/src/app.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default async (containerEl, shellClient) => {
const moduleName = 'BillingApp';

const routingConfig = /* @ngInject */ ($urlRouterProvider) => {
$urlRouterProvider.otherwise('/');
$urlRouterProvider.otherwise('/billing');
};

const trackingConfig = /* @ngInject */ (atInternetConfigurationProvider) => {
Expand Down
1 change: 1 addition & 0 deletions packages/manager/modules/new-billing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@ovh-ux/ng-ovh-payment-method": "^9.16.5",
"@ovh-ux/ng-ovh-user-pref": "2.1.1",
"@ovh-ux/ng-ovh-utils": "^14.4.1",
"@ovh-ux/ng-ovh-web-universe-components": "^9.19.1",
"@ovh-ux/ng-q-allsettled": "^2.1.2",
"@ovh-ux/ng-translate-async-loader": "^2.1.4",
"@ovh-ux/ng-ui-router-breadcrumb": "^1.3.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/manager/modules/new-billing/src/billing.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import angular from 'angular';
import ovhManagerCore from '@ovh-ux/manager-core';
import ngOvhWebUniverseComponents from '@ovh-ux/ng-ovh-web-universe-components';
import set from 'lodash/set';
import autorenew from './autoRenew/autorenew.module';
import billingMain from './main/billing-main.module';
Expand Down Expand Up @@ -49,6 +50,7 @@ angular
'oc.lazyLoad',
'ui.select',
'ngOvhFeatureFlipping',
ngOvhWebUniverseComponents,
autorenew,
billingMain,
history,
Expand Down
14 changes: 14 additions & 0 deletions packages/manager/modules/new-billing/src/common/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
const AUTORENEW_2016_SUBSIDIARIES = [
'FR',
'CA',
'QC',
'WE',
'WS',
'ASIA',
'SG',
'AU',
];

export default /* @ngInject */ function BillingUserService(
$q,
coreConfig,
Expand All @@ -17,6 +28,9 @@ export default /* @ngInject */ function BillingUserService(
spareEmail: result.spareEmail,
canHaveInvoicesByPostalMail: () =>
result.billingCountry === 'FR' && result.legalform === 'individual',
hasAutorenew2016: () =>
AUTORENEW_2016_SUBSIDIARIES.includes(result.ovhSubsidiary),
auth: result.auth,
}));

this.getMe = () => $q.when(coreConfig.getUser());
Expand Down
1 change: 0 additions & 1 deletion packages/manager/modules/new-billing/src/orders/orders/billing-orders.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
data-ng-href="{{ $ctrl.getOrderTrackingHref($row, $ctrl.filter) }}"
data-ng-if="$ctrl.allowOrderTracking"
data-translate-attr="{ title: 'orders_tracking' }"
target="_top"
>
<span
class="oui-badge"
Expand Down
Loading