Version 15

.github/workflows/sync.yaml

@@ -0,0 +1,32 @@
+name: Sync with upstream branch
+
+on:
+  push:
+    branches:
+      - version-*
+      - develop
+
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Fetch upstream
+        run: |
+          git remote add upstream https://github.com/frappe/webshop.git
+          git fetch upstream
+
+      - name: Sync with upstream
+        run: |
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config user.name "github-actions[bot]"
+          git merge upstream/${{ github.ref_name }}
+
+      - name: Push to origin
+        run: |
+          git push origin ${{ github.ref_name }}

README.md

@@ -1,19 +1,58 @@
-## Frappe Webshop
+# Frappe Webshop
+
 Frappe webshop is an Open Source eCommerce Platform
 ![Frappe Webshop](webshop.png)
 
-## Installation
-1. [Install bench](https://github.com/frappe/bench).
-2. [Install ERPNext](https://github.com/frappe/bench#installation).
-3. Once ERPNext is installed, add the webshop app to your bench by running
-
-    ```sh
-    $ bench get-app webshop
-    ```
-4. After that, you can install the webshop app on the required site by running
-    ```sh
-    $ bench --site sitename install-app webshop
-    ```
-
-#### License
-GNU GPL V3. (See [LICENSE](LICENSE) for more information).
+## Update guide
+
+**Note:** There will be no commit on `develop` branch.
+
+There are 2 remotes:
+
+- origin (zaviagodev/webshop)
+- upstream (frappe/webshop)
+
+Each version should have a seprate branch on both remotes like `version-15`, `version-13` e.t.c
+
+### Steps
+
+1. Developer will commit the change in the relative branch example `version-15`
+2. After commiting developer should keep the relative branch in sync with its `upstream` branch by:
+
+   ```bash
+   git fetch upstream
+   git merge upstream/<relative branch>
+   ```
+
+3. At times there might be some conflicts developer hast to make sure the conflicts are resolved properly.
+
+### Steps for new version Release
+
+1. Switch to latest branch example `version-15` & make sure its synced with its upstream branch.
+
+   ```bash
+   git checkout version-15
+   git fetch upstream
+   git merge upstream/version-15
+   ```
+
+2. create new branch from latest branch & push.
+
+   ```bash
+   git checkout version-15
+   git checkout -b version-16
+   git push origin version-16
+   ```
+
+3. sync with relative upstream branch by
+
+   ```bash
+   git fetch upstream version-16
+   git merge upstream/version-16
+   ```
+
+4. resolve conflicts if any & push.
+
+   ```bash
+   git push origin version-16
+   ```

webshop/hooks.py

@@ -38,6 +38,10 @@
     "Homepage": "public/js/override/homepage.js",
 }
 
+override_whitelisted_methods = {
+    "webshop.webshop.doctype.website_item.website_item.make_website_item": "webshop.webshop.doctype.website_item.custom_website_item.make_website_item"
+}
+
 doc_events = {
     "Item": {
         "on_update": [

webshop/public/js/override/item.js

@@ -1,37 +1,38 @@
 frappe.ui.form.on("Item", {
-    refresh: function(frm) {
-		if (!frm.doc.__islocal) {
+	refresh: function (frm) {
+		// if (!frm.doc.__islocal) {
 			if (!frm.doc.published_in_website) {
-				frm.add_custom_button(__("Publish in Website"), function() {
+				frm.add_custom_button(__("Publish in Website"), function () {
 					frappe.call({
 						method: "webshop.webshop.doctype.website_item.website_item.make_website_item",
 						args: {
 							doc: frm.doc,
 						},
 						freeze: true,
 						freeze_message: __("Publishing Item ..."),
-						callback: function(result) {
-							frappe.msgprint({
-								message: __("Website Item {0} has been created.",
-									[repl('<a href="/app/website-item/%(item_encoded)s" class="strong">%(item)s</a>', {
-										item_encoded: encodeURIComponent(result.message[0]),
-										item: result.message[1]
-									})]
-								),
-								title: __("Published"),
-								indicator: "green"
-							});
+						callback: function (result) {
+							// frappe.msgprint({
+							// 	message: __("Website Item {0} has been created.",
+							// 		[repl('<a href="/app/website-item/%(item_encoded)s" class="strong">%(item)s</a>', {
+							// 			item_encoded: encodeURIComponent(result.message[0]),
+							// 			item: result.message[1]
+							// 		})]
+							// 	),
+							// 	title: __("Published"),
+							// 	indicator: "green"
+							// });
+							window.location.href = "/app/website-item/" + result.message[0]
 						}
 					});
 				}, __('Actions'));
 			} else {
-				frm.add_custom_button(__("View Website Item"), function() {
-					frappe.db.get_value("Website Item", {item_code: frm.doc.name}, "name", (d) => {
+				frm.add_custom_button(__("View Website Item"), function () {
+					frappe.db.get_value("Website Item", { item_code: frm.doc.name }, "name", (d) => {
 						if (!d.name) frappe.throw(__("Website Item not found"));
 						frappe.set_route("Form", "Website Item", d.name);
 					});
 				});
 			}
-		}
+		// }
 	}
 });

webshop/templates/pages/wishlist.py

@@ -85,6 +85,6 @@ def set_stock_price_details(items, settings, selling_price_list):
 			if item.formatted_mrp:
 				item.discount = price_details.get(
 					"formatted_discount_percent"
-				) or price_details.get("formatted_discount_rate")
+				) or price_details.get("formatted_discount_rate") or price_details.get("formatted_discount_amount")
 
 	return items