From 5f054c49899634479549e4a4a8c8149e6f3ba4b3 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Fri, 28 Jul 2023 15:08:19 +0800
Subject: [PATCH] Fix product links

---
 object/product.go          | 2 +-
 web/src/App.js             | 2 +-
 web/src/ProductEditPage.js | 2 +-
 web/src/ProductListPage.js | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/object/product.go b/object/product.go
index dd7fce78..4a29bb49 100644
--- a/object/product.go
+++ b/object/product.go
@@ -192,7 +192,7 @@ func BuyProduct(id string, providerName string, user *User, host string) (string
 	}
 
 	payment := Payment{
-		Owner:              product.Owner,
+		Owner:              "admin",
 		Name:               paymentName,
 		CreatedTime:        util.GetCurrentTime(),
 		DisplayName:        paymentName,
diff --git a/web/src/App.js b/web/src/App.js
index e6c3ca55..d9282a3d 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -641,7 +641,7 @@ class App extends Component {
         <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/:organizationName/: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} />)} />
+        <Route exact path="/products/:organizationName/:productName/buy" render={(props) => this.renderLoginIfNotLoggedIn(<ProductBuyPage account={this.state.account} {...props} />)} />
         <Route exact path="/payments" render={(props) => this.renderLoginIfNotLoggedIn(<PaymentListPage account={this.state.account} {...props} />)} />
         <Route exact path="/payments/:paymentName" render={(props) => this.renderLoginIfNotLoggedIn(<PaymentEditPage account={this.state.account} {...props} />)} />
         <Route exact path="/payments/:paymentName/result" render={(props) => this.renderLoginIfNotLoggedIn(<PaymentResultPage account={this.state.account} {...props} />)} />
diff --git a/web/src/ProductEditPage.js b/web/src/ProductEditPage.js
index c2e29f63..792c7d8c 100644
--- a/web/src/ProductEditPage.js
+++ b/web/src/ProductEditPage.js
@@ -295,7 +295,7 @@ class ProductEditPage extends React.Component {
   }
 
   renderPreview() {
-    const buyUrl = `/products/${this.state.product.name}/buy`;
+    const buyUrl = `/products/${this.state.product.owner}/${this.state.product.name}/buy`;
     return (
       <Col span={22} style={{display: "flex", flexDirection: "column"}}>
         <a style={{marginBottom: "10px", display: "flex"}} target="_blank" rel="noreferrer" href={buyUrl}>
diff --git a/web/src/ProductListPage.js b/web/src/ProductListPage.js
index 9966bb7b..e1c9c792 100644
--- a/web/src/ProductListPage.js
+++ b/web/src/ProductListPage.js
@@ -247,7 +247,7 @@ class ProductListPage extends BaseListPage {
         render: (text, record, index) => {
           return (
             <div>
-              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} onClick={() => this.props.history.push(`/products/${record.name}/buy`)}>{i18next.t("product:Buy")}</Button>
+              <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} onClick={() => this.props.history.push(`/products/${record.owner}/${record.name}/buy`)}>{i18next.t("product:Buy")}</Button>
               <Button style={{marginTop: "10px", marginBottom: "10px", marginRight: "10px"}} type="primary" onClick={() => this.props.history.push(`/products/${record.owner}/${record.name}`)}>{i18next.t("general:Edit")}</Button>
               <PopconfirmModal
                 title={i18next.t("general:Sure to delete") + `: ${record.name} ?`}