From 296d5eff1b30b794b4b5050e88c24d6f9305e144 Mon Sep 17 00:00:00 2001
From: Rimian Perkins <hello@rimian.com.au>
Date: Tue, 22 Oct 2019 19:32:36 +1100
Subject: [PATCH] destroy plan

---
 ...ugins-discourse-patrons-plans-index.js.es6 | 20 -----------------
 ...ins-discourse-patrons-products-show.js.es6 | 20 +++++++++++++++++
 ...lugins-discourse-patrons-products-show.hbs | 22 ++++++++++++++-----
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6
index 3d78adb..e9f7c31 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-plans-index.js.es6
@@ -3,25 +3,5 @@ import AdminPlan from "discourse/plugins/discourse-patrons/discourse/models/admi
 export default Discourse.Route.extend({
   model() {
     return AdminPlan.findAll();
-  },
-
-  actions: {
-    destroyPlan(plan) {
-      bootbox.confirm(
-        I18n.t("discourse_patrons.admin.plans.operations.destroy.confirm"),
-        I18n.t("no_value"),
-        I18n.t("yes_value"),
-        confirmed => {
-          if (confirmed) {
-            plan.destroy().then(() => {
-              this.controllerFor("adminPluginsDiscoursePatronsPlansIndex")
-              .get("model")
-              .removeObject(plan);
-            })
-            .catch(data => bootbox.alert(data.jqXHR.responseJSON.errors.join("\n")));
-          }
-        }
-      );
-    }
   }
 });
diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show.js.es6
index 1dc88c1..176ad8c 100644
--- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show.js.es6
+++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons-products-show.js.es6
@@ -22,4 +22,24 @@ export default Discourse.Route.extend({
 
     return Ember.RSVP.hash({ plans, product, groups });
   },
+
+  actions: {
+    destroyPlan(plan) {
+      bootbox.confirm(
+        I18n.t("discourse_patrons.admin.plans.operations.destroy.confirm"),
+        I18n.t("no_value"),
+        I18n.t("yes_value"),
+        confirmed => {
+          if (confirmed) {
+            plan.destroy().then(() => {
+              this.controllerFor("adminPluginsDiscoursePatronsProductsShow")
+              .get("model.plans")
+              .removeObject(plan);
+            })
+            .catch(data => bootbox.alert(data.jqXHR.responseJSON.errors.join("\n")));
+          }
+        }
+      );
+    }
+  }
 });
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs
index 15171ec..a836020 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-patrons-products-show.hbs
@@ -35,7 +35,7 @@
       <th>{{i18n 'discourse_patrons.admin.plans.plan.nickname'}}</th>
       <th>{{i18n 'discourse_patrons.admin.plans.plan.interval'}}</th>
       <th>{{i18n 'discourse_patrons.admin.plans.plan.created_at'}}</th>
-      <th>{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</th>
+      <th class="td-right">{{i18n 'discourse_patrons.admin.plans.plan.amount'}}</th>
       <th class="td-right">
         {{#link-to "adminPlugins.discourse-patrons.products.show.plans.show" model.product.id "new" class="btn"}}
           {{i18n 'discourse_patrons.admin.plans.operations.add'}}
@@ -47,20 +47,30 @@
         <td>{{plan.nickname}}</td>
         <td>{{plan.interval}}</td>
         <td>{{format-date plan.createdFormatted}}</td>
-        <td>{{plan.amount}}</td>
+        <td class="td-right">{{plan.amount}}</td>
         <td class="td-right">
           {{#link-to "adminPlugins.discourse-patrons.products.show.plans.show" model.product.id plan.id class="btn no-text btn-icon"}}
             {{d-icon "far-edit"}}
           {{/link-to}}
-          {{!-- {{d-button
+          {{d-button
             action=(route-action "destroyPlan")
             actionParam=plan
             icon="trash-alt"
-            class="btn-danger btn no-text btn-icon"}} --}}
+            class="btn-danger btn no-text btn-icon"}}
         </td>
       </tr>
     {{/each}}
+
+    <tr>
+      <td colspan="5">
+        {{#unless model.plans}}
+          <hr>
+          Create a pricing plan to subscribe customers to this product
+        {{/unless}}
+      </td>
+    </tr>
   </table>
+
 </p>
 
 <section>
@@ -69,9 +79,9 @@
   <div class="pull-right">
     {{d-button label="cancel" action=(action "cancelProduct") icon="times"}}
     {{#if model.product.isNew}}
-      {{d-button label="discourse_patrons.admin.products.operations.create" action="createProduct" icon="plus"}}
+      {{d-button label="discourse_patrons.admin.products.operations.create" action="createProduct" icon="plus" class="btn btn-primary"}}
     {{else}}
-      {{d-button label="discourse_patrons.admin.products.operations.update" action="updateProduct" icon="check"}}
+      {{d-button label="discourse_patrons.admin.products.operations.update" action="updateProduct" icon="check" class="btn btn-primary"}}
     {{/if}}
   </div>