Fix subscription bugs

object/subscription.go

@@ -29,15 +29,14 @@ type Subscription struct {
 	Name        string `xorm:"varchar(100) notnull pk" json:"name"`
 	CreatedTime string `xorm:"varchar(100)" json:"createdTime"`
 	DisplayName string `xorm:"varchar(100)" json:"displayName"`
-	Duration    int    `json:"duration"`
 
-	Description string `xorm:"varchar(100)" json:"description"`
+	StartDate   time.Time `json:"startDate"`
-	Plan        string `xorm:"varchar(100)" json:"plan"`
+	EndDate     time.Time `json:"endDate"`
-
+	Duration    int       `json:"duration"`
-	StartDate time.Time `json:"startDate"`
+	Description string    `xorm:"varchar(100)" json:"description"`
-	EndDate   time.Time `json:"endDate"`
 
 	User string `xorm:"mediumtext" json:"user"`
+	Plan string `xorm:"varchar(100)" json:"plan"`
 
 	IsEnabled   bool   `json:"isEnabled"`
 	Submitter   string `xorm:"varchar(100)" json:"submitter"`

web/src/App.js

@@ -585,11 +585,11 @@ class App extends Component {
         <Route exact path="/messages" render={(props) => this.renderLoginIfNotLoggedIn(<MessageListPage account={this.state.account} {...props} />)} />
         <Route exact path="/messages/:messageName" render={(props) => this.renderLoginIfNotLoggedIn(<MessageEditPage account={this.state.account} {...props} />)} />
         <Route exact path="/plans" render={(props) => this.renderLoginIfNotLoggedIn(<PlanListPage account={this.state.account} {...props} />)} />
-        <Route exact path="/plan/:organizationName/:planName" render={(props) => this.renderLoginIfNotLoggedIn(<PlanEditPage account={this.state.account} {...props} />)} />
+        <Route exact path="/plans/:organizationName/:planName" render={(props) => this.renderLoginIfNotLoggedIn(<PlanEditPage account={this.state.account} {...props} />)} />
         <Route exact path="/pricings" render={(props) => this.renderLoginIfNotLoggedIn(<PricingListPage account={this.state.account} {...props} />)} />
-        <Route exact path="/pricing/:organizationName/:pricingName" render={(props) => this.renderLoginIfNotLoggedIn(<PricingEditPage account={this.state.account} {...props} />)} />
+        <Route exact path="/pricings/:organizationName/:pricingName" render={(props) => this.renderLoginIfNotLoggedIn(<PricingEditPage account={this.state.account} {...props} />)} />
         <Route exact path="/subscriptions" render={(props) => this.renderLoginIfNotLoggedIn(<SubscriptionListPage account={this.state.account} {...props} />)} />
-        <Route exact path="/subscription/:organizationName/:subscriptionName" render={(props) => this.renderLoginIfNotLoggedIn(<SubscriptionEditPage account={this.state.account} {...props} />)} />
+        <Route exact path="/subscriptions/:organizationName/:subscriptionName" render={(props) => this.renderLoginIfNotLoggedIn(<SubscriptionEditPage account={this.state.account} {...props} />)} />
         <Route exact path="/products" render={(props) => this.renderLoginIfNotLoggedIn(<ProductListPage account={this.state.account} {...props} />)} />
         <Route exact path="/products/:productName" render={(props) => this.renderLoginIfNotLoggedIn(<ProductEditPage account={this.state.account} {...props} />)} />
         <Route exact path="/products/:productName/buy" render={(props) => this.renderLoginIfNotLoggedIn(<ProductBuyPage account={this.state.account} {...props} />)} />

web/src/PlanEditPage.js

@@ -146,7 +146,7 @@ class PlanEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("role:Sub roles"), i18next.t("plan:Sub roles - Tooltip"))} :
+            {Setting.getLabel(i18next.t("general:Role"), i18next.t("general:Role - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} value={this.state.plan.role} onChange={(value => {this.updatePlanField("role", value);})}
@@ -228,7 +228,7 @@ class PlanEditPage extends React.Component {
           if (willExist) {
             this.props.history.push("/plans");
           } else {
-            this.props.history.push(`/plan/${this.state.plan.owner}/${this.state.plan.name}`);
+            this.props.history.push(`/plans/${this.state.plan.owner}/${this.state.plan.name}`);
           }
         } else {
           Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);

web/src/PlanListPage.js

@@ -43,7 +43,7 @@ class PlanListPage extends BaseListPage {
     PlanBackend.addPlan(newPlan)
       .then((res) => {
         if (res.status === "ok") {
-          this.props.history.push({pathname: `/plan/${newPlan.owner}/${newPlan.name}`, mode: "add"});
+          this.props.history.push({pathname: `/plans/${newPlan.owner}/${newPlan.name}`, mode: "add"});
           Setting.showMessage("success", i18next.t("general:Successfully added"));
         } else {
           Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
@@ -84,7 +84,7 @@ class PlanListPage extends BaseListPage {
         ...this.getColumnSearchProps("name"),
         render: (text, record, index) => {
           return (
-            <Link to={`/plans/${text}`}>
+            <Link to={`/plans/${record.owner}/${record.name}`}>
               {text}
             </Link>
           );
@@ -138,11 +138,18 @@ class PlanListPage extends BaseListPage {
         ...this.getColumnSearchProps("pricePerYear"),
       },
       {
-        title: i18next.t("plan:Sub role"),
+        title: i18next.t("general:Role"),
         dataIndex: "role",
         key: "role",
         width: "140px",
         ...this.getColumnSearchProps("role"),
+        render: (text, record, index) => {
+          return (
+            <Link to={`/roles/${text}`}>
+              {text}
+            </Link>
+          );
+        },
       },
       {
         title: i18next.t("general:Is enabled"),
@@ -165,7 +172,7 @@ class PlanListPage extends BaseListPage {
         render: (text, record, index) => {
           return (
             <div>
-              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/plan/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
+              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/plans/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
               <PopconfirmModal
                 title={i18next.t("general:Sure to delete") + `: ${record.name} ?`}
                 onConfirm={() => this.deletePlan(index)}

web/src/PricingEditPage.js

@@ -244,7 +244,7 @@ class PricingEditPage extends React.Component {
           if (willExist) {
             this.props.history.push("/pricings");
           } else {
-            this.props.history.push(`/pricing/${this.state.pricing.owner}/${this.state.pricing.name}`);
+            this.props.history.push(`/pricings/${this.state.pricing.owner}/${this.state.pricing.name}`);
           }
         } else {
           Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);

web/src/PricingListPage.js

@@ -44,7 +44,7 @@ class PricingListPage extends BaseListPage {
     PricingBackend.addPricing(newPricing)
       .then((res) => {
         if (res.status === "ok") {
-          this.props.history.push({pathname: `/pricing/${newPricing.owner}/${newPricing.name}`, mode: "add"});
+          this.props.history.push({pathname: `/pricings/${newPricing.owner}/${newPricing.name}`, mode: "add"});
           Setting.showMessage("success", i18next.t("general:Successfully added"));
         } else {
           Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
@@ -85,7 +85,7 @@ class PricingListPage extends BaseListPage {
         ...this.getColumnSearchProps("name"),
         render: (text, record, index) => {
           return (
-            <Link to={`/pricing/${record.owner}/${text}`}>
+            <Link to={`/pricings/${record.owner}/${text}`}>
               {text}
             </Link>
           );
@@ -120,7 +120,7 @@ class PricingListPage extends BaseListPage {
         title: i18next.t("general:Display name"),
         dataIndex: "displayName",
         key: "displayName",
-        width: "170px",
+        // width: "170px",
         sorter: true,
         ...this.getColumnSearchProps("displayName"),
       },
@@ -146,7 +146,7 @@ class PricingListPage extends BaseListPage {
         render: (text, record, index) => {
           return (
             <div>
-              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/pricing/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
+              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/pricings/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
               <PopconfirmModal
                 title={i18next.t("general:Sure to delete") + `: ${record.name} ?`}
                 onConfirm={() => this.deletePricing(index)}

web/src/SubscriptionEditPage.js

@@ -156,7 +156,7 @@ class SubscriptionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("subscription:Start Date"), i18next.t("subscription:Start Date - Tooltip"))}
+            {Setting.getLabel(i18next.t("subscription:Start date"), i18next.t("subscription:Start date - Tooltip"))}
           </Col>
           <Col span={22} >
             <DatePicker value={dayjs(this.state.subscription.startDate)} onChange={value => {
@@ -166,7 +166,7 @@ class SubscriptionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("subscription:End Date"), i18next.t("subscription:End Date - Tooltip"))}
+            {Setting.getLabel(i18next.t("subscription:End date"), i18next.t("subscription:End date - Tooltip"))}
           </Col>
           <Col span={22} >
             <DatePicker value={dayjs(this.state.subscription.endDate)} onChange={value => {
@@ -176,7 +176,7 @@ class SubscriptionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("subscription:Sub users"), i18next.t("subscription:Sub users - Tooltip"))} :
+            {Setting.getLabel(i18next.t("general:User"), i18next.t("general:User - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select style={{width: "100%"}} value={this.state.subscription.user}
@@ -188,7 +188,7 @@ class SubscriptionEditPage extends React.Component {
 
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("subscription:Sub plan"), i18next.t("subscription:Sub plan - Tooltip"))} :
+            {Setting.getLabel(i18next.t("subscription:Plan"), i18next.t("subscription:Plan - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Select virtual={false} style={{width: "100%"}} value={this.state.subscription.plan} onChange={(value => {this.updateSubscriptionField("plan", value);})}
@@ -218,7 +218,7 @@ class SubscriptionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:Submitter"), i18next.t("general:Submitter - Tooltip"))} :
+            {Setting.getLabel(i18next.t("permission:Submitter"), i18next.t("permission:Submitter - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input disabled={true} value={this.state.subscription.submitter} onChange={e => {
@@ -228,7 +228,7 @@ class SubscriptionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:Approver"), i18next.t("general:Approver - Tooltip"))} :
+            {Setting.getLabel(i18next.t("permission:Approver"), i18next.t("permission:Approver - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input disabled={true} value={this.state.subscription.approver} onChange={e => {
@@ -238,7 +238,7 @@ class SubscriptionEditPage extends React.Component {
         </Row>
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("general:Approve time"), i18next.t("general:Approve time - Tooltip"))} :
+            {Setting.getLabel(i18next.t("permission:Approve time"), i18next.t("permission:Approve time - Tooltip"))} :
           </Col>
           <Col span={22} >
             <Input disabled={true} value={Setting.getFormattedDate(this.state.subscription.approveTime)} onChange={e => {
@@ -288,7 +288,7 @@ class SubscriptionEditPage extends React.Component {
           if (willExist) {
             this.props.history.push("/subscriptions");
           } else {
-            this.props.history.push(`/subscription/${this.state.subscription.owner}/${this.state.subscription.name}`);
+            this.props.history.push(`/subscriptions/${this.state.subscription.owner}/${this.state.subscription.name}`);
           }
         } else {
           Setting.showMessage("error", `${i18next.t("general:Failed to save")}: ${res.msg}`);

web/src/SubscriptionListPage.js

@@ -32,16 +32,18 @@ class SubscriptionListPage extends BaseListPage {
       owner: owner,
       name: `subscription_${randomName}`,
       createdTime: moment().format(),
+      displayName: `New Subscription - ${randomName}`,
       startDate: moment().format(),
       endDate: moment().add(defaultDuration, "d").format(),
-      displayName: `New Subscription - ${randomName}`,
+      duration: defaultDuration,
-      tag: "",
+      description: "",
-      users: [],
+      user: "",
-      expireInDays: defaultDuration,
+      plan: "",
+      isEnabled: true,
       submitter: this.props.account.name,
-      approver: "",
+      approver: this.props.account.name,
-      approveTime: "",
+      approveTime: moment().format(),
-      state: "Pending",
+      state: "Approved",
     };
   }
 
@@ -50,7 +52,7 @@ class SubscriptionListPage extends BaseListPage {
     SubscriptionBackend.addSubscription(newSubscription)
       .then((res) => {
         if (res.status === "ok") {
-          this.props.history.push({pathname: `/subscription/${newSubscription.owner}/${newSubscription.name}`, mode: "add"});
+          this.props.history.push({pathname: `/subscriptions/${newSubscription.owner}/${newSubscription.name}`, mode: "add"});
           Setting.showMessage("success", i18next.t("general:Successfully added"));
         } else {
           Setting.showMessage("error", `${i18next.t("general:Failed to add")}: ${res.msg}`);
@@ -91,7 +93,7 @@ class SubscriptionListPage extends BaseListPage {
         ...this.getColumnSearchProps("name"),
         render: (text, record, index) => {
           return (
-            <Link to={`/subscriptions/${text}`}>
+            <Link to={`/subscriptions/${record.owner}/${record.name}`}>
               {text}
             </Link>
           );
@@ -138,18 +140,32 @@ class SubscriptionListPage extends BaseListPage {
         ...this.getColumnSearchProps("duration"),
       },
       {
-        title: i18next.t("subscription:Sub plane"),
+        title: i18next.t("subscription:Plan"),
         dataIndex: "plan",
         key: "plan",
         width: "140px",
         ...this.getColumnSearchProps("plan"),
+        render: (text, record, index) => {
+          return (
+            <Link to={`/plans/${text}`}>
+              {text}
+            </Link>
+          );
+        },
       },
       {
-        title: i18next.t("subscription:Sub user"),
+        title: i18next.t("general:User"),
         dataIndex: "user",
         key: "user",
         width: "140px",
         ...this.getColumnSearchProps("user"),
+        render: (text, record, index) => {
+          return (
+            <Link to={`/users/${text}`}>
+              {text}
+            </Link>
+          );
+        },
       },
       {
         title: i18next.t("general:State"),
@@ -158,6 +174,16 @@ class SubscriptionListPage extends BaseListPage {
         width: "120px",
         sorter: true,
         ...this.getColumnSearchProps("state"),
+        render: (text, record, index) => {
+          switch (text) {
+          case "Approved":
+            return Setting.getTag("success", i18next.t("permission:Approved"));
+          case "Pending":
+            return Setting.getTag("error", i18next.t("permission:Pending"));
+          default:
+            return null;
+          }
+        },
       },
       {
         title: i18next.t("general:Action"),
@@ -168,7 +194,7 @@ class SubscriptionListPage extends BaseListPage {
         render: (text, record, index) => {
           return (
             <div>
-              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/subscription/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
+              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/subscriptions/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
               <PopconfirmModal
                 title={i18next.t("general:Sure to delete") + `: ${record.name} ?`}
                 onConfirm={() => this.deleteSubscription(index)}

web/src/locales/de/data.json

@@ -776,12 +776,12 @@
     "Duration": "Laufzeit",
     "Duration - Tooltip": "Laufzeit des Abonnements",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Enddatum",
+    "End date": "Enddatum",
-    "End Date - Tooltip": "Enddatum",
+    "End date - Tooltip": "Enddatum",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Startdatum",
+    "Start date": "Startdatum",
-    "Start Date - Tooltip": "Startdatum",
+    "Start date - Tooltip": "Startdatum",
     "Sub plan": "Abonnementplan",
     "Sub plan - Tooltip": "Abonnementplan",
     "Sub plane": "Sub plane",

web/src/locales/en/data.json

@@ -776,12 +776,12 @@
     "Duration": "Duration",
     "Duration - Tooltip": "Subscription duration",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "End Date",
+    "End date": "End date",
-    "End Date - Tooltip": "End Date",
+    "End date - Tooltip": "End date",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Start Date",
+    "Start date": "Start date",
-    "Start Date - Tooltip": "Start Date",
+    "Start date - Tooltip": "Start date",
     "Sub plan": "Sub plan",
     "Sub plan - Tooltip": "Sub plan",
     "Sub plane": "Sub plane",

web/src/locales/es/data.json

@@ -776,12 +776,12 @@
     "Duration": "Duración",
     "Duration - Tooltip": "Duración de la suscripción",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Fecha de finalización",
+    "End date": "Fecha de finalización",
-    "End Date - Tooltip": "Fecha de finalización",
+    "End date - Tooltip": "Fecha de finalización",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Fecha de inicio",
+    "Start date": "Fecha de inicio",
-    "Start Date - Tooltip": "Fecha de inicio",
+    "Start date - Tooltip": "Fecha de inicio",
     "Sub plan": "Plan de suscripción",
     "Sub plan - Tooltip": "Plan de suscripción",
     "Sub plane": "Sub plane",

web/src/locales/fr/data.json

@@ -776,12 +776,12 @@
     "Duration": "Durée",
     "Duration - Tooltip": "Durée de l'abonnement",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Date de fin",
+    "End date": "Date de fin",
-    "End Date - Tooltip": "Date de fin",
+    "End date - Tooltip": "Date de fin",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Date de début",
+    "Start date": "Date de début",
-    "Start Date - Tooltip": "Date de début",
+    "Start date - Tooltip": "Date de début",
     "Sub plan": "Plan de l'abonnement",
     "Sub plan - Tooltip": "Plan de l'abonnement",
     "Sub plane": "Sub plane",

web/src/locales/id/data.json

@@ -776,12 +776,12 @@
     "Duration": "Durasi",
     "Duration - Tooltip": "Durasi langganan",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Tanggal Berakhir",
+    "End date": "Tanggal Berakhir",
-    "End Date - Tooltip": "Tanggal Berakhir",
+    "End date - Tooltip": "Tanggal Berakhir",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Tanggal Mulai",
+    "Start date": "Tanggal Mulai",
-    "Start Date - Tooltip": "Tanggal Mulai",
+    "Start date - Tooltip": "Tanggal Mulai",
     "Sub plan": "Rencana Langganan",
     "Sub plan - Tooltip": "Rencana Langganan",
     "Sub plane": "Sub plane",

web/src/locales/ja/data.json

@@ -776,12 +776,12 @@
     "Duration": "期間",
     "Duration - Tooltip": "購読の期間",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "終了日",
+    "End date": "終了日",
-    "End Date - Tooltip": "終了日",
+    "End date - Tooltip": "終了日",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "開始日",
+    "Start date": "開始日",
-    "Start Date - Tooltip": "開始日",
+    "Start date - Tooltip": "開始日",
     "Sub plan": "購読プラン",
     "Sub plan - Tooltip": "購読プラン",
     "Sub plane": "Sub plane",

web/src/locales/ko/data.json

@@ -776,12 +776,12 @@
     "Duration": "기간",
     "Duration - Tooltip": "구독 기간",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "종료일",
+    "End date": "종료일",
-    "End Date - Tooltip": "종료일",
+    "End date - Tooltip": "종료일",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "시작일",
+    "Start date": "시작일",
-    "Start Date - Tooltip": "시작일",
+    "Start date - Tooltip": "시작일",
     "Sub plan": "구독 플랜",
     "Sub plan - Tooltip": "구독 플랜",
     "Sub plane": "Sub plane",

web/src/locales/pt/data.json

@@ -776,12 +776,12 @@
     "Duration": "Thời lượng",
     "Duration - Tooltip": "Thời lượng đăng ký",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Ngày kết thúc",
+    "End date": "Ngày kết thúc",
-    "End Date - Tooltip": "Ngày kết thúc",
+    "End date - Tooltip": "Ngày kết thúc",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Ngày bắt đầu",
+    "Start date": "Ngày bắt đầu",
-    "Start Date - Tooltip": "Ngày bắt đầu",
+    "Start date - Tooltip": "Ngày bắt đầu",
     "Sub plan": "Kế hoạch đăng ký",
     "Sub plan - Tooltip": "Kế hoạch đăng ký",
     "Sub plane": "Sub plane",

web/src/locales/ru/data.json

@@ -776,12 +776,12 @@
     "Duration": "Продолжительность",
     "Duration - Tooltip": "Продолжительность подписки",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Дата окончания",
+    "End date": "Дата окончания",
-    "End Date - Tooltip": "Дата окончания",
+    "End date - Tooltip": "Дата окончания",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Дата начала",
+    "Start date": "Дата начала",
-    "Start Date - Tooltip": "Дата начала",
+    "Start date - Tooltip": "Дата начала",
     "Sub plan": "План подписки",
     "Sub plan - Tooltip": "План подписки",
     "Sub plane": "Sub plane",

web/src/locales/vi/data.json

@@ -776,12 +776,12 @@
     "Duration": "Thời lượng",
     "Duration - Tooltip": "Thời lượng đăng ký",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "Ngày kết thúc",
+    "End date": "Ngày kết thúc",
-    "End Date - Tooltip": "Ngày kết thúc",
+    "End date - Tooltip": "Ngày kết thúc",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "Ngày bắt đầu",
+    "Start date": "Ngày bắt đầu",
-    "Start Date - Tooltip": "Ngày bắt đầu",
+    "Start date - Tooltip": "Ngày bắt đầu",
     "Sub plan": "Kế hoạch đăng ký",
     "Sub plan - Tooltip": "Kế hoạch đăng ký",
     "Sub plane": "Sub plane",

web/src/locales/zh/data.json

@@ -776,12 +776,12 @@
     "Duration": "订阅时长",
     "Duration - Tooltip": "订阅时长",
     "Edit Subscription": "Edit Subscription",
-    "End Date": "结束日期",
+    "End date": "结束日期",
-    "End Date - Tooltip": "结束日期",
+    "End date - Tooltip": "结束日期",
     "New Subscription": "New Subscription",
     "Pending": "Pending",
-    "Start Date": "开始日期",
+    "Start date": "开始日期",
-    "Start Date - Tooltip": "开始日期",
+    "Start date - Tooltip": "开始日期",
     "Sub plan": "订阅计划",
     "Sub plan - Tooltip": "订阅计划",
     "Sub plane": "Sub plane",