@@ -97,27 +97,26 @@ shopify.ProductImporter = class {
`);
this.wrapper.append(_markup);
-
}
async fetchProductCount() {
-
try {
- const { message: { erpnextCount, shopifyCount, syncedCount } } = await frappe.call({ method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.get_product_count' });
-
- this.wrapper.find('#count-products-shopify').text(shopifyCount);
- this.wrapper.find('#count-products-erpnext').text(erpnextCount);
- this.wrapper.find('#count-products-synced').text(syncedCount);
-
+ const {
+ message: { erpnextCount, shopifyCount, syncedCount },
+ } = await frappe.call({
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.get_product_count",
+ });
+
+ this.wrapper.find("#count-products-shopify").text(shopifyCount);
+ this.wrapper.find("#count-products-erpnext").text(erpnextCount);
+ this.wrapper.find("#count-products-synced").text(syncedCount);
} catch (error) {
- frappe.throw(__('Error fetching product count.'));
+ frappe.throw(__("Error fetching product count."));
}
-
}
async addTable() {
-
- const listElement = this.wrapper.find('#shopify-product-list')[0];
+ const listElement = this.wrapper.find("#shopify-product-list")[0];
this.shopifyProductTable = new frappe.DataTable(listElement, {
columns: [
// {
@@ -125,242 +124,231 @@ shopify.ProductImporter = class {
// align: 'center',
// },
{
- name: 'ID',
- align: 'left',
+ name: "ID",
+ align: "left",
editable: false,
focusable: false,
},
{
- name: 'Name',
+ name: "Name",
editable: false,
focusable: false,
},
{
- name: 'SKUs',
+ name: "SKUs",
editable: false,
focusable: false,
},
{
- name: 'Status',
- align: 'center',
+ name: "Status",
+ align: "center",
editable: false,
focusable: false,
},
{
- name: 'Action',
- align: 'center',
+ name: "Action",
+ align: "center",
editable: false,
focusable: false,
},
],
data: await this.fetchShopifyProducts(),
- layout: 'fixed',
+ layout: "fixed",
});
- this.wrapper.find('.shopify-datatable-footer').show();
-
+ this.wrapper.find(".shopify-datatable-footer").show();
}
async fetchShopifyProducts(from_ = null) {
-
try {
- const { message: { products, nextUrl, prevUrl } } = await frappe.call({ method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.get_shopify_products', args: { from_ } });
+ const {
+ message: { products, nextUrl, prevUrl },
+ } = await frappe.call({
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.get_shopify_products",
+ args: { from_ },
+ });
this.nextUrl = nextUrl;
this.prevUrl = prevUrl;
const shopifyProducts = products.map((product) => ({
// 'Image': product.image && product.image.src && `
`,
- 'ID': product.id,
- 'Name': product.title,
- 'SKUs': product.variants && product.variants.map(a => `${a.sku}`).join(', '),
- 'Status': this.getProductSyncStatus(product.synced),
- 'Action': !product.synced ?
- `` :
- ``,
+ ID: product.id,
+ Name: product.title,
+ SKUs:
+ product.variants &&
+ product.variants.map((a) => `${a.sku}`).join(", "),
+ Status: this.getProductSyncStatus(product.synced),
+ Action: !product.synced
+ ? ``
+ : ``,
}));
return shopifyProducts;
} catch (error) {
- frappe.throw(__('Error fetching products.'));
+ frappe.throw(__("Error fetching products."));
}
-
}
getProductSyncStatus(status) {
-
- return status ?
- `Synced` :
- `Not Synced`;
-
+ return status
+ ? `Synced`
+ : `Not Synced`;
}
listen() {
-
// sync a product from table
- this.wrapper.on('click', '.btn-sync', e => {
-
+ this.wrapper.on("click", ".btn-sync", (e) => {
const _this = $(e.currentTarget);
- _this.prop('disabled', true).text('Syncing...');
+ _this.prop("disabled", true).text("Syncing...");
+
+ const product = _this.attr("data-product");
+ this.syncProduct(product).then((status) => {
+ if (!status) {
+ frappe.throw(__("Error syncing product"));
+ _this.prop("disabled", false).text("Sync");
+ return;
+ }
+
+ _this
+ .parents(".dt-row")
+ .find(".indicator-pill")
+ .replaceWith(this.getProductSyncStatus(true));
+
+ _this.replaceWith(
+ ``
+ );
+ });
+ });
- const product = _this.attr('data-product');
- this.syncProduct(product)
- .then(status => {
+ this.wrapper.on("click", ".btn-resync", (e) => {
+ const _this = $(e.currentTarget);
+ _this.prop("disabled", true).text("Syncing...");
+
+ const product = _this.attr("data-product");
+ this.resyncProduct(product)
+ .then((status) => {
if (!status) {
- frappe.throw(__('Error syncing product'));
- _this.prop('disabled', false).text('Sync');
+ frappe.throw(__("Error syncing product"));
return;
}
- _this.parents('.dt-row')
- .find('.indicator-pill')
+ _this
+ .parents(".dt-row")
+ .find(".indicator-pill")
.replaceWith(this.getProductSyncStatus(true));
- _this.replaceWith(``);
-
+ _this.prop("disabled", false).text("Re-sync");
+ })
+ .catch((ex) => {
+ _this.prop("disabled", false).text("Re-sync");
+ frappe.throw(__("Error syncing Product"));
});
-
});
- this.wrapper.on('click', '.btn-resync', e => {
- const _this = $(e.currentTarget);
-
- _this.prop('disabled', true).text('Syncing...');
-
- const product = _this.attr('data-product');
- this.resyncProduct(product)
- .then(status => {
-
- if (!status) {
- frappe.throw(__('Error syncing product'));
- return;
- }
-
- _this.parents('.dt-row')
- .find('.indicator-pill')
- .replaceWith(this.getProductSyncStatus(true));
-
- _this.prop('disabled', false).text('Re-sync');
-
- })
- .catch(ex => {
- _this.prop('disabled', false).text('Re-sync');
- frappe.throw(__('Error syncing Product'));
- });
- });
-
// pagination
- this.wrapper.on('click', '.btn-prev,.btn-next', e => this.switchPage(e));
+ this.wrapper.on("click", ".btn-prev,.btn-next", (e) =>
+ this.switchPage(e)
+ );
// sync all products
- this.wrapper.on('click', '#btn-sync-all', e => this.syncAll(e));
-
+ this.wrapper.on("click", "#btn-sync-all", (e) => this.syncAll(e));
}
async syncProduct(product) {
-
const { message: status } = await frappe.call({
- method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.sync_product',
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.sync_product",
args: { product },
});
- if (status)
- this.fetchProductCount();
+ if (status) this.fetchProductCount();
return status;
-
}
- async resyncProduct(product) {
-
- const { message: status } = await frappe.call({
- method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.resync_product',
- args: { product },
- });
-
- if (status)
- this.fetchProductCount();
+ async resyncProduct(product) {
+ const { message: status } = await frappe.call({
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.resync_product",
+ args: { product },
+ });
- return status;
+ if (status) this.fetchProductCount();
- }
+ return status;
+ }
async switchPage({ currentTarget }) {
-
const _this = $(currentTarget);
- $('.btn-paginate').prop('disabled', true);
- this.shopifyProductTable.showToastMessage('Loading...');
+ $(".btn-paginate").prop("disabled", true);
+ this.shopifyProductTable.showToastMessage("Loading...");
const newProducts = await this.fetchShopifyProducts(
- _this.hasClass('btn-next') ? this.nextUrl : this.prevUrl
+ _this.hasClass("btn-next") ? this.nextUrl : this.prevUrl
);
this.shopifyProductTable.refresh(newProducts);
- $('.btn-paginate').prop('disabled', false);
+ $(".btn-paginate").prop("disabled", false);
this.shopifyProductTable.clearToastMessage();
-
}
syncAll() {
-
this.checkSyncStatus();
this.toggleSyncAllButton();
if (this.syncRunning) {
- frappe.msgprint(__('Sync already in progress'));
+ frappe.msgprint(__("Sync already in progress"));
} else {
- frappe.call({ method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.import_all_products' })
+ frappe.call({
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.import_all_products",
+ });
}
// sync progress
this.logSync();
-
}
logSync() {
-
- const _log = $('#shopify-sync-log');
- _log.parents('.card').show();
- _log.text(''); // clear logs
+ const _log = $("#shopify-sync-log");
+ _log.parents(".card").show();
+ _log.text(""); // clear logs
// define counters here to prevent calling jquery every time
- const _syncedCounter = $('#count-products-synced');
- const _erpnextCounter = $('#count-products-erpnext');
-
- frappe.realtime.on('shopify.key.sync.all.products', ({ message, synced, done, error }) => {
-
- message = `
{}".format("
".join(errors)) - ) + frappe.msgprint("Partial success, unicommerce reported errors:
{}".format("
".join(errors))) def _prepare_grn_import_csv(stock_entry) -> str: @@ -190,8 +187,7 @@ def _prepare_grn_import_csv(stock_entry) -> str: return file.file_name -def _get_csv_content(rows: List[GRNItemRow]) -> bytes: - +def _get_csv_content(rows: list[GRNItemRow]) -> bytes: writer = UnicodeWriter() for row in rows: @@ -208,7 +204,7 @@ def _get_unicommerce_format_date(date) -> str: def create_auto_grn_import(csv_filename: str, facility_code: str, client=None): - """ Create new import job for Auto GRN items""" + """Create new import job for Auto GRN items""" if client is None: client = UnicommerceAPIClient() resp = client.create_import_job( diff --git a/ecommerce_integrations/unicommerce/inventory.py b/ecommerce_integrations/unicommerce/inventory.py index 704c2c014..d8f6961de 100644 --- a/ecommerce_integrations/unicommerce/inventory.py +++ b/ecommerce_integrations/unicommerce/inventory.py @@ -1,5 +1,4 @@ from collections import defaultdict -from typing import Dict import frappe from frappe.utils import cint, now @@ -32,9 +31,7 @@ def update_inventory_on_unicommerce(client=None, force=False): return # check if need to run based on configured sync frequency - if not force and not need_to_run( - SETTINGS_DOCTYPE, "inventory_sync_frequency", "last_inventory_sync" - ): + if not force and not need_to_run(SETTINGS_DOCTYPE, "inventory_sync_frequency", "last_inventory_sync"): return # get configured warehouses @@ -45,7 +42,7 @@ def update_inventory_on_unicommerce(client=None, force=False): client = UnicommerceAPIClient() # track which ecommerce item was updated successfully - success_map: Dict[str, bool] = defaultdict(lambda: True) + success_map: dict[str, bool] = defaultdict(lambda: True) inventory_synced_on = now() for warehouse in warehouses: @@ -82,7 +79,7 @@ def update_inventory_on_unicommerce(client=None, force=False): _update_inventory_sync_status(success_map, inventory_synced_on) -def _update_inventory_sync_status(ecom_item_success_map: Dict[str, bool], timestamp: str) -> None: +def _update_inventory_sync_status(ecom_item_success_map: dict[str, bool], timestamp: str) -> None: for ecom_item, status in ecom_item_success_map.items(): if status: update_inventory_sync_status(ecom_item, timestamp) diff --git a/ecommerce_integrations/unicommerce/invoice.py b/ecommerce_integrations/unicommerce/invoice.py index 8f99a520f..3ae3d8f3e 100644 --- a/ecommerce_integrations/unicommerce/invoice.py +++ b/ecommerce_integrations/unicommerce/invoice.py @@ -1,7 +1,7 @@ import base64 import json from collections import defaultdict -from typing import Any, Dict, List, NewType, Optional +from typing import Any, NewType import frappe import requests @@ -34,7 +34,7 @@ remove_non_alphanumeric_chars, ) -JsonDict = Dict[str, Any] +JsonDict = dict[str, Any] SOCode = NewType("SOCode", str) # TypedDict @@ -42,17 +42,17 @@ # item_code: str # warehouse: str # batch_no: str -ItemWHAlloc = Dict[str, str] +ItemWHAlloc = dict[str, str] -WHAllocation = Dict[SOCode, List[ItemWHAlloc]] +WHAllocation = dict[SOCode, list[ItemWHAlloc]] INVOICED_STATE = ["PACKED", "READY_TO_SHIP", "DISPATCHED", "MANIFESTED", "SHIPPED", "DELIVERED"] @frappe.whitelist() def generate_unicommerce_invoices( - sales_orders: List[SOCode], warehouse_allocation: Optional[WHAllocation] = None + sales_orders: list[SOCode], warehouse_allocation: WHAllocation | None = None ): """Request generation of invoice to Unicommerce and sync that invoice. @@ -126,8 +126,8 @@ def generate_unicommerce_invoices( def bulk_generate_invoices( - sales_orders: List[SOCode], - warehouse_allocation: Optional[WHAllocation] = None, + sales_orders: list[SOCode], + warehouse_allocation: WHAllocation | None = None, request_id=None, client=None, ): @@ -153,7 +153,6 @@ def bulk_generate_invoices( def _log_invoice_generation(sales_orders, failed_orders): - failed_orders = set(failed_orders) failed_orders.update(_get_orders_with_missing_invoice(sales_orders)) successful_orders = list(set(sales_orders) - set(failed_orders)) @@ -187,7 +186,7 @@ def _get_orders_with_missing_invoice(sales_orders): return missing_invoices -def update_invoicing_status(sales_orders: List[str], status: str) -> None: +def update_invoicing_status(sales_orders: list[str], status: str) -> None: if not sales_orders: return @@ -236,9 +235,7 @@ def _validate_wh_allocation(warehouse_allocation: WHAllocation): frappe.throw(msg) -def _generate_invoice( - client: UnicommerceAPIClient, erpnext_order, channel_config, warehouse_allocation=None -): +def _generate_invoice(client: UnicommerceAPIClient, erpnext_order, channel_config, warehouse_allocation=None): unicommerce_so_code = erpnext_order.get(ORDER_CODE_FIELD) so_data = client.get_sales_order(unicommerce_so_code) @@ -286,16 +283,12 @@ def _fetch_and_sync_invoice( """ so_data = client.get_sales_order(unicommerce_so_code) - shipping_packages = [ - d["code"] for d in so_data["shippingPackages"] if d["status"] in INVOICED_STATE - ] + shipping_packages = [d["code"] for d in so_data["shippingPackages"] if d["status"] in INVOICED_STATE] for package in shipping_packages: invoice_response = invoice_responses.get(package) or {} invoice_data = client.get_sales_invoice(package, facility_code)["invoice"] - label_pdf = fetch_label_pdf( - package, invoice_response, client=client, facility_code=facility_code - ) + label_pdf = fetch_label_pdf(package, invoice_response, client=client, facility_code=facility_code) create_sales_invoice( invoice_data, erpnext_so_code, @@ -315,7 +308,7 @@ def create_sales_invoice( shipping_label=None, warehouse_allocations=None, invoice_response=None, - so_data: Optional[JsonDict] = None, + so_data: JsonDict | None = None, ): """Create ERPNext Sales Invcoice using Unicommerce sales invoice data and related Sales order. @@ -351,9 +344,7 @@ def create_sales_invoice( shipping_package_code = si_data.get("shippingPackageCode") shipping_package_info = _get_shipping_package(so_data, shipping_package_code) or {} - tracking_no = invoice_response.get("trackingNumber") or shipping_package_info.get( - "trackingNumber" - ) + tracking_no = invoice_response.get("trackingNumber") or shipping_package_info.get("trackingNumber") shipping_provider_code = ( invoice_response.get("shippingProviderCode") or shipping_package_info.get("shippingProvider") @@ -412,10 +403,10 @@ def create_sales_invoice( def attach_unicommerce_docs( sales_invoice: str, - invoice: Optional[str], - label: Optional[str], - invoice_code: Optional[str], - package_code: Optional[str], + invoice: str | None, + label: str | None, + invoice_code: str | None, + package_code: str | None, ) -> None: """Attach invoice and label to specified sales invoice. @@ -452,9 +443,9 @@ def _get_line_items( warehouse: str, so_code: str, cost_center: str, - warehouse_allocations: Optional[WHAllocation] = None, -) -> List[Dict[str, Any]]: - """ Invoice items can be different and are consolidated, hence recomputing is required """ + warehouse_allocations: WHAllocation | None = None, +) -> list[dict[str, Any]]: + """Invoice items can be different and are consolidated, hence recomputing is required""" si_items = [] for item in line_items: @@ -481,15 +472,12 @@ def _get_line_items( return si_items -def _assign_wh_and_so_row(line_items, warehouse_allocation: List[ItemWHAlloc], so_code: str): - +def _assign_wh_and_so_row(line_items, warehouse_allocation: list[ItemWHAlloc], so_code: str): so_items = frappe.get_doc("Sales Order", so_code).items so_item_price_map = {d.name: d.rate for d in so_items} # remove cancelled items - warehouse_allocation = [ - d for d in warehouse_allocation if d["sales_order_row"] in so_item_price_map - ] + warehouse_allocation = [d for d in warehouse_allocation if d["sales_order_row"] in so_item_price_map] # update price for item in warehouse_allocation: @@ -501,7 +489,7 @@ def _assign_wh_and_so_row(line_items, warehouse_allocation: List[ItemWHAlloc], s line_items.sort(key=sort_key) # update references - for item, wh_alloc in zip(line_items, warehouse_allocation): + for item, wh_alloc in zip(line_items, warehouse_allocation, strict=False): item["so_detail"] = wh_alloc["sales_order_row"] item["warehouse"] = wh_alloc["warehouse"] item["batch_no"] = wh_alloc.get("batch_no") @@ -510,7 +498,7 @@ def _assign_wh_and_so_row(line_items, warehouse_allocation: List[ItemWHAlloc], s def _verify_total(si, si_data) -> None: - """ Leave a comment if grand total does not match unicommerce total""" + """Leave a comment if grand total does not match unicommerce total""" if abs(si.grand_total - flt(si_data["total"])) > 0.5: si.add_comment(text=f"Invoice totals mismatch: Unicommerce reported total of {si_data['total']}") @@ -541,7 +529,6 @@ def make_payment_entry(invoice, channel_config, invoice_posting_date=None): def fetch_label_pdf(package, invoicing_response, client, facility_code): - if invoicing_response and invoicing_response.get("shippingLabelLink"): link = invoicing_response.get("shippingLabelLink") return fetch_pdf_as_base64(link) diff --git a/ecommerce_integrations/unicommerce/order.py b/ecommerce_integrations/unicommerce/order.py index 6b1ea741b..7c78608b1 100644 --- a/ecommerce_integrations/unicommerce/order.py +++ b/ecommerce_integrations/unicommerce/order.py @@ -1,6 +1,7 @@ import json from collections import defaultdict, namedtuple -from typing import Any, Dict, Iterator, List, NewType, Optional, Set, Tuple +from collections.abc import Iterator +from typing import Any, NewType import frappe from frappe.utils import add_to_date, flt @@ -29,7 +30,7 @@ from ecommerce_integrations.unicommerce.utils import create_unicommerce_log, get_unicommerce_date from ecommerce_integrations.utils.taxation import get_dummy_tax_category -UnicommerceOrder = NewType("UnicommerceOrder", Dict[str, Any]) +UnicommerceOrder = NewType("UnicommerceOrder", dict[str, Any]) def sync_new_orders(client: UnicommerceAPIClient = None, force=False): @@ -61,10 +62,7 @@ def sync_new_orders(client: UnicommerceAPIClient = None, force=False): _create_sales_invoices(order, sales_order, client) -def _get_new_orders( - client: UnicommerceAPIClient, status: Optional[str] -) -> Optional[Iterator[UnicommerceOrder]]: - +def _get_new_orders(client: UnicommerceAPIClient, status: str | None) -> Iterator[UnicommerceOrder] | None: """Search new sales order from unicommerce.""" updated_since = 24 * 60 # minutes @@ -124,8 +122,7 @@ def _create_sales_invoices(unicommerce_order, sales_order, client: UnicommerceAP frappe.flags.request_id = None -def create_order(payload: UnicommerceOrder, request_id: Optional[str] = None, client=None) -> None: - +def create_order(payload: UnicommerceOrder, request_id: str | None = None, client=None) -> None: order = payload existing_so = frappe.db.get_value("Sales Order", {ORDER_CODE_FIELD: order["code"]}) @@ -158,7 +155,7 @@ def create_order(payload: UnicommerceOrder, request_id: Optional[str] = None, cl return order -def _sync_order_items(order: UnicommerceOrder, client: UnicommerceAPIClient) -> Set[str]: +def _sync_order_items(order: UnicommerceOrder, client: UnicommerceAPIClient) -> set[str]: """Ensure all items are synced before processing order. If not synced then product sync for specific item is initiated""" @@ -174,7 +171,6 @@ def _sync_order_items(order: UnicommerceOrder, client: UnicommerceAPIClient) -> def _create_order(order: UnicommerceOrder, customer) -> None: - channel_config = frappe.get_doc("Unicommerce Channel", order["channel"]) settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) @@ -219,9 +215,8 @@ def _create_order(order: UnicommerceOrder, customer) -> None: def _get_line_items( - line_items, default_warehouse: Optional[str] = None, is_cancelled: bool = False -) -> List[Dict[str, Any]]: - + line_items, default_warehouse: str | None = None, is_cancelled: bool = False +) -> list[dict[str, Any]]: settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) wh_map = settings.get_integration_to_erpnext_wh_mapping(all_wh=True) so_items = [] @@ -249,7 +244,7 @@ def _get_line_items( return so_items -def get_taxes(line_items, channel_config) -> List: +def get_taxes(line_items, channel_config) -> list: taxes = [] # Note: Tax details are NOT available during SO stage. @@ -301,7 +296,7 @@ def _get_facility_code(line_items) -> str: if len(facility_codes) > 1: frappe.throw("Multiple facility codes found in single order") - return list(facility_codes)[0] + return next(iter(facility_codes)) def update_shipping_info(doc, method=None): @@ -330,9 +325,7 @@ def _update_package_info_on_unicommerce(so_code): shipping_packages = updated_so_data.get("shippingPackages") if not shipping_packages: - frappe.throw( - frappe._("Shipping package not present on Unicommerce for order {}").format(so.name) - ) + frappe.throw(frappe._("Shipping package not present on Unicommerce for order {}").format(so.name)) shipping_package_code = shipping_packages[0].get("code") @@ -356,7 +349,7 @@ def _update_package_info_on_unicommerce(so_code): raise -def _get_batch_no(so_line_item) -> Optional[str]: +def _get_batch_no(so_line_item) -> str | None: """If specified vendor batch code is valid batch number in ERPNext then get batch no. SO line items contain batch no detail like this: @@ -374,9 +367,7 @@ def _get_batch_no(so_line_item) -> Optional[str]: } }, """ - batch_no = ((so_line_item.get("batchDTO") or {}).get("batchFieldsDTO") or {}).get( - "vendorBatchNumber" - ) + batch_no = ((so_line_item.get("batchDTO") or {}).get("batchFieldsDTO") or {}).get("vendorBatchNumber") if batch_no and frappe.db.exists("Batch", batch_no): return batch_no diff --git a/ecommerce_integrations/unicommerce/pick_list.py b/ecommerce_integrations/unicommerce/pick_list.py index 7a8833470..c5334fc75 100644 --- a/ecommerce_integrations/unicommerce/pick_list.py +++ b/ecommerce_integrations/unicommerce/pick_list.py @@ -21,7 +21,9 @@ def validate(self, method=None): if pl.picked_qty > pl.qty: pl.picked_qty = pl.qty - frappe.throw(_("Row {0} Picked Qty cannot be more than Sales Order Qty").format(pl.idx)) + frappe.throw( + _("Row {0} Picked Qty cannot be more than Sales Order Qty").format(pl.idx) + ) if pl.picked_qty == 0 and pl.docstatus == 1: frappe.throw( _("You have not picked {0} in row {1} . Pick the item to proceed!").format( diff --git a/ecommerce_integrations/unicommerce/product.py b/ecommerce_integrations/unicommerce/product.py index 553bc9e38..26c62c16f 100644 --- a/ecommerce_integrations/unicommerce/product.py +++ b/ecommerce_integrations/unicommerce/product.py @@ -1,4 +1,4 @@ -from typing import List, NewType +from typing import NewType import frappe from frappe import _ @@ -91,7 +91,6 @@ def _create_item_dict(uni_item): _validate_create_brand(uni_item.get("brand")) for uni_field, erpnext_field in UNI_TO_ERPNEXT_ITEM_MAPPING.items(): - value = uni_item.get(uni_field) if not _validate_field(erpnext_field, value): continue @@ -218,7 +217,7 @@ def upload_new_items(force=False) -> None: log.save() -def _get_new_items() -> List[ItemCode]: +def _get_new_items() -> list[ItemCode]: new_items = frappe.db.sql( f""" SELECT item.item_code @@ -234,8 +233,8 @@ def _get_new_items() -> List[ItemCode]: def upload_items_to_unicommerce( - item_codes: List[ItemCode], client: UnicommerceAPIClient = None -) -> List[ItemCode]: + item_codes: list[ItemCode], client: UnicommerceAPIClient = None +) -> list[ItemCode]: """Upload multiple items to Unicommerce. Return Successfully synced item codes. @@ -284,9 +283,7 @@ def _build_unicommerce_item(item_code: ItemCode) -> JsonDict: elif barcode.barcode_type == "UPC-A": item_json["upc"] = barcode.barcode - item_json["categoryCode"] = frappe.db.get_value( - "Item Group", item.item_group, PRODUCT_CATEGORY_FIELD - ) + item_json["categoryCode"] = frappe.db.get_value("Item Group", item.item_group, PRODUCT_CATEGORY_FIELD) # append site prefix to image url item_json["imageUrl"] = get_url(item.image) item_json["maxRetailPrice"] = item.standard_rate @@ -338,6 +335,4 @@ def validate_item(doc, method=None): item_group = frappe.get_cached_doc("Item Group", item.item_group) if not item_group.get(PRODUCT_CATEGORY_FIELD): - frappe.throw( - _("Unicommerce Product category required in Item Group: {}").format(item_group.name) - ) + frappe.throw(_("Unicommerce Product category required in Item Group: {}").format(item_group.name)) diff --git a/ecommerce_integrations/unicommerce/status_updater.py b/ecommerce_integrations/unicommerce/status_updater.py index fdd85dd61..c81d79666 100644 --- a/ecommerce_integrations/unicommerce/status_updater.py +++ b/ecommerce_integrations/unicommerce/status_updater.py @@ -47,7 +47,6 @@ def update_sales_order_status(): - settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) if not settings.is_enabled(): return @@ -58,9 +57,7 @@ def update_sales_order_status(): minutes = days_to_sync * 24 * 60 updated_orders = client.search_sales_order(updated_since=minutes) - enabled_channels = frappe.db.get_list( - "Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id" - ) + enabled_channels = frappe.db.get_list("Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id") valid_orders = [order for order in updated_orders if order.get("channel") in enabled_channels] if valid_orders: _update_order_status_fields(valid_orders) @@ -79,7 +76,6 @@ def update_sales_order_status(): def _update_order_status_fields(orders): - order_status_map = {d["code"]: d["status"] for d in orders} order_codes = list(order_status_map.keys()) @@ -121,9 +117,7 @@ def update_shipping_package_status(): # find all Facilities enabled_facilities = list(settings.get_integration_to_erpnext_wh_mapping().keys()) - enabled_channels = frappe.db.get_list( - "Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id" - ) + enabled_channels = frappe.db.get_list("Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id") for facility in enabled_facilities: updated_packages = client.search_shipping_packages(updated_since=minutes, facility_code=facility) @@ -140,7 +134,6 @@ def update_shipping_package_status(): def _update_package_status_fields(packages): - package_status_map = {d["code"]: d["status"] for d in packages} package_codes = list(package_status_map.keys()) diff --git a/ecommerce_integrations/unicommerce/tests/test_client.py b/ecommerce_integrations/unicommerce/tests/test_client.py index 50f6c5f34..ee667c2ac 100644 --- a/ecommerce_integrations/unicommerce/tests/test_client.py +++ b/ecommerce_integrations/unicommerce/tests/test_client.py @@ -131,7 +131,6 @@ def test_create_update_item(self): self.assertTrue(response["successful"]) def test_bulk_inventory_sync(self): - expected_body = { "inventoryAdjustments": [ { @@ -289,9 +288,7 @@ def test_update_shipping_package(self): ], ) - self.client.update_shipping_package( - "SP_CODE", "TEST", "DEFAULT", length=100, width=200, height=300 - ) + self.client.update_shipping_package("SP_CODE", "TEST", "DEFAULT", length=100, width=200, height=300) self.assert_last_request_headers("Facility", "TEST") def test_get_invoice_label(self): @@ -323,7 +320,9 @@ def test_bulk_import(self): responses.POST, "https://demostaging.unicommerce.com/services/rest/v1/data/import/job/create", status=200, - match=[query_param_matcher({"name": "Auto GRN Items", "importOption": "CREATE_NEW"}),], + match=[ + query_param_matcher({"name": "Auto GRN Items", "importOption": "CREATE_NEW"}), + ], json={"successful": True}, ) diff --git a/ecommerce_integrations/unicommerce/tests/test_inventory.py b/ecommerce_integrations/unicommerce/tests/test_inventory.py index b931c9f35..0dba3751d 100644 --- a/ecommerce_integrations/unicommerce/tests/test_inventory.py +++ b/ecommerce_integrations/unicommerce/tests/test_inventory.py @@ -93,7 +93,6 @@ def test_inventory_sync(self): def make_ecommerce_item(item_code): - if ecommerce_item.is_synced(MODULE_NAME, item_code): return diff --git a/ecommerce_integrations/unicommerce/tests/test_invoice.py b/ecommerce_integrations/unicommerce/tests/test_invoice.py index ac80d9fa0..b551aec2f 100644 --- a/ecommerce_integrations/unicommerce/tests/test_invoice.py +++ b/ecommerce_integrations/unicommerce/tests/test_invoice.py @@ -55,9 +55,7 @@ def test_create_invoice(self): attachments = frappe.get_all( "File", fields=["name", "file_name"], filters={"attached_to_name": si.name} ) - self.assertGreaterEqual( - len(attachments), 2, msg=f"Expected 2 attachments, found: {str(attachments)}" - ) + self.assertGreaterEqual(len(attachments), 2, msg=f"Expected 2 attachments, found: {attachments!s}") def test_end_to_end_invoice_generation(self): """Full invoice generation test with mocked responses.""" @@ -113,6 +111,4 @@ def test_end_to_end_invoice_generation(self): attachments = frappe.get_all( "File", fields=["name", "file_name"], filters={"attached_to_name": si.name} ) - self.assertGreaterEqual( - len(attachments), 2, msg=f"Expected 2 attachments, found: {str(attachments)}" - ) + self.assertGreaterEqual(len(attachments), 2, msg=f"Expected 2 attachments, found: {attachments!s}") diff --git a/ecommerce_integrations/unicommerce/tests/test_order.py b/ecommerce_integrations/unicommerce/tests/test_order.py index 20b3071fd..aea4c1665 100644 --- a/ecommerce_integrations/unicommerce/tests/test_order.py +++ b/ecommerce_integrations/unicommerce/tests/test_order.py @@ -26,9 +26,15 @@ def setUpClass(cls): def test_validate_item_list(self): order_files = ["order-SO5905", "order-SO5906", "order-SO5907"] - items_list = [{"MC-100", "TITANIUM_WATCH"}, {"MC-100",}, {"MC-100", "TITANIUM_WATCH"}] - - for order_file, items in zip(order_files, items_list): + items_list = [ + {"MC-100", "TITANIUM_WATCH"}, + { + "MC-100", + }, + {"MC-100", "TITANIUM_WATCH"}, + ] + + for order_file, items in zip(order_files, items_list, strict=False): order = self.load_fixture(order_file)["saleOrderDTO"] self.assertEqual(items, _sync_order_items(order, client=self.client)) diff --git a/ecommerce_integrations/unicommerce/tests/test_product.py b/ecommerce_integrations/unicommerce/tests/test_product.py index 96c72e5b5..2b45839a4 100644 --- a/ecommerce_integrations/unicommerce/tests/test_product.py +++ b/ecommerce_integrations/unicommerce/tests/test_product.py @@ -28,9 +28,7 @@ def test_import_missing_item_raises_error(self): json=self.load_fixture("missing_item"), match=[responses.json_params_matcher({"skuCode": "MISSING"})], ) - self.assertRaises( - frappe.ValidationError, import_product_from_unicommerce, "MISSING", self.client - ) + self.assertRaises(frappe.ValidationError, import_product_from_unicommerce, "MISSING", self.client) log = frappe.get_last_doc("Ecommerce Integration Log", filters={"integration": "unicommerce"}) self.assertTrue("Failed to import" in log.message, "Logging for missing item not working") diff --git a/ecommerce_integrations/unicommerce/tests/test_status.py b/ecommerce_integrations/unicommerce/tests/test_status.py index 6d61564c5..8cdc6581c 100644 --- a/ecommerce_integrations/unicommerce/tests/test_status.py +++ b/ecommerce_integrations/unicommerce/tests/test_status.py @@ -15,7 +15,6 @@ def test_serialization(self): _serialize_items([si_item.as_dict()]) def test_delete_cancelled_items(self): - item1 = frappe.new_doc("Sales Order Item").update({ORDER_ITEM_CODE_FIELD: "cancelled"}) item2 = frappe.new_doc("Sales Order Item").update({ORDER_ITEM_CODE_FIELD: "not cancelled"}) diff --git a/ecommerce_integrations/unicommerce/tests/utils.py b/ecommerce_integrations/unicommerce/tests/utils.py index 3c0e06880..d779c5365 100644 --- a/ecommerce_integrations/unicommerce/tests/utils.py +++ b/ecommerce_integrations/unicommerce/tests/utils.py @@ -2,6 +2,7 @@ import json import os import unittest +from typing import ClassVar import frappe @@ -12,7 +13,7 @@ class TestCase(unittest.TestCase): - config = { + config: ClassVar = { "is_enabled": 1, "enable_inventory_sync": 1, "use_stock_entry_for_grn": 1, diff --git a/ecommerce_integrations/unicommerce/utils.py b/ecommerce_integrations/unicommerce/utils.py index 966c53eea..cd4d699a6 100644 --- a/ecommerce_integrations/unicommerce/utils.py +++ b/ecommerce_integrations/unicommerce/utils.py @@ -48,7 +48,7 @@ def force_sync(document) -> None: def get_unicommerce_date(timestamp: int) -> datetime.date: - """ Convert unicommerce ms timestamp to datetime.""" + """Convert unicommerce ms timestamp to datetime.""" return datetime.date.fromtimestamp(timestamp // 1000) diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js b/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js index 6177800ea..10e6614f4 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js @@ -1,8 +1,7 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see license.txt -frappe.ui.form.on('Zenoti Category', { +frappe.ui.form.on("Zenoti Category", { // refresh: function(frm) { - // } }); diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js b/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js index 09f21a475..e38403f9b 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js @@ -1,145 +1,187 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see license.txt -frappe.ui.form.on('Zenoti Center', { +frappe.ui.form.on("Zenoti Center", { refresh(frm) { - frm.add_custom_button('Employees', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Employees", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); - - frm.add_custom_button('Customers', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Customers", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); + frm.add_custom_button( + __("Employees"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Employees", + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); - frm.add_custom_button('Items', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Items", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); + frm.add_custom_button( + __("Customers"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Customers", + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); - frm.add_custom_button('Categories', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Categories", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); + frm.add_custom_button( + __("Items"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Items", + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); - frm.add_custom_button('Sales Invoice', function() { - let d = new frappe.ui.Dialog({ - title: __('Sync Sales Invoice'), - fields: [ - { - "label" : "From Date", - "fieldname": "start_date", - "fieldtype": "Date", - "reqd": 1 + frm.add_custom_button( + __("Categories"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Categories", }, - { - "label" : "To Date", - "fieldname": "end_date", - "fieldtype": "Date", - "reqd": 1 - } - ], - primary_action: function() { - let data = d.get_values(); - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Sales Invoice", - start_date: data.start_date, - end_date: data.end_date + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); + + frm.add_custom_button( + __("Sales Invoice"), + function () { + let d = new frappe.ui.Dialog({ + title: __("Sync Sales Invoice"), + fields: [ + { + label: "From Date", + fieldname: "start_date", + fieldtype: "Date", + reqd: 1, }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - d.hide(); - }, - primary_action_label: __('Sync Sales Invoice') - }); - d.show(); - }, 'Sync'); + { + label: "To Date", + fieldname: "end_date", + fieldtype: "Date", + reqd: 1, + }, + ], + primary_action: function () { + let data = d.get_values(); + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Sales Invoice", + start_date: data.start_date, + end_date: data.end_date, + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + d.hide(); + }, + primary_action_label: __("Sync Sales Invoice"), + }); + d.show(); + }, + __("Sync") + ); - frm.add_custom_button('Stock Reconciliation', function() { - let d = new frappe.ui.Dialog({ - title: __('Sync Stock Reconciliation'), - fields: [ - { - "label" : "Date", - "fieldname": "date", - "fieldtype": "Date", - "reqd": 1 - } - ], - primary_action: function() { - let data = d.get_values(); - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Stock Reconciliation", - start_date: data.date + frm.add_custom_button( + __("Stock Reconciliation"), + function () { + let d = new frappe.ui.Dialog({ + title: __("Sync Stock Reconciliation"), + fields: [ + { + label: "Date", + fieldname: "date", + fieldtype: "Date", + reqd: 1, }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - d.hide(); - }, - primary_action_label: __('Sync Stock Reconciliation') - }); - d.show(); - }, 'Sync'); + ], + primary_action: function () { + let data = d.get_values(); + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Stock Reconciliation", + start_date: data.date, + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + d.hide(); + }, + primary_action_label: __("Sync Stock Reconciliation"), + }); + d.show(); + }, + __("Sync") + ); }, setup(frm) { - frm.set_query("erpnext_cost_center", function() { + frm.set_query("erpnext_cost_center", function () { return { filters: { is_group: 0, - } - } + }, + }; }); - frm.set_query("erpnext_warehouse", function() { + frm.set_query("erpnext_warehouse", function () { return { filters: { is_group: 0, - } - } + }, + }; }); - } + }, }); diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js b/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js index 466346963..931c347a4 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js @@ -1,8 +1,7 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see LICENSE -frappe.ui.form.on('Zenoti Error Logs', { +frappe.ui.form.on("Zenoti Error Logs", { // refresh: function(frm) { - // } }); diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js b/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js index 1a69aa61c..0d8c3fc26 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js @@ -1,65 +1,67 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see LICENSE -frappe.ui.form.on('Zenoti Settings', { - setup: function(frm){ - frm.set_query("liability_income_account_for_gift_and_prepaid_cards", function() { - if (!frm.doc.company) { - frappe.throw(__("Please select company first")) - } - return { - filters: { - root_type: "Liability", - is_group: 0, - account_type: "Income Account", - company: frm.doc.company +frappe.ui.form.on("Zenoti Settings", { + setup: function (frm) { + frm.set_query( + "liability_income_account_for_gift_and_prepaid_cards", + function () { + if (!frm.doc.company) { + frappe.throw(__("Please select company first")); } + return { + filters: { + root_type: "Liability", + is_group: 0, + account_type: "Income Account", + company: frm.doc.company, + }, + }; } - }); + ); - frm.set_query("default_purchase_warehouse", function() { + frm.set_query("default_purchase_warehouse", function () { if (!frm.doc.company) { - frappe.throw(__("Please select company first")) + frappe.throw(__("Please select company first")); } return { filters: { is_group: 0, - company: frm.doc.company - } + company: frm.doc.company, + }, }; }); - frm.set_query("default_buying_price_list", function() { + frm.set_query("default_buying_price_list", function () { return { filters: { buying: 1, - } - } + }, + }; }); - frm.set_query("default_selling_price_list", function() { + frm.set_query("default_selling_price_list", function () { return { filters: { selling: 1, - } - } + }, + }; }); }, refresh(frm) { - if(cint(frm.doc.enable_zenoti)) { - frm.add_custom_button('Update Centers', function() { + if (cint(frm.doc.enable_zenoti)) { + frm.add_custom_button(__("Update Centers"), function () { frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_settings.zenoti_settings.update_centers", + method: "ecommerce_integrations.zenoti.doctype.zenoti_settings.zenoti_settings.update_centers", freeze: true, - freeze_message: "Updating Centers...", - callback: function(r){ + freeze_message: __("Updating Centers..."), + callback: function (r) { if (!r.exc) { - frappe.show_alert(__("Centers Updated")) + frappe.show_alert(__("Centers Updated")); } - } - }) - d.hide(); + }, + }); }); } - } + }, }); diff --git a/ecommerce_integrations/zenoti/purchase_transactions.py b/ecommerce_integrations/zenoti/purchase_transactions.py index e49840c8e..c4a66e0e0 100644 --- a/ecommerce_integrations/zenoti/purchase_transactions.py +++ b/ecommerce_integrations/zenoti/purchase_transactions.py @@ -28,9 +28,7 @@ def get_list_of_purchase_orders_for_center(center, date=None): start_date = add_to_date(end_date, days=-1) route = "inventory/purchase_orders?center_id=" url_end = "&show_delivery_details=true&date_criteria=1&status=-1" - full_url = ( - api_url + route + center + "&start_date=" + start_date + "&end_date=" + end_date + url_end - ) + full_url = api_url + route + center + "&start_date=" + start_date + "&end_date=" + end_date + url_end all_orders = make_api_call(full_url) return all_orders @@ -208,7 +206,9 @@ def add_items(doc, item_data): invoice_item[key] = value if key == "item_code": item_code = frappe.db.get_value( - "Item", {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, "item_code" + "Item", + {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, + "item_code", ) invoice_item["item_code"] = item_code diff --git a/ecommerce_integrations/zenoti/sales_transactions.py b/ecommerce_integrations/zenoti/sales_transactions.py index 5fe131b1e..a1ae3cf6d 100644 --- a/ecommerce_integrations/zenoti/sales_transactions.py +++ b/ecommerce_integrations/zenoti/sales_transactions.py @@ -250,9 +250,7 @@ def process_sales_line_items(invoice, cost_center, center): if len(item_err_msg_list): item_err_msg = "\n".join(err for err in item_err_msg_list) err_msg_list.append(item_err_msg) - emp_err_msg = check_for_employee( - line_item["employee"]["name"], line_item["employee"]["code"], center - ) + emp_err_msg = check_for_employee(line_item["employee"]["name"], line_item["employee"]["code"], center) if emp_err_msg: err_msg_list.append(emp_err_msg) sold_by = frappe.db.get_value( @@ -449,9 +447,7 @@ def make_invoice(invoice_details): doc.posting_time = invoice_details["posting_time"] doc.due_date = invoice_details["posting_date"] doc.cost_center = invoice_details["cost_center"] - doc.selling_price_list = frappe.db.get_single_value( - "Zenoti Settings", "default_selling_price_list" - ) + doc.selling_price_list = frappe.db.get_single_value("Zenoti Settings", "default_selling_price_list") doc.set_warehouse = invoice_details["set_warehouse"] doc.update_stock = 1 doc.rounding_adjustment = invoice_details["rounding_adjustment"] diff --git a/ecommerce_integrations/zenoti/stock_reconciliation.py b/ecommerce_integrations/zenoti/stock_reconciliation.py index 249374f71..2f9e1ddef 100644 --- a/ecommerce_integrations/zenoti/stock_reconciliation.py +++ b/ecommerce_integrations/zenoti/stock_reconciliation.py @@ -10,9 +10,7 @@ def process_stock_reconciliation(center, error_logs, date=None): if not date: date = now() list_for_entry = [] - stock_quantities_of_products_in_a_center = retrieve_stock_quantities_of_products( - center.name, date - ) + stock_quantities_of_products_in_a_center = retrieve_stock_quantities_of_products(center.name, date) if stock_quantities_of_products_in_a_center: cost_center = center.get("erpnext_cost_center") if not cost_center: @@ -31,7 +29,7 @@ def process_stock_reconciliation(center, error_logs, date=None): def retrieve_stock_quantities_of_products(center, date): - url = api_url + "inventory/stock?center_id={0}&inventory_date={1}".format(center, date) + url = api_url + f"inventory/stock?center_id={center}&inventory_date={date}" stock_quantities_of_products = make_api_call(url) return stock_quantities_of_products @@ -81,7 +79,9 @@ def add_items_to_reconcile(doc, list_for_entry): invoice_item[key] = value if key == "item_code": item_code = frappe.db.get_value( - "Item", {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, "item_code" + "Item", + {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, + "item_code", ) invoice_item["item_code"] = item_code doc.append("items", invoice_item) diff --git a/ecommerce_integrations/zenoti/utils.py b/ecommerce_integrations/zenoti/utils.py index 16b696927..3d7682ee4 100644 --- a/ecommerce_integrations/zenoti/utils.py +++ b/ecommerce_integrations/zenoti/utils.py @@ -80,9 +80,7 @@ def check_for_item(list_of_items, item_group, center=None): def make_item(item, item_group, center=None): item_details, center = get_item_details(item, item_group, center) if not item_details: - err_msg = _("Details for Item {0} does not exist in Zenoti").format( - frappe.bold(item["item_name"]) - ) + err_msg = _("Details for Item {0} does not exist in Zenoti").format(frappe.bold(item["item_name"])) return err_msg create_item(item, item_details, item_group, center) @@ -276,7 +274,7 @@ def get_state(country_id, state_id): if list_of_states_of_the_country: for states in list_of_states_of_the_country["states"]: if states["id"] == state_id: - state == states + state = states return state diff --git a/pyproject.toml b/pyproject.toml index c11448c3f..deac6bb67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,14 +20,39 @@ file = "./LICENSE" requires = ["flit_core >=3.4,<4"] build-backend = "flit_core.buildapi" -[tool.black] -line-length = 99 +[tool.ruff] +line-length = 110 +target-version = "py310" -[tool.isort] -line_length = 99 -multi_line_output = 3 -include_trailing_comma = true -force_grid_wrap = 0 -use_parentheses = true -ensure_newline_before_comments = true -indent = " " +[tool.ruff.lint] +select = [ + "F", + "E", + "W", + "I", + "UP", + "B", + "RUF", +] +ignore = [ + "B017", # assertRaises(Exception) - should be more specific + "B018", # useless expression, not assigned to anything + "B023", # function doesn't bind loop variable - will have last iteration's value + "B904", # raise inside except without from + "E101", # indentation contains mixed spaces and tabs + "E402", # module level import not at top of file + "E501", # line too long + "E741", # ambiguous variable name + "F401", # "unused" imports + "F403", # can't detect undefined names from * import + "F405", # can't detect undefined names from * import + "F722", # syntax error in forward type annotation + "W191", # indentation contains tabs + "RUF001", # string contains ambiguous unicode character +] +typing-modules = ["frappe.types.DF"] + +[tool.ruff.format] +quote-style = "double" +indent-style = "tab" +docstring-code-format = true
`,
- 'ID': product.id,
- 'Name': product.title,
- 'SKUs': product.variants && product.variants.map(a => `${a.sku}`).join(', '),
- 'Status': this.getProductSyncStatus(product.synced),
- 'Action': !product.synced ?
- `` :
- ``,
+ ID: product.id,
+ Name: product.title,
+ SKUs:
+ product.variants &&
+ product.variants.map((a) => `${a.sku}`).join(", "),
+ Status: this.getProductSyncStatus(product.synced),
+ Action: !product.synced
+ ? ``
+ : ``,
}));
return shopifyProducts;
} catch (error) {
- frappe.throw(__('Error fetching products.'));
+ frappe.throw(__("Error fetching products."));
}
-
}
getProductSyncStatus(status) {
-
- return status ?
- `Synced` :
- `Not Synced`;
-
+ return status
+ ? `Synced`
+ : `Not Synced`;
}
listen() {
-
// sync a product from table
- this.wrapper.on('click', '.btn-sync', e => {
-
+ this.wrapper.on("click", ".btn-sync", (e) => {
const _this = $(e.currentTarget);
- _this.prop('disabled', true).text('Syncing...');
+ _this.prop("disabled", true).text("Syncing...");
+
+ const product = _this.attr("data-product");
+ this.syncProduct(product).then((status) => {
+ if (!status) {
+ frappe.throw(__("Error syncing product"));
+ _this.prop("disabled", false).text("Sync");
+ return;
+ }
+
+ _this
+ .parents(".dt-row")
+ .find(".indicator-pill")
+ .replaceWith(this.getProductSyncStatus(true));
+
+ _this.replaceWith(
+ ``
+ );
+ });
+ });
- const product = _this.attr('data-product');
- this.syncProduct(product)
- .then(status => {
+ this.wrapper.on("click", ".btn-resync", (e) => {
+ const _this = $(e.currentTarget);
+ _this.prop("disabled", true).text("Syncing...");
+
+ const product = _this.attr("data-product");
+ this.resyncProduct(product)
+ .then((status) => {
if (!status) {
- frappe.throw(__('Error syncing product'));
- _this.prop('disabled', false).text('Sync');
+ frappe.throw(__("Error syncing product"));
return;
}
- _this.parents('.dt-row')
- .find('.indicator-pill')
+ _this
+ .parents(".dt-row")
+ .find(".indicator-pill")
.replaceWith(this.getProductSyncStatus(true));
- _this.replaceWith(``);
-
+ _this.prop("disabled", false).text("Re-sync");
+ })
+ .catch((ex) => {
+ _this.prop("disabled", false).text("Re-sync");
+ frappe.throw(__("Error syncing Product"));
});
-
});
- this.wrapper.on('click', '.btn-resync', e => {
- const _this = $(e.currentTarget);
-
- _this.prop('disabled', true).text('Syncing...');
-
- const product = _this.attr('data-product');
- this.resyncProduct(product)
- .then(status => {
-
- if (!status) {
- frappe.throw(__('Error syncing product'));
- return;
- }
-
- _this.parents('.dt-row')
- .find('.indicator-pill')
- .replaceWith(this.getProductSyncStatus(true));
-
- _this.prop('disabled', false).text('Re-sync');
-
- })
- .catch(ex => {
- _this.prop('disabled', false).text('Re-sync');
- frappe.throw(__('Error syncing Product'));
- });
- });
-
// pagination
- this.wrapper.on('click', '.btn-prev,.btn-next', e => this.switchPage(e));
+ this.wrapper.on("click", ".btn-prev,.btn-next", (e) =>
+ this.switchPage(e)
+ );
// sync all products
- this.wrapper.on('click', '#btn-sync-all', e => this.syncAll(e));
-
+ this.wrapper.on("click", "#btn-sync-all", (e) => this.syncAll(e));
}
async syncProduct(product) {
-
const { message: status } = await frappe.call({
- method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.sync_product',
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.sync_product",
args: { product },
});
- if (status)
- this.fetchProductCount();
+ if (status) this.fetchProductCount();
return status;
-
}
- async resyncProduct(product) {
-
- const { message: status } = await frappe.call({
- method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.resync_product',
- args: { product },
- });
-
- if (status)
- this.fetchProductCount();
+ async resyncProduct(product) {
+ const { message: status } = await frappe.call({
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.resync_product",
+ args: { product },
+ });
- return status;
+ if (status) this.fetchProductCount();
- }
+ return status;
+ }
async switchPage({ currentTarget }) {
-
const _this = $(currentTarget);
- $('.btn-paginate').prop('disabled', true);
- this.shopifyProductTable.showToastMessage('Loading...');
+ $(".btn-paginate").prop("disabled", true);
+ this.shopifyProductTable.showToastMessage("Loading...");
const newProducts = await this.fetchShopifyProducts(
- _this.hasClass('btn-next') ? this.nextUrl : this.prevUrl
+ _this.hasClass("btn-next") ? this.nextUrl : this.prevUrl
);
this.shopifyProductTable.refresh(newProducts);
- $('.btn-paginate').prop('disabled', false);
+ $(".btn-paginate").prop("disabled", false);
this.shopifyProductTable.clearToastMessage();
-
}
syncAll() {
-
this.checkSyncStatus();
this.toggleSyncAllButton();
if (this.syncRunning) {
- frappe.msgprint(__('Sync already in progress'));
+ frappe.msgprint(__("Sync already in progress"));
} else {
- frappe.call({ method: 'ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.import_all_products' })
+ frappe.call({
+ method: "ecommerce_integrations.shopify.page.shopify_import_products.shopify_import_products.import_all_products",
+ });
}
// sync progress
this.logSync();
-
}
logSync() {
-
- const _log = $('#shopify-sync-log');
- _log.parents('.card').show();
- _log.text(''); // clear logs
+ const _log = $("#shopify-sync-log");
+ _log.parents(".card").show();
+ _log.text(""); // clear logs
// define counters here to prevent calling jquery every time
- const _syncedCounter = $('#count-products-synced');
- const _erpnextCounter = $('#count-products-erpnext');
-
- frappe.realtime.on('shopify.key.sync.all.products', ({ message, synced, done, error }) => {
-
- message = `${message}`;
- _log.append(message);
- _log.scrollTop(_log[0].scrollHeight)
-
- if (synced) this.updateSyncedCount(_syncedCounter, _erpnextCounter);
-
- if (done) {
- frappe.realtime.off('shopify.key.sync.all.products');
- this.toggleSyncAllButton(false);
- this.fetchProductCount();
- this.syncRunning = false;
+ const _syncedCounter = $("#count-products-synced");
+ const _erpnextCounter = $("#count-products-erpnext");
+
+ frappe.realtime.on(
+ "shopify.key.sync.all.products",
+ ({ message, synced, done, error }) => {
+ message = `${message}`;
+ _log.append(message);
+ _log.scrollTop(_log[0].scrollHeight);
+
+ if (synced)
+ this.updateSyncedCount(_syncedCounter, _erpnextCounter);
+
+ if (done) {
+ frappe.realtime.off("shopify.key.sync.all.products");
+ this.toggleSyncAllButton(false);
+ this.fetchProductCount();
+ this.syncRunning = false;
+ }
}
-
- })
-
+ );
}
toggleSyncAllButton(disable = true) {
+ const btn = $("#btn-sync-all");
- const btn = $('#btn-sync-all');
+ const _toggleClass = (d) => (d ? "btn-success" : "btn-primary");
+ const _toggleText = () => (disable ? "Syncing..." : "Sync Products");
- const _toggleClass = d => d ? 'btn-success' : 'btn-primary';
- const _toggleText = () => disable ? 'Syncing...' : 'Sync Products';
-
- btn.prop('disabled', disable)
+ btn.prop("disabled", disable)
.addClass(_toggleClass(disable))
.removeClass(_toggleClass(!disable))
.text(_toggleText());
-
}
updateSyncedCount(_syncedCounter, _erpnextCounter) {
@@ -369,6 +357,5 @@ shopify.ProductImporter = class {
_syncedCounter.text(_synced + 1);
_erpnextCounter.text(_erpnext + 1);
-
}
-}
+};
diff --git a/ecommerce_integrations/shopify/page/shopify_import_products/shopify_import_products.py b/ecommerce_integrations/shopify/page/shopify_import_products/shopify_import_products.py
index ad2f94f3a..e30a102e9 100644
--- a/ecommerce_integrations/shopify/page/shopify_import_products/shopify_import_products.py
+++ b/ecommerce_integrations/shopify/page/shopify_import_products/shopify_import_products.py
@@ -119,7 +119,10 @@ def is_synced(product):
@frappe.whitelist()
def import_all_products():
frappe.enqueue(
- queue_sync_all_products, queue="long", job_name=SYNC_JOB_NAME, key=REALTIME_KEY,
+ queue_sync_all_products,
+ queue="long",
+ job_name=SYNC_JOB_NAME,
+ key=REALTIME_KEY,
)
@@ -150,12 +153,12 @@ def queue_sync_all_products(*args, **kwargs):
publish(f"✅ Synced Product {product.id}", synced=True)
except UniqueValidationError as e:
- publish(f"❌ Error Syncing Product {product.id} : {str(e)}", error=True)
+ publish(f"❌ Error Syncing Product {product.id} : {e!s}", error=True)
frappe.db.rollback(save_point=savepoint)
continue
except Exception as e:
- publish(f"❌ Error Syncing Product {product.id} : {str(e)}", error=True)
+ publish(f"❌ Error Syncing Product {product.id} : {e!s}", error=True)
frappe.db.rollback(save_point=savepoint)
continue
diff --git a/ecommerce_integrations/shopify/page/shopify_import_products/test_shopify_import_products.py b/ecommerce_integrations/shopify/page/shopify_import_products/test_shopify_import_products.py
index 0f03997e2..620d93685 100644
--- a/ecommerce_integrations/shopify/page/shopify_import_products/test_shopify_import_products.py
+++ b/ecommerce_integrations/shopify/page/shopify_import_products/test_shopify_import_products.py
@@ -12,16 +12,13 @@
class TestShopifyImportProducts(TestCase):
def __init__(self, obj):
- with open(
- os.path.join(os.path.dirname(__file__), "../../tests/data/bulk_products.json"), "rb"
- ) as f:
+ with open(os.path.join(os.path.dirname(__file__), "../../tests/data/bulk_products.json"), "rb") as f:
products_json = json.loads(f.read())
self._products = products_json["products"]
- super(TestShopifyImportProducts, self).__init__(obj)
+ super().__init__(obj)
def test_import_all_products(self):
-
required_products = {
"6808908169263": [
"40279118250031",
@@ -31,7 +28,12 @@ def test_import_all_products(self):
"40279118381103",
"40279118413871",
],
- "6808928124975": ["40279218028591", "40279218061359", "40279218094127", "40279218126895",],
+ "6808928124975": [
+ "40279218028591",
+ "40279218061359",
+ "40279218094127",
+ "40279218126895",
+ ],
"6808887689263": ["40279042883631", "40279042916399", "40279042949167"],
"6808908955695": ["40279122673711", "40279122706479", "40279122739247"],
"6808917737519": ["40279168221231", "40279168253999", "40279168286767"],
@@ -64,7 +66,6 @@ def test_import_all_products(self):
queue_sync_all_products()
for product, required_variants in required_products.items():
-
# has_variants is needed to avoid get_erpnext_item()
# fetching the variant instead of template because of
# matching integration_item_code
@@ -95,8 +96,8 @@ def test_import_all_products(self):
self.assertEqual(sorted(required_variants), sorted(created_ecom_variants))
def fake_single_product_from_bulk(self, product):
- item = [p for p in self._products if str(p["id"]) == product][0]
+ item = next(p for p in self._products if str(p["id"]) == product)
product_json = json.dumps({"product": item})
- self.fake("products/%s" % product, body=product_json)
+ self.fake(f"products/{product}", body=product_json)
diff --git a/ecommerce_integrations/shopify/product.py b/ecommerce_integrations/shopify/product.py
index ffae32049..92c31f467 100644
--- a/ecommerce_integrations/shopify/product.py
+++ b/ecommerce_integrations/shopify/product.py
@@ -23,9 +23,9 @@ class ShopifyProduct:
def __init__(
self,
product_id: str,
- variant_id: Optional[str] = None,
- sku: Optional[str] = None,
- has_variants: Optional[int] = 0,
+ variant_id: str | None = None,
+ sku: str | None = None,
+ has_variants: int | None = 0,
):
self.product_id = str(product_id)
self.variant_id = str(variant_id) if variant_id else None
@@ -38,7 +38,10 @@ def __init__(
def is_synced(self) -> bool:
return ecommerce_item.is_synced(
- MODULE_NAME, integration_item_code=self.product_id, variant_id=self.variant_id, sku=self.sku,
+ MODULE_NAME,
+ integration_item_code=self.product_id,
+ variant_id=self.variant_id,
+ sku=self.sku,
)
def get_erpnext_item(self):
@@ -81,7 +84,8 @@ def _create_attribute(self, product_dict):
"doctype": "Item Attribute",
"attribute_name": attr.get("name"),
"item_attribute_values": [
- {"attribute_value": attr_value, "abbr": attr_value} for attr_value in attr.get("values")
+ {"attribute_value": attr_value, "abbr": attr_value}
+ for attr_value in attr.get("values")
],
}
).insert()
@@ -175,7 +179,11 @@ def _create_item_variants(self, product_dict, warehouse, attributes):
for i, variant_attr in enumerate(SHOPIFY_VARIANTS_ATTR_LIST):
if variant.get(variant_attr):
attributes[i].update(
- {"attribute_value": self._get_attribute_value(variant.get(variant_attr), attributes[i])}
+ {
+ "attribute_value": self._get_attribute_value(
+ variant.get(variant_attr), attributes[i]
+ )
+ }
)
self._create_item(shopify_item_variant, warehouse, 0, attributes, template_item.name)
@@ -263,9 +271,7 @@ def _get_item_image(product_dict):
return None
-def _match_sku_and_link_item(
- item_dict, product_id, variant_id, variant_of=None, has_variant=False
-) -> bool:
+def _match_sku_and_link_item(item_dict, product_id, variant_id, variant_of=None, has_variant=False) -> bool:
"""Tries to match new item with existing item using Shopify SKU == item_code.
Returns true if matched and linked.
@@ -298,7 +304,6 @@ def _match_sku_and_link_item(
def create_items_if_not_exist(order):
"""Using shopify order, sync all items that are not already synced."""
for item in order.get("line_items", []):
-
product_id = item["product_id"]
variant_id = item.get("variant_id")
sku = item.get("sku")
@@ -401,7 +406,9 @@ def upload_erpnext_item(doc, method=None):
try:
variant_attributes[f"option{i+1}"] = item.attributes[i].attribute_value
except IndexError:
- frappe.throw(_("Shopify Error: Missing value for attribute {}").format(attr.attribute))
+ frappe.throw(
+ _("Shopify Error: Missing value for attribute {}").format(attr.attribute)
+ )
product.variants.append(Variant(variant_attributes))
product.save() # push variant
@@ -429,7 +436,9 @@ def upload_erpnext_item(doc, method=None):
map_erpnext_item_to_shopify(shopify_product=product, erpnext_item=template_item)
if not item.variant_of:
update_default_variant_properties(
- product, is_stock_item=template_item.is_stock_item, price=item.get(ITEM_SELLING_RATE_FIELD)
+ product,
+ is_stock_item=template_item.is_stock_item,
+ price=item.get(ITEM_SELLING_RATE_FIELD),
)
else:
variant_attributes = {"sku": item.item_code, "price": item.get(ITEM_SELLING_RATE_FIELD)}
@@ -448,7 +457,9 @@ def upload_erpnext_item(doc, method=None):
try:
variant_attributes[f"option{i+1}"] = item.attributes[i].attribute_value
except IndexError:
- frappe.throw(_("Shopify Error: Missing value for attribute {}").format(attr.attribute))
+ frappe.throw(
+ _("Shopify Error: Missing value for attribute {}").format(attr.attribute)
+ )
product.variants.append(Variant(variant_attributes))
is_successful = product.save()
@@ -458,9 +469,7 @@ def upload_erpnext_item(doc, method=None):
write_upload_log(status=is_successful, product=product, item=item, action="Updated")
-def map_erpnext_variant_to_shopify_variant(
- shopify_product: Product, erpnext_item, variant_attributes
-):
+def map_erpnext_variant_to_shopify_variant(shopify_product: Product, erpnext_item, variant_attributes):
variant_product_id = frappe.db.get_value(
"Ecommerce Item",
{"erpnext_item_code": erpnext_item.name, "integration": MODULE_NAME},
@@ -520,8 +529,8 @@ def get_shopify_weight_uom(erpnext_weight_uom: str) -> str:
def update_default_variant_properties(
shopify_product: Product,
is_stock_item: bool,
- sku: Optional[str] = None,
- price: Optional[float] = None,
+ sku: str | None = None,
+ price: float | None = None,
):
"""Shopify creates default variant upon saving the product.
@@ -547,7 +556,10 @@ def write_upload_log(status: bool, product: Product, item, action="Created") ->
msgprint(msg, title="Note", indicator="orange")
create_shopify_log(
- status="Error", request_data=product.to_dict(), message=msg, method="upload_erpnext_item",
+ status="Error",
+ request_data=product.to_dict(),
+ message=msg,
+ method="upload_erpnext_item",
)
else:
create_shopify_log(
diff --git a/ecommerce_integrations/shopify/tests/test_connection.py b/ecommerce_integrations/shopify/tests/test_connection.py
index 697b88066..d488885d2 100644
--- a/ecommerce_integrations/shopify/tests/test_connection.py
+++ b/ecommerce_integrations/shopify/tests/test_connection.py
@@ -18,7 +18,6 @@ def setUpClass(cls):
@unittest.skip("Can't run these tests in CI")
def test_register_webhooks(self):
-
webhooks = connection.register_webhooks(
self.setting.shopify_url, self.setting.get_password("password")
)
@@ -30,7 +29,6 @@ def test_register_webhooks(self):
@unittest.skip("Can't run these tests in CI")
def test_unregister_webhooks(self):
-
connection.unregister_webhooks(self.setting.shopify_url, self.setting.get_password("password"))
callback_url = connection.get_callback_url()
diff --git a/ecommerce_integrations/shopify/tests/test_product.py b/ecommerce_integrations/shopify/tests/test_product.py
index 31758ad7a..78d04d240 100644
--- a/ecommerce_integrations/shopify/tests/test_product.py
+++ b/ecommerce_integrations/shopify/tests/test_product.py
@@ -165,7 +165,10 @@ def make_item(item_code=None, properties=None):
"item_name": item_code,
"description": item_code,
"item_group": "Products",
- "attributes": [{"attribute": "Test Sync Size"}, {"attribute": "Test Sync Colour"},],
+ "attributes": [
+ {"attribute": "Test Sync Size"},
+ {"attribute": "Test Sync Colour"},
+ ],
"has_variants": 1,
}
)
diff --git a/ecommerce_integrations/shopify/tests/utils.py b/ecommerce_integrations/shopify/tests/utils.py
index fd4f075ca..8cc246c7d 100644
--- a/ecommerce_integrations/shopify/tests/utils.py
+++ b/ecommerce_integrations/shopify/tests/utils.py
@@ -95,7 +95,7 @@ def setUp(self):
self.http.site = "https://frappetest.myshopify.com"
def load_fixture(self, name, format="json"):
- with open(os.path.dirname(__file__) + "/data/%s.%s" % (name, format), "rb") as f:
+ with open(os.path.dirname(__file__) + f"/data/{name}.{format}", "rb") as f:
return f.read()
def fake(self, endpoint, **kwargs):
@@ -106,9 +106,9 @@ def fake(self, endpoint, **kwargs):
if "extension" in kwargs and not kwargs["extension"]:
extension = ""
else:
- extension = ".%s" % (kwargs.pop("extension", "json"))
+ extension = ".{}".format(kwargs.pop("extension", "json"))
- url = "https://frappetest.myshopify.com%s/%s%s" % (prefix, endpoint, extension)
+ url = f"https://frappetest.myshopify.com{prefix}/{endpoint}{extension}"
try:
url = kwargs["url"]
except KeyError:
@@ -116,7 +116,7 @@ def fake(self, endpoint, **kwargs):
headers = {}
if kwargs.pop("has_user_agent", True):
- userAgent = "ShopifyPythonAPI/%s Python/%s" % (shopify.VERSION, sys.version.split(" ", 1)[0])
+ userAgent = "ShopifyPythonAPI/{} Python/{}".format(shopify.VERSION, sys.version.split(" ", 1)[0])
headers["User-agent"] = userAgent
try:
diff --git a/ecommerce_integrations/shopify/utils.py b/ecommerce_integrations/shopify/utils.py
index d1d55c00f..06bf1f582 100644
--- a/ecommerce_integrations/shopify/utils.py
+++ b/ecommerce_integrations/shopify/utils.py
@@ -1,6 +1,5 @@
# Copyright (c) 2021, Frappe and contributors
# For license information, please see LICENSE
-from typing import List
import frappe
from frappe import _, _dict
@@ -26,11 +25,15 @@ def migrate_from_old_connector(payload=None, request_id=None):
log = frappe.get_doc("Ecommerce Integration Log", request_id)
else:
log = create_shopify_log(
- status="Queued", method="ecommerce_integrations.shopify.utils.migrate_from_old_connector",
+ status="Queued",
+ method="ecommerce_integrations.shopify.utils.migrate_from_old_connector",
)
frappe.enqueue(
- method=_migrate_items_to_ecommerce_item, queue="long", is_async=True, log=log,
+ method=_migrate_items_to_ecommerce_item,
+ queue="long",
+ is_async=True,
+ log=log,
)
@@ -48,7 +51,6 @@ def ensure_old_connector_is_disabled():
def _migrate_items_to_ecommerce_item(log):
-
shopify_fields = ["shopify_product_id", "shopify_variant_id"]
for field in shopify_fields:
@@ -70,7 +72,7 @@ def _migrate_items_to_ecommerce_item(log):
log.save()
-def _get_items_to_migrate() -> List[_dict]:
+def _get_items_to_migrate() -> list[_dict]:
"""get all list of items that have shopify fields but do not have associated ecommerce item."""
old_data = frappe.db.sql(
@@ -84,7 +86,7 @@ def _get_items_to_migrate() -> List[_dict]:
return old_data or []
-def _create_ecommerce_items(items: List[_dict]) -> None:
+def _create_ecommerce_items(items: list[_dict]) -> None:
for item in items:
if not all((item.erpnext_item_code, item.shopify_product_id, item.shopify_variant_id)):
continue
diff --git a/ecommerce_integrations/tests/__init__.py b/ecommerce_integrations/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ecommerce_integrations/unicommerce/api_client.py b/ecommerce_integrations/unicommerce/api_client.py
index 1b3581eb1..770d38672 100644
--- a/ecommerce_integrations/unicommerce/api_client.py
+++ b/ecommerce_integrations/unicommerce/api_client.py
@@ -1,5 +1,5 @@
import base64
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
import frappe
import requests
@@ -10,7 +10,7 @@
from ecommerce_integrations.unicommerce.constants import SETTINGS_DOCTYPE
from ecommerce_integrations.unicommerce.utils import create_unicommerce_log
-JsonDict = Dict[str, Any]
+JsonDict = dict[str, Any]
class UnicommerceAPIClient:
@@ -20,7 +20,9 @@ class UnicommerceAPIClient:
"""
def __init__(
- self, url: Optional[str] = None, access_token: Optional[str] = None,
+ self,
+ url: str | None = None,
+ access_token: str | None = None,
):
self.settings = frappe.get_doc(SETTINGS_DOCTYPE)
self.base_url = url or f"https://{self.settings.unicommerce_site}"
@@ -39,13 +41,12 @@ def request(
self,
endpoint: str,
method: str = "POST",
- headers: Optional[JsonDict] = None,
- body: Optional[JsonDict] = None,
- params: Optional[JsonDict] = None,
- files: Optional[JsonDict] = None,
+ headers: JsonDict | None = None,
+ body: JsonDict | None = None,
+ params: JsonDict | None = None,
+ files: JsonDict | None = None,
log_error=True,
- ) -> Tuple[JsonDict, bool]:
-
+ ) -> tuple[JsonDict, bool]:
if headers is None:
headers = {}
@@ -83,7 +84,7 @@ def request(
return data, status
- def get_unicommerce_item(self, sku: str, log_error=True) -> Optional[JsonDict]:
+ def get_unicommerce_item(self, sku: str, log_error=True) -> JsonDict | None:
"""Get Unicommerce item data for specified SKU code.
ref: https://documentation.unicommerce.com/docs/itemtype-get.html
@@ -94,7 +95,7 @@ def get_unicommerce_item(self, sku: str, log_error=True) -> Optional[JsonDict]:
if status:
return item
- def create_update_item(self, item_dict: JsonDict, update=False) -> Tuple[JsonDict, bool]:
+ def create_update_item(self, item_dict: JsonDict, update=False) -> tuple[JsonDict, bool]:
"""Create/update item on unicommerce.
ref: https://documentation.unicommerce.com/docs/createoredit-itemtype.html
@@ -106,7 +107,7 @@ def create_update_item(self, item_dict: JsonDict, update=False) -> Tuple[JsonDic
endpoint = "/services/rest/v1/catalog/itemType/edit"
return self.request(endpoint=endpoint, body={"itemType": item_dict})
- def get_sales_order(self, order_code: str) -> Optional[JsonDict]:
+ def get_sales_order(self, order_code: str) -> JsonDict | None:
"""Get details for a sales order.
ref: https://documentation.unicommerce.com/docs/saleorder-get.html
@@ -120,13 +121,13 @@ def get_sales_order(self, order_code: str) -> Optional[JsonDict]:
def search_sales_order(
self,
- from_date: Optional[str] = None,
- to_date: Optional[str] = None,
- status: Optional[str] = None,
- channel: Optional[str] = None,
- facility_codes: Optional[List[str]] = None,
- updated_since: Optional[int] = None,
- ) -> Optional[List[JsonDict]]:
+ from_date: str | None = None,
+ to_date: str | None = None,
+ status: str | None = None,
+ channel: str | None = None,
+ facility_codes: list[str] | None = None,
+ updated_since: int | None = None,
+ ) -> list[JsonDict] | None:
"""Search sales order using specified parameters and return search results.
ref: https://documentation.unicommerce.com/docs/saleorder-search.html
@@ -143,16 +144,14 @@ def search_sales_order(
# remove None values.
body = {k: v for k, v in body.items() if v is not None}
- search_results, status = self.request(
- endpoint="/services/rest/v1/oms/saleOrder/search", body=body
- )
+ search_results, status = self.request(endpoint="/services/rest/v1/oms/saleOrder/search", body=body)
if status and "elements" in search_results:
return search_results["elements"]
def get_inventory_snapshot(
- self, sku_codes: List[str], facility_code: str, updated_since: int = 1430
- ) -> Optional[JsonDict]:
+ self, sku_codes: list[str], facility_code: str, updated_since: int = 1430
+ ) -> JsonDict | None:
"""Get current inventory snapshot.
ref: https://documentation.unicommerce.com/docs/inventory-snapshot.html
@@ -163,13 +162,15 @@ def get_inventory_snapshot(
body = {"itemTypeSKUs": sku_codes, "updatedSinceInMinutes": updated_since}
response, status = self.request(
- endpoint="/services/rest/v1/inventory/inventorySnapshot/get", headers=extra_headers, body=body,
+ endpoint="/services/rest/v1/inventory/inventorySnapshot/get",
+ headers=extra_headers,
+ body=body,
)
if status:
return response
- def bulk_inventory_update(self, facility_code: str, inventory_map: Dict[str, int]):
+ def bulk_inventory_update(self, facility_code: str, inventory_map: dict[str, int]):
"""Bulk update inventory on unicommerce using SKU and qty.
The qty should be "total" quantity.
@@ -219,8 +220,8 @@ def bulk_inventory_update(self, facility_code: str, inventory_map: Dict[str, int
return response, False
def create_sales_invoice(
- self, so_code: str, so_item_codes: List[str], facility_code: str
- ) -> Optional[JsonDict]:
+ self, so_code: str, so_item_codes: list[str], facility_code: str
+ ) -> JsonDict | None:
body = {"saleOrderCode": so_code, "saleOrderItemCodes": so_item_codes}
extra_headers = {"Facility": facility_code}
@@ -280,7 +281,7 @@ def create_invoice_and_label_by_shipping_code(
def get_sales_invoice(
self, shipping_package_code: str, facility_code: str, is_return: bool = False
- ) -> Optional[JsonDict]:
+ ) -> JsonDict | None:
"""Get invoice details
ref: https://documentation.unicommerce.com/docs/invoice-getdetails.html
@@ -329,10 +330,12 @@ def _positive(numbers):
extra_headers = {"Facility": facility_code}
return self.request(
- endpoint="/services/rest/v1/oms/shippingPackage/edit", body=body, headers=extra_headers,
+ endpoint="/services/rest/v1/oms/shippingPackage/edit",
+ body=body,
+ headers=extra_headers,
)
- def get_invoice_label(self, shipping_package_code: str, facility_code: str) -> Optional[str]:
+ def get_invoice_label(self, shipping_package_code: str, facility_code: str) -> str | None:
"""Get the generated label for a given shipping package.
ref: undocumented.
@@ -352,7 +355,7 @@ def create_and_close_shipping_manifest(
channel: str,
shipping_provider_code: str,
shipping_method_code: str,
- shipping_packages: List[str],
+ shipping_packages: list[str],
facility_code: str,
third_party_shipping: bool = True,
):
@@ -371,7 +374,9 @@ def create_and_close_shipping_manifest(
}
response, status = self.request(
- endpoint="/services/rest/v1/oms/shippingManifest/createclose", body=body, headers=extra_headers,
+ endpoint="/services/rest/v1/oms/shippingManifest/createclose",
+ body=body,
+ headers=extra_headers,
)
if status:
@@ -390,9 +395,9 @@ def get_shipping_manifest(self, shipping_manifest_code, facility_code):
def search_shipping_packages(
self,
facility_code: str,
- channel: Optional[str] = None,
- statuses: Optional[List[str]] = None,
- updated_since: Optional[int] = 6 * 60,
+ channel: str | None = None,
+ statuses: list[str] | None = None,
+ updated_since: int | None = 6 * 60,
):
"""Search shipping packages on unicommerce matching specified criterias.
@@ -408,14 +413,20 @@ def search_shipping_packages(
body = {k: v for k, v in body.items() if v is not None}
search_results, statuses = self.request(
- endpoint="/services/rest/v1/oms/shippingPackage/search", body=body, headers=extra_headers,
+ endpoint="/services/rest/v1/oms/shippingPackage/search",
+ body=body,
+ headers=extra_headers,
)
if statuses and "elements" in search_results:
return search_results["elements"]
def create_import_job(
- self, job_name: str, csv_filename: str, facility_code: str, job_type: str = "CREATE_NEW",
+ self,
+ job_name: str,
+ csv_filename: str,
+ facility_code: str,
+ job_type: str = "CREATE_NEW",
):
"""Create import job by specifying job name and CSV file
@@ -448,7 +459,7 @@ def create_import_job(
def _utc_timeformat(datetime) -> str:
- """ Get datetime in UTC/GMT as required by Unicommerce"""
+ """Get datetime in UTC/GMT as required by Unicommerce"""
return get_datetime(datetime).astimezone(timezone("UTC")).strftime("%Y-%m-%dT%H:%M:%SZ")
diff --git a/ecommerce_integrations/unicommerce/cancellation_and_returns.py b/ecommerce_integrations/unicommerce/cancellation_and_returns.py
index 264ea6406..fc2c8968f 100644
--- a/ecommerce_integrations/unicommerce/cancellation_and_returns.py
+++ b/ecommerce_integrations/unicommerce/cancellation_and_returns.py
@@ -1,7 +1,6 @@
import json
from collections import defaultdict
from datetime import date, datetime
-from typing import List
import frappe
from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
@@ -22,7 +21,7 @@
)
-def fully_cancel_orders(unicommerce_order_codes: List[str]) -> None:
+def fully_cancel_orders(unicommerce_order_codes: list[str]) -> None:
"""Perform "cancel" action on ERPNext sales orders which are fully cancelled in Unicommerce."""
current_orders_status = frappe.db.get_values(
@@ -90,9 +89,7 @@ def update_erpnext_order_items(so_data, so=None):
def _delete_cancelled_items(erpnext_items, cancelled_items):
- items = [
- d.as_dict() for d in erpnext_items if d.get(ORDER_ITEM_CODE_FIELD) not in cancelled_items
- ]
+ items = [d.as_dict() for d in erpnext_items if d.get(ORDER_ITEM_CODE_FIELD) not in cancelled_items]
# add `docname` same as name, required for Update Items functionality
for item in items:
@@ -104,7 +101,7 @@ def _serialize_items(trans_items) -> str:
# serialie date/datetime objects to string
for item in trans_items:
for k, v in item.items():
- if isinstance(v, (datetime, date)):
+ if isinstance(v, datetime | date):
item[k] = str(v)
return json.dumps(trans_items)
@@ -157,7 +154,7 @@ def create_credit_note(invoice_name):
for tax in credit_note.taxes:
tax.item_wise_tax_detail = json.loads(tax.item_wise_tax_detail)
- for item, tax_distribution in tax.item_wise_tax_detail.items():
+ for _item, tax_distribution in tax.item_wise_tax_detail.items():
tax_distribution[1] *= -1
tax.item_wise_tax_detail = json.dumps(tax.item_wise_tax_detail)
@@ -177,7 +174,6 @@ def check_and_update_customer_initiated_returns(orders, client: UnicommerceAPICl
def sync_customer_initiated_returns(so_data):
-
customer_returns = [r for r in so_data.get("returns", []) if r["type"] == "Customer Returned"]
if not customer_returns:
return
@@ -194,9 +190,7 @@ def create_cir_credit_note(so_data, return_data):
# Get items from SO which are returned, map SO item -> SI item with linked rows.
so_item_code_map = {item.get(ORDER_ITEM_CODE_FIELD): item.name for item in so.items}
- invoice_name = frappe.db.get_value(
- "Sales Invoice", {ORDER_CODE_FIELD: so_data["code"], "is_return": 0}
- )
+ invoice_name = frappe.db.get_value("Sales Invoice", {ORDER_CODE_FIELD: so_data["code"], "is_return": 0})
si = frappe.get_doc("Sales Invoice", invoice_name)
so_si_item_map = {item.so_detail: item.name for item in si.items}
@@ -215,7 +209,7 @@ def create_cir_credit_note(so_data, return_data):
credit_note.save()
-def _handle_partial_returns(credit_note, returned_items: List[str]) -> None:
+def _handle_partial_returns(credit_note, returned_items: list[str]) -> None:
"""Remove non-returned item from credit note and update taxes"""
item_code_to_qty_map = defaultdict(float)
@@ -223,9 +217,7 @@ def _handle_partial_returns(credit_note, returned_items: List[str]) -> None:
item_code_to_qty_map[item.item_code] += item.qty
# remove non-returned items
- credit_note.items = [
- item for item in credit_note.items if item.sales_invoice_item in returned_items
- ]
+ credit_note.items = [item for item in credit_note.items if item.sales_invoice_item in returned_items]
returned_qty_map = defaultdict(float)
for item in credit_note.items:
diff --git a/ecommerce_integrations/unicommerce/customer.py b/ecommerce_integrations/unicommerce/customer.py
index c1b5248ae..7cac4a309 100644
--- a/ecommerce_integrations/unicommerce/customer.py
+++ b/ecommerce_integrations/unicommerce/customer.py
@@ -1,5 +1,5 @@
import json
-from typing import Any, Dict, List
+from typing import Any
import frappe
from frappe import _
@@ -78,7 +78,7 @@ def _check_if_customer_exists(address, customer_code):
return frappe.get_doc("Customer", customer_name)
-def _create_customer_addresses(addresses: List[Dict[str, Any]], customer) -> None:
+def _create_customer_addresses(addresses: list[dict[str, Any]], customer) -> None:
"""Create address from dictionary containing fields used in Address doctype of ERPNext.
Unicommerce orders contain address list,
@@ -93,7 +93,6 @@ def _create_customer_addresses(addresses: List[Dict[str, Any]], customer) -> Non
def _create_customer_address(uni_address, address_type, customer, also_shipping=False):
-
country_code = uni_address.get("country")
country = UNICOMMERCE_COUNTRY_MAPPING.get(country_code)
diff --git a/ecommerce_integrations/unicommerce/delivery_note.py b/ecommerce_integrations/unicommerce/delivery_note.py
index c578f6ab7..0af339bd0 100644
--- a/ecommerce_integrations/unicommerce/delivery_note.py
+++ b/ecommerce_integrations/unicommerce/delivery_note.py
@@ -24,9 +24,7 @@ def prepare_delivery_note():
)
for facility in enabled_facilities:
- updated_packages = client.search_shipping_packages(
- updated_since=minutes, facility_code=facility
- )
+ updated_packages = client.search_shipping_packages(updated_since=minutes, facility_code=facility)
valid_packages = [p for p in updated_packages if p.get("channel") in enabled_channels]
if not valid_packages:
continue
@@ -48,52 +46,16 @@ def prepare_delivery_note():
def create_delivery_note(so, sales_invoice):
- try:
- # Create the delivery note
- from frappe.model.mapper import make_mapped_doc
-
- res = make_mapped_doc(
- method="erpnext.selling.doctype.sales_order.sales_order.make_delivery_note", source_name=so.name
- )
- res.update({"items": []})
- for item in sales_invoice.items:
- res.append(
- "items",
- {
- "item_code": item.item_code,
- "item_name": item.item_name,
- "description": item.description,
- "qty": item.qty,
- "uom": item.uom,
- "rate": item.rate,
- "amount": item.amount,
- "warehouse": item.warehouse,
- "against_sales_order": item.sales_order,
- "batch_no": item.batch_no,
- "so_detail": item.so_detail,
- },
- )
- for item in sales_invoice.taxes:
- res.append(
- "taxes",
- {
- "charge_type": item.charge_type,
- "account_head": item.account_head,
- "tax_amount": item.tax_amount,
- "description": item.description,
- "item_wise_tax_detail": item.item_wise_tax_detail,
- "dont_recompute_tax": item.dont_recompute_tax,
- },
- )
- res.unicommerce_order_code = sales_invoice.unicommerce_order_code
- res.unicommerce_shipment_id = sales_invoice.unicommerce_shipping_package_code
- res.save()
- res.submit()
- log = create_unicommerce_log(method="create_delevery_note", make_new=True)
- frappe.flags.request_id = log.name
- except Exception as e:
- create_unicommerce_log(status="Error", exception=e, rollback=True)
- else:
- create_unicommerce_log(status="Success")
- frappe.flags.request_id = None
- return res
+ # Create the delivery note
+ from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note
+
+ res = make_delivery_note(source_name=so.name)
+ res.unicommerce_order_code = sales_invoice.unicommerce_order_code
+ res.unicommerce_shipment_id = sales_invoice.unicommerce_shipping_package_code
+ res.save()
+ res.submit()
+ log = create_unicommerce_log(method="create_delevery_note", make_new=True)
+ frappe.flags.request_id = log.name
+ create_unicommerce_log(status="Success")
+ frappe.flags.request_id = None
+ return res
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_channel/unicommerce_channel.js b/ecommerce_integrations/unicommerce/doctype/unicommerce_channel/unicommerce_channel.js
index f2abcb83e..1812a30c7 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_channel/unicommerce_channel.js
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_channel/unicommerce_channel.js
@@ -16,14 +16,15 @@ frappe.ui.form.on("Unicommerce Channel", {
filters: { company: frm.doc.company, is_group: 0 },
}));
- ["warehouse", "return_warehouse"].forEach(wh_field => frm.set_query(wh_field, () => ({
- filters: {
- company: frm.doc.company,
- is_group: 0,
- disabled: 0,
- },
- })));
-
+ ["warehouse", "return_warehouse"].forEach((wh_field) =>
+ frm.set_query(wh_field, () => ({
+ filters: {
+ company: frm.doc.company,
+ is_group: 0,
+ disabled: 0,
+ },
+ }))
+ );
const tax_accounts = [
"igst_account",
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_package_type/unicommerce_package_type.js b/ecommerce_integrations/unicommerce/doctype/unicommerce_package_type/unicommerce_package_type.js
index cdfde5404..38bffe383 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_package_type/unicommerce_package_type.js
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_package_type/unicommerce_package_type.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe and contributors
// For license information, please see LICENSE
-frappe.ui.form.on('Unicommerce Package Type', {
+frappe.ui.form.on("Unicommerce Package Type", {
// refresh: function(frm) {
-
// }
});
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/test_unicommerce_settings.py b/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/test_unicommerce_settings.py
index d3fc0fc50..c8f7efe0c 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/test_unicommerce_settings.py
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/test_unicommerce_settings.py
@@ -44,9 +44,7 @@ def test_failed_auth(self):
"""requirement: When improper credentials are provided, system throws error."""
# failure case
- responses.add(
- responses.GET, "https://demostaging.unicommerce.com/oauth/token", json={}, status=401
- )
+ responses.add(responses.GET, "https://demostaging.unicommerce.com/oauth/token", json={}, status=401)
self.assertRaises(frappe.ValidationError, self.settings.update_tokens)
@responses.activate
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.js b/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.js
index 4f4344c32..09eb66f3b 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.js
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.js
@@ -8,7 +8,9 @@ frappe.ui.form.on("Unicommerce Settings", {
}
frm.add_custom_button(__("View Logs"), () => {
- frappe.set_route("List", "Ecommerce Integration Log", {"integration": "Unicommerce"});
+ frappe.set_route("List", "Ecommerce Integration Log", {
+ integration: "Unicommerce",
+ });
});
let sync_buttons = ["Items", "Orders", "Inventory"];
@@ -18,8 +20,7 @@ frappe.ui.form.on("Unicommerce Settings", {
action,
() => {
frappe.call({
- method:
- "ecommerce_integrations.unicommerce.utils.force_sync",
+ method: "ecommerce_integrations.unicommerce.utils.force_sync",
args: {
document: action,
},
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.py b/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.py
index cd5a46da5..02141d260 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.py
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_settings/unicommerce_settings.py
@@ -1,7 +1,6 @@
# Copyright (c) 2021, Frappe and contributors
# For license information, please see LICENSE
-from typing import Dict, List, Optional, Tuple
import frappe
import requests
@@ -143,18 +142,16 @@ def validate_warehouse_mapping(self):
_("Warehouse Mapping should be unique and one-to-one without repeating same warehouses.")
)
- def get_erpnext_warehouses(self, all_wh=False) -> List[ERPNextWarehouse]:
+ def get_erpnext_warehouses(self, all_wh=False) -> list[ERPNextWarehouse]:
"""Get list of configured ERPNext warehouses.
all_wh flag ignores enabled status.
"""
- return [
- wh_map.erpnext_warehouse for wh_map in self.warehouse_mapping if wh_map.enabled or all_wh
- ]
+ return [wh_map.erpnext_warehouse for wh_map in self.warehouse_mapping if wh_map.enabled or all_wh]
def get_erpnext_to_integration_wh_mapping(
self, all_wh=False
- ) -> Dict[ERPNextWarehouse, IntegrationWarehouse]:
+ ) -> dict[ERPNextWarehouse, IntegrationWarehouse]:
"""Get enabled mapping from ERPNextWarehouse to Unicommerce facility.
all_wh flag ignores enabled status."""
@@ -166,7 +163,7 @@ def get_erpnext_to_integration_wh_mapping(
def get_integration_to_erpnext_wh_mapping(
self, all_wh=False
- ) -> Dict[IntegrationWarehouse, ERPNextWarehouse]:
+ ) -> dict[IntegrationWarehouse, ERPNextWarehouse]:
"""Get enabled mapping from Unicommerce facility to ERPNext warehouse.
all_wh flag ignores enabled status."""
@@ -174,8 +171,8 @@ def get_integration_to_erpnext_wh_mapping(
return {v: k for k, v in reverse_map.items()}
- def get_company_addresses(self, facility_code: str) -> Tuple[Optional[str], Optional[str]]:
- """ Get mapped company billing and shipping addresses."""
+ def get_company_addresses(self, facility_code: str) -> tuple[str | None, str | None]:
+ """Get mapped company billing and shipping addresses."""
for wh_map in self.warehouse_mapping:
if wh_map.unicommerce_facility_code == facility_code:
return wh_map.company_address, wh_map.dispatch_address
@@ -183,7 +180,6 @@ def get_company_addresses(self, facility_code: str) -> Tuple[Optional[str], Opti
def setup_custom_fields(update=True):
-
custom_sections = {
"Sales Order": [
dict(
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.js b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.js
index b7b4025e2..276e0f18f 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.js
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.js
@@ -9,8 +9,7 @@ frappe.ui.form.on("Unicommerce Shipment Manifest", {
__("Open on Unicommerce"),
function () {
frappe.call({
- method:
- "ecommerce_integrations.unicommerce.utils.get_unicommerce_document_url",
+ method: "ecommerce_integrations.unicommerce.utils.get_unicommerce_document_url",
args: {
code: frm.doc.unicommerce_manifest_code,
doctype: frm.doc.doctype,
@@ -44,8 +43,7 @@ frappe.ui.form.on("Unicommerce Shipment Manifest", {
return;
}
erpnext.utils.map_current_doc({
- method:
- "ecommerce_integrations.unicommerce.doctype.unicommerce_shipment_manifest.unicommerce_shipment_manifest.get_shipping_package_list",
+ method: "ecommerce_integrations.unicommerce.doctype.unicommerce_shipment_manifest.unicommerce_shipment_manifest.get_shipping_package_list",
source_doctype: "Sales Invoice",
target: frm.doc,
setters: [
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.py b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.py
index 7dc3e9df6..28df32182 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.py
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipment_manifest/unicommerce_shipment_manifest.py
@@ -80,7 +80,7 @@ def get_facility_code(self) -> str:
",".join(facility_codes)
)
)
- return list(facility_codes)[0]
+ return next(iter(facility_codes))
def create_and_close_manifest_on_unicommerce(self):
shipping_packages = [d.shipping_package_code for d in self.manifest_items]
@@ -152,9 +152,7 @@ def get_sales_invoice_details(sales_invoice):
as_dict=True,
)
- items = frappe.db.get_values(
- "Sales Invoice Item", {"parent": sales_invoice}, "item_name", as_dict=True
- )
+ items = frappe.db.get_values("Sales Invoice Item", {"parent": sales_invoice}, "item_name", as_dict=True)
unique_items = {item.item_name for item in items}
si_data["item_list"] = ",".join(unique_items)
@@ -163,9 +161,7 @@ def get_sales_invoice_details(sales_invoice):
@frappe.whitelist()
-def search_packages(
- search_term: str, channel: Optional[str] = None, shipper: Optional[str] = None
-):
+def search_packages(search_term: str, channel: str | None = None, shipper: str | None = None):
filters = {
CHANNEL_ID_FIELD: channel,
SHIPPING_PROVIDER_CODE: shipper,
@@ -181,9 +177,7 @@ def search_packages(
INVOICE_CODE_FIELD: search_term,
}
- packages = frappe.get_list(
- "Sales Invoice", filters=filters, or_filters=or_filters, limit_page_length=1
- )
+ packages = frappe.get_list("Sales Invoice", filters=filters, or_filters=or_filters, limit_page_length=1)
if packages:
return packages[0].name
@@ -191,7 +185,6 @@ def search_packages(
@frappe.whitelist()
def get_shipping_package_list(source_name, target_doc=None):
-
if target_doc and isinstance(target_doc, str):
target_doc = json.loads(target_doc)
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_method/unicommerce_shipping_method.js b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_method/unicommerce_shipping_method.js
index 1f42ce32a..c34adc310 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_method/unicommerce_shipping_method.js
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_method/unicommerce_shipping_method.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe and contributors
// For license information, please see LICENSE
-frappe.ui.form.on('Unicommerce Shipping Method', {
+frappe.ui.form.on("Unicommerce Shipping Method", {
// refresh: function(frm) {
-
// }
});
diff --git a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_provider/unicommerce_shipping_provider.js b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_provider/unicommerce_shipping_provider.js
index 293c53352..21bb2858e 100644
--- a/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_provider/unicommerce_shipping_provider.js
+++ b/ecommerce_integrations/unicommerce/doctype/unicommerce_shipping_provider/unicommerce_shipping_provider.js
@@ -1,8 +1,7 @@
// Copyright (c) 2021, Frappe and contributors
// For license information, please see LICENSE
-frappe.ui.form.on('Unicommerce Shipping Provider', {
+frappe.ui.form.on("Unicommerce Shipping Provider", {
// refresh: function(frm) {
-
// }
});
diff --git a/ecommerce_integrations/unicommerce/grn.py b/ecommerce_integrations/unicommerce/grn.py
index a28db7c46..0baa7b0aa 100644
--- a/ecommerce_integrations/unicommerce/grn.py
+++ b/ecommerce_integrations/unicommerce/grn.py
@@ -1,5 +1,4 @@
from dataclasses import dataclass
-from typing import List
import frappe
from erpnext.stock.doctype.batch.batch import Batch
@@ -95,7 +94,7 @@ def get_facility_code(stock_entry, unicommerce_settings) -> str:
_("{} only supports one target warehouse (unicommerce facility)").format(GRN_STOCK_ENTRY_TYPE)
)
- warehouse = list(target_warehouses)[0]
+ warehouse = next(iter(target_warehouses))
warehouse_mapping = unicommerce_settings.get_erpnext_to_integration_wh_mapping(all_wh=True)
facility = warehouse_mapping.get(warehouse)
@@ -130,9 +129,7 @@ def upload_grn(doc, method=None):
msg += _("Confirm the status on Import Log in Uniware.")
frappe.msgprint(msg, title="Success")
elif response.successful and errors:
- frappe.msgprint(
- "Partial success, unicommerce reported errors:{}".format("
".join(errors)) - ) + frappe.msgprint("Partial success, unicommerce reported errors:
{}".format("
".join(errors))) def _prepare_grn_import_csv(stock_entry) -> str: @@ -190,8 +187,7 @@ def _prepare_grn_import_csv(stock_entry) -> str: return file.file_name -def _get_csv_content(rows: List[GRNItemRow]) -> bytes: - +def _get_csv_content(rows: list[GRNItemRow]) -> bytes: writer = UnicodeWriter() for row in rows: @@ -208,7 +204,7 @@ def _get_unicommerce_format_date(date) -> str: def create_auto_grn_import(csv_filename: str, facility_code: str, client=None): - """ Create new import job for Auto GRN items""" + """Create new import job for Auto GRN items""" if client is None: client = UnicommerceAPIClient() resp = client.create_import_job( diff --git a/ecommerce_integrations/unicommerce/inventory.py b/ecommerce_integrations/unicommerce/inventory.py index 704c2c014..d8f6961de 100644 --- a/ecommerce_integrations/unicommerce/inventory.py +++ b/ecommerce_integrations/unicommerce/inventory.py @@ -1,5 +1,4 @@ from collections import defaultdict -from typing import Dict import frappe from frappe.utils import cint, now @@ -32,9 +31,7 @@ def update_inventory_on_unicommerce(client=None, force=False): return # check if need to run based on configured sync frequency - if not force and not need_to_run( - SETTINGS_DOCTYPE, "inventory_sync_frequency", "last_inventory_sync" - ): + if not force and not need_to_run(SETTINGS_DOCTYPE, "inventory_sync_frequency", "last_inventory_sync"): return # get configured warehouses @@ -45,7 +42,7 @@ def update_inventory_on_unicommerce(client=None, force=False): client = UnicommerceAPIClient() # track which ecommerce item was updated successfully - success_map: Dict[str, bool] = defaultdict(lambda: True) + success_map: dict[str, bool] = defaultdict(lambda: True) inventory_synced_on = now() for warehouse in warehouses: @@ -82,7 +79,7 @@ def update_inventory_on_unicommerce(client=None, force=False): _update_inventory_sync_status(success_map, inventory_synced_on) -def _update_inventory_sync_status(ecom_item_success_map: Dict[str, bool], timestamp: str) -> None: +def _update_inventory_sync_status(ecom_item_success_map: dict[str, bool], timestamp: str) -> None: for ecom_item, status in ecom_item_success_map.items(): if status: update_inventory_sync_status(ecom_item, timestamp) diff --git a/ecommerce_integrations/unicommerce/invoice.py b/ecommerce_integrations/unicommerce/invoice.py index 8f99a520f..3ae3d8f3e 100644 --- a/ecommerce_integrations/unicommerce/invoice.py +++ b/ecommerce_integrations/unicommerce/invoice.py @@ -1,7 +1,7 @@ import base64 import json from collections import defaultdict -from typing import Any, Dict, List, NewType, Optional +from typing import Any, NewType import frappe import requests @@ -34,7 +34,7 @@ remove_non_alphanumeric_chars, ) -JsonDict = Dict[str, Any] +JsonDict = dict[str, Any] SOCode = NewType("SOCode", str) # TypedDict @@ -42,17 +42,17 @@ # item_code: str # warehouse: str # batch_no: str -ItemWHAlloc = Dict[str, str] +ItemWHAlloc = dict[str, str] -WHAllocation = Dict[SOCode, List[ItemWHAlloc]] +WHAllocation = dict[SOCode, list[ItemWHAlloc]] INVOICED_STATE = ["PACKED", "READY_TO_SHIP", "DISPATCHED", "MANIFESTED", "SHIPPED", "DELIVERED"] @frappe.whitelist() def generate_unicommerce_invoices( - sales_orders: List[SOCode], warehouse_allocation: Optional[WHAllocation] = None + sales_orders: list[SOCode], warehouse_allocation: WHAllocation | None = None ): """Request generation of invoice to Unicommerce and sync that invoice. @@ -126,8 +126,8 @@ def generate_unicommerce_invoices( def bulk_generate_invoices( - sales_orders: List[SOCode], - warehouse_allocation: Optional[WHAllocation] = None, + sales_orders: list[SOCode], + warehouse_allocation: WHAllocation | None = None, request_id=None, client=None, ): @@ -153,7 +153,6 @@ def bulk_generate_invoices( def _log_invoice_generation(sales_orders, failed_orders): - failed_orders = set(failed_orders) failed_orders.update(_get_orders_with_missing_invoice(sales_orders)) successful_orders = list(set(sales_orders) - set(failed_orders)) @@ -187,7 +186,7 @@ def _get_orders_with_missing_invoice(sales_orders): return missing_invoices -def update_invoicing_status(sales_orders: List[str], status: str) -> None: +def update_invoicing_status(sales_orders: list[str], status: str) -> None: if not sales_orders: return @@ -236,9 +235,7 @@ def _validate_wh_allocation(warehouse_allocation: WHAllocation): frappe.throw(msg) -def _generate_invoice( - client: UnicommerceAPIClient, erpnext_order, channel_config, warehouse_allocation=None -): +def _generate_invoice(client: UnicommerceAPIClient, erpnext_order, channel_config, warehouse_allocation=None): unicommerce_so_code = erpnext_order.get(ORDER_CODE_FIELD) so_data = client.get_sales_order(unicommerce_so_code) @@ -286,16 +283,12 @@ def _fetch_and_sync_invoice( """ so_data = client.get_sales_order(unicommerce_so_code) - shipping_packages = [ - d["code"] for d in so_data["shippingPackages"] if d["status"] in INVOICED_STATE - ] + shipping_packages = [d["code"] for d in so_data["shippingPackages"] if d["status"] in INVOICED_STATE] for package in shipping_packages: invoice_response = invoice_responses.get(package) or {} invoice_data = client.get_sales_invoice(package, facility_code)["invoice"] - label_pdf = fetch_label_pdf( - package, invoice_response, client=client, facility_code=facility_code - ) + label_pdf = fetch_label_pdf(package, invoice_response, client=client, facility_code=facility_code) create_sales_invoice( invoice_data, erpnext_so_code, @@ -315,7 +308,7 @@ def create_sales_invoice( shipping_label=None, warehouse_allocations=None, invoice_response=None, - so_data: Optional[JsonDict] = None, + so_data: JsonDict | None = None, ): """Create ERPNext Sales Invcoice using Unicommerce sales invoice data and related Sales order. @@ -351,9 +344,7 @@ def create_sales_invoice( shipping_package_code = si_data.get("shippingPackageCode") shipping_package_info = _get_shipping_package(so_data, shipping_package_code) or {} - tracking_no = invoice_response.get("trackingNumber") or shipping_package_info.get( - "trackingNumber" - ) + tracking_no = invoice_response.get("trackingNumber") or shipping_package_info.get("trackingNumber") shipping_provider_code = ( invoice_response.get("shippingProviderCode") or shipping_package_info.get("shippingProvider") @@ -412,10 +403,10 @@ def create_sales_invoice( def attach_unicommerce_docs( sales_invoice: str, - invoice: Optional[str], - label: Optional[str], - invoice_code: Optional[str], - package_code: Optional[str], + invoice: str | None, + label: str | None, + invoice_code: str | None, + package_code: str | None, ) -> None: """Attach invoice and label to specified sales invoice. @@ -452,9 +443,9 @@ def _get_line_items( warehouse: str, so_code: str, cost_center: str, - warehouse_allocations: Optional[WHAllocation] = None, -) -> List[Dict[str, Any]]: - """ Invoice items can be different and are consolidated, hence recomputing is required """ + warehouse_allocations: WHAllocation | None = None, +) -> list[dict[str, Any]]: + """Invoice items can be different and are consolidated, hence recomputing is required""" si_items = [] for item in line_items: @@ -481,15 +472,12 @@ def _get_line_items( return si_items -def _assign_wh_and_so_row(line_items, warehouse_allocation: List[ItemWHAlloc], so_code: str): - +def _assign_wh_and_so_row(line_items, warehouse_allocation: list[ItemWHAlloc], so_code: str): so_items = frappe.get_doc("Sales Order", so_code).items so_item_price_map = {d.name: d.rate for d in so_items} # remove cancelled items - warehouse_allocation = [ - d for d in warehouse_allocation if d["sales_order_row"] in so_item_price_map - ] + warehouse_allocation = [d for d in warehouse_allocation if d["sales_order_row"] in so_item_price_map] # update price for item in warehouse_allocation: @@ -501,7 +489,7 @@ def _assign_wh_and_so_row(line_items, warehouse_allocation: List[ItemWHAlloc], s line_items.sort(key=sort_key) # update references - for item, wh_alloc in zip(line_items, warehouse_allocation): + for item, wh_alloc in zip(line_items, warehouse_allocation, strict=False): item["so_detail"] = wh_alloc["sales_order_row"] item["warehouse"] = wh_alloc["warehouse"] item["batch_no"] = wh_alloc.get("batch_no") @@ -510,7 +498,7 @@ def _assign_wh_and_so_row(line_items, warehouse_allocation: List[ItemWHAlloc], s def _verify_total(si, si_data) -> None: - """ Leave a comment if grand total does not match unicommerce total""" + """Leave a comment if grand total does not match unicommerce total""" if abs(si.grand_total - flt(si_data["total"])) > 0.5: si.add_comment(text=f"Invoice totals mismatch: Unicommerce reported total of {si_data['total']}") @@ -541,7 +529,6 @@ def make_payment_entry(invoice, channel_config, invoice_posting_date=None): def fetch_label_pdf(package, invoicing_response, client, facility_code): - if invoicing_response and invoicing_response.get("shippingLabelLink"): link = invoicing_response.get("shippingLabelLink") return fetch_pdf_as_base64(link) diff --git a/ecommerce_integrations/unicommerce/order.py b/ecommerce_integrations/unicommerce/order.py index 6b1ea741b..7c78608b1 100644 --- a/ecommerce_integrations/unicommerce/order.py +++ b/ecommerce_integrations/unicommerce/order.py @@ -1,6 +1,7 @@ import json from collections import defaultdict, namedtuple -from typing import Any, Dict, Iterator, List, NewType, Optional, Set, Tuple +from collections.abc import Iterator +from typing import Any, NewType import frappe from frappe.utils import add_to_date, flt @@ -29,7 +30,7 @@ from ecommerce_integrations.unicommerce.utils import create_unicommerce_log, get_unicommerce_date from ecommerce_integrations.utils.taxation import get_dummy_tax_category -UnicommerceOrder = NewType("UnicommerceOrder", Dict[str, Any]) +UnicommerceOrder = NewType("UnicommerceOrder", dict[str, Any]) def sync_new_orders(client: UnicommerceAPIClient = None, force=False): @@ -61,10 +62,7 @@ def sync_new_orders(client: UnicommerceAPIClient = None, force=False): _create_sales_invoices(order, sales_order, client) -def _get_new_orders( - client: UnicommerceAPIClient, status: Optional[str] -) -> Optional[Iterator[UnicommerceOrder]]: - +def _get_new_orders(client: UnicommerceAPIClient, status: str | None) -> Iterator[UnicommerceOrder] | None: """Search new sales order from unicommerce.""" updated_since = 24 * 60 # minutes @@ -124,8 +122,7 @@ def _create_sales_invoices(unicommerce_order, sales_order, client: UnicommerceAP frappe.flags.request_id = None -def create_order(payload: UnicommerceOrder, request_id: Optional[str] = None, client=None) -> None: - +def create_order(payload: UnicommerceOrder, request_id: str | None = None, client=None) -> None: order = payload existing_so = frappe.db.get_value("Sales Order", {ORDER_CODE_FIELD: order["code"]}) @@ -158,7 +155,7 @@ def create_order(payload: UnicommerceOrder, request_id: Optional[str] = None, cl return order -def _sync_order_items(order: UnicommerceOrder, client: UnicommerceAPIClient) -> Set[str]: +def _sync_order_items(order: UnicommerceOrder, client: UnicommerceAPIClient) -> set[str]: """Ensure all items are synced before processing order. If not synced then product sync for specific item is initiated""" @@ -174,7 +171,6 @@ def _sync_order_items(order: UnicommerceOrder, client: UnicommerceAPIClient) -> def _create_order(order: UnicommerceOrder, customer) -> None: - channel_config = frappe.get_doc("Unicommerce Channel", order["channel"]) settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) @@ -219,9 +215,8 @@ def _create_order(order: UnicommerceOrder, customer) -> None: def _get_line_items( - line_items, default_warehouse: Optional[str] = None, is_cancelled: bool = False -) -> List[Dict[str, Any]]: - + line_items, default_warehouse: str | None = None, is_cancelled: bool = False +) -> list[dict[str, Any]]: settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) wh_map = settings.get_integration_to_erpnext_wh_mapping(all_wh=True) so_items = [] @@ -249,7 +244,7 @@ def _get_line_items( return so_items -def get_taxes(line_items, channel_config) -> List: +def get_taxes(line_items, channel_config) -> list: taxes = [] # Note: Tax details are NOT available during SO stage. @@ -301,7 +296,7 @@ def _get_facility_code(line_items) -> str: if len(facility_codes) > 1: frappe.throw("Multiple facility codes found in single order") - return list(facility_codes)[0] + return next(iter(facility_codes)) def update_shipping_info(doc, method=None): @@ -330,9 +325,7 @@ def _update_package_info_on_unicommerce(so_code): shipping_packages = updated_so_data.get("shippingPackages") if not shipping_packages: - frappe.throw( - frappe._("Shipping package not present on Unicommerce for order {}").format(so.name) - ) + frappe.throw(frappe._("Shipping package not present on Unicommerce for order {}").format(so.name)) shipping_package_code = shipping_packages[0].get("code") @@ -356,7 +349,7 @@ def _update_package_info_on_unicommerce(so_code): raise -def _get_batch_no(so_line_item) -> Optional[str]: +def _get_batch_no(so_line_item) -> str | None: """If specified vendor batch code is valid batch number in ERPNext then get batch no. SO line items contain batch no detail like this: @@ -374,9 +367,7 @@ def _get_batch_no(so_line_item) -> Optional[str]: } }, """ - batch_no = ((so_line_item.get("batchDTO") or {}).get("batchFieldsDTO") or {}).get( - "vendorBatchNumber" - ) + batch_no = ((so_line_item.get("batchDTO") or {}).get("batchFieldsDTO") or {}).get("vendorBatchNumber") if batch_no and frappe.db.exists("Batch", batch_no): return batch_no diff --git a/ecommerce_integrations/unicommerce/pick_list.py b/ecommerce_integrations/unicommerce/pick_list.py index 7a8833470..c5334fc75 100644 --- a/ecommerce_integrations/unicommerce/pick_list.py +++ b/ecommerce_integrations/unicommerce/pick_list.py @@ -21,7 +21,9 @@ def validate(self, method=None): if pl.picked_qty > pl.qty: pl.picked_qty = pl.qty - frappe.throw(_("Row {0} Picked Qty cannot be more than Sales Order Qty").format(pl.idx)) + frappe.throw( + _("Row {0} Picked Qty cannot be more than Sales Order Qty").format(pl.idx) + ) if pl.picked_qty == 0 and pl.docstatus == 1: frappe.throw( _("You have not picked {0} in row {1} . Pick the item to proceed!").format( diff --git a/ecommerce_integrations/unicommerce/product.py b/ecommerce_integrations/unicommerce/product.py index 553bc9e38..26c62c16f 100644 --- a/ecommerce_integrations/unicommerce/product.py +++ b/ecommerce_integrations/unicommerce/product.py @@ -1,4 +1,4 @@ -from typing import List, NewType +from typing import NewType import frappe from frappe import _ @@ -91,7 +91,6 @@ def _create_item_dict(uni_item): _validate_create_brand(uni_item.get("brand")) for uni_field, erpnext_field in UNI_TO_ERPNEXT_ITEM_MAPPING.items(): - value = uni_item.get(uni_field) if not _validate_field(erpnext_field, value): continue @@ -218,7 +217,7 @@ def upload_new_items(force=False) -> None: log.save() -def _get_new_items() -> List[ItemCode]: +def _get_new_items() -> list[ItemCode]: new_items = frappe.db.sql( f""" SELECT item.item_code @@ -234,8 +233,8 @@ def _get_new_items() -> List[ItemCode]: def upload_items_to_unicommerce( - item_codes: List[ItemCode], client: UnicommerceAPIClient = None -) -> List[ItemCode]: + item_codes: list[ItemCode], client: UnicommerceAPIClient = None +) -> list[ItemCode]: """Upload multiple items to Unicommerce. Return Successfully synced item codes. @@ -284,9 +283,7 @@ def _build_unicommerce_item(item_code: ItemCode) -> JsonDict: elif barcode.barcode_type == "UPC-A": item_json["upc"] = barcode.barcode - item_json["categoryCode"] = frappe.db.get_value( - "Item Group", item.item_group, PRODUCT_CATEGORY_FIELD - ) + item_json["categoryCode"] = frappe.db.get_value("Item Group", item.item_group, PRODUCT_CATEGORY_FIELD) # append site prefix to image url item_json["imageUrl"] = get_url(item.image) item_json["maxRetailPrice"] = item.standard_rate @@ -338,6 +335,4 @@ def validate_item(doc, method=None): item_group = frappe.get_cached_doc("Item Group", item.item_group) if not item_group.get(PRODUCT_CATEGORY_FIELD): - frappe.throw( - _("Unicommerce Product category required in Item Group: {}").format(item_group.name) - ) + frappe.throw(_("Unicommerce Product category required in Item Group: {}").format(item_group.name)) diff --git a/ecommerce_integrations/unicommerce/status_updater.py b/ecommerce_integrations/unicommerce/status_updater.py index fdd85dd61..c81d79666 100644 --- a/ecommerce_integrations/unicommerce/status_updater.py +++ b/ecommerce_integrations/unicommerce/status_updater.py @@ -47,7 +47,6 @@ def update_sales_order_status(): - settings = frappe.get_cached_doc(SETTINGS_DOCTYPE) if not settings.is_enabled(): return @@ -58,9 +57,7 @@ def update_sales_order_status(): minutes = days_to_sync * 24 * 60 updated_orders = client.search_sales_order(updated_since=minutes) - enabled_channels = frappe.db.get_list( - "Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id" - ) + enabled_channels = frappe.db.get_list("Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id") valid_orders = [order for order in updated_orders if order.get("channel") in enabled_channels] if valid_orders: _update_order_status_fields(valid_orders) @@ -79,7 +76,6 @@ def update_sales_order_status(): def _update_order_status_fields(orders): - order_status_map = {d["code"]: d["status"] for d in orders} order_codes = list(order_status_map.keys()) @@ -121,9 +117,7 @@ def update_shipping_package_status(): # find all Facilities enabled_facilities = list(settings.get_integration_to_erpnext_wh_mapping().keys()) - enabled_channels = frappe.db.get_list( - "Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id" - ) + enabled_channels = frappe.db.get_list("Unicommerce Channel", filters={"enabled": 1}, pluck="channel_id") for facility in enabled_facilities: updated_packages = client.search_shipping_packages(updated_since=minutes, facility_code=facility) @@ -140,7 +134,6 @@ def update_shipping_package_status(): def _update_package_status_fields(packages): - package_status_map = {d["code"]: d["status"] for d in packages} package_codes = list(package_status_map.keys()) diff --git a/ecommerce_integrations/unicommerce/tests/test_client.py b/ecommerce_integrations/unicommerce/tests/test_client.py index 50f6c5f34..ee667c2ac 100644 --- a/ecommerce_integrations/unicommerce/tests/test_client.py +++ b/ecommerce_integrations/unicommerce/tests/test_client.py @@ -131,7 +131,6 @@ def test_create_update_item(self): self.assertTrue(response["successful"]) def test_bulk_inventory_sync(self): - expected_body = { "inventoryAdjustments": [ { @@ -289,9 +288,7 @@ def test_update_shipping_package(self): ], ) - self.client.update_shipping_package( - "SP_CODE", "TEST", "DEFAULT", length=100, width=200, height=300 - ) + self.client.update_shipping_package("SP_CODE", "TEST", "DEFAULT", length=100, width=200, height=300) self.assert_last_request_headers("Facility", "TEST") def test_get_invoice_label(self): @@ -323,7 +320,9 @@ def test_bulk_import(self): responses.POST, "https://demostaging.unicommerce.com/services/rest/v1/data/import/job/create", status=200, - match=[query_param_matcher({"name": "Auto GRN Items", "importOption": "CREATE_NEW"}),], + match=[ + query_param_matcher({"name": "Auto GRN Items", "importOption": "CREATE_NEW"}), + ], json={"successful": True}, ) diff --git a/ecommerce_integrations/unicommerce/tests/test_inventory.py b/ecommerce_integrations/unicommerce/tests/test_inventory.py index b931c9f35..0dba3751d 100644 --- a/ecommerce_integrations/unicommerce/tests/test_inventory.py +++ b/ecommerce_integrations/unicommerce/tests/test_inventory.py @@ -93,7 +93,6 @@ def test_inventory_sync(self): def make_ecommerce_item(item_code): - if ecommerce_item.is_synced(MODULE_NAME, item_code): return diff --git a/ecommerce_integrations/unicommerce/tests/test_invoice.py b/ecommerce_integrations/unicommerce/tests/test_invoice.py index ac80d9fa0..b551aec2f 100644 --- a/ecommerce_integrations/unicommerce/tests/test_invoice.py +++ b/ecommerce_integrations/unicommerce/tests/test_invoice.py @@ -55,9 +55,7 @@ def test_create_invoice(self): attachments = frappe.get_all( "File", fields=["name", "file_name"], filters={"attached_to_name": si.name} ) - self.assertGreaterEqual( - len(attachments), 2, msg=f"Expected 2 attachments, found: {str(attachments)}" - ) + self.assertGreaterEqual(len(attachments), 2, msg=f"Expected 2 attachments, found: {attachments!s}") def test_end_to_end_invoice_generation(self): """Full invoice generation test with mocked responses.""" @@ -113,6 +111,4 @@ def test_end_to_end_invoice_generation(self): attachments = frappe.get_all( "File", fields=["name", "file_name"], filters={"attached_to_name": si.name} ) - self.assertGreaterEqual( - len(attachments), 2, msg=f"Expected 2 attachments, found: {str(attachments)}" - ) + self.assertGreaterEqual(len(attachments), 2, msg=f"Expected 2 attachments, found: {attachments!s}") diff --git a/ecommerce_integrations/unicommerce/tests/test_order.py b/ecommerce_integrations/unicommerce/tests/test_order.py index 20b3071fd..aea4c1665 100644 --- a/ecommerce_integrations/unicommerce/tests/test_order.py +++ b/ecommerce_integrations/unicommerce/tests/test_order.py @@ -26,9 +26,15 @@ def setUpClass(cls): def test_validate_item_list(self): order_files = ["order-SO5905", "order-SO5906", "order-SO5907"] - items_list = [{"MC-100", "TITANIUM_WATCH"}, {"MC-100",}, {"MC-100", "TITANIUM_WATCH"}] - - for order_file, items in zip(order_files, items_list): + items_list = [ + {"MC-100", "TITANIUM_WATCH"}, + { + "MC-100", + }, + {"MC-100", "TITANIUM_WATCH"}, + ] + + for order_file, items in zip(order_files, items_list, strict=False): order = self.load_fixture(order_file)["saleOrderDTO"] self.assertEqual(items, _sync_order_items(order, client=self.client)) diff --git a/ecommerce_integrations/unicommerce/tests/test_product.py b/ecommerce_integrations/unicommerce/tests/test_product.py index 96c72e5b5..2b45839a4 100644 --- a/ecommerce_integrations/unicommerce/tests/test_product.py +++ b/ecommerce_integrations/unicommerce/tests/test_product.py @@ -28,9 +28,7 @@ def test_import_missing_item_raises_error(self): json=self.load_fixture("missing_item"), match=[responses.json_params_matcher({"skuCode": "MISSING"})], ) - self.assertRaises( - frappe.ValidationError, import_product_from_unicommerce, "MISSING", self.client - ) + self.assertRaises(frappe.ValidationError, import_product_from_unicommerce, "MISSING", self.client) log = frappe.get_last_doc("Ecommerce Integration Log", filters={"integration": "unicommerce"}) self.assertTrue("Failed to import" in log.message, "Logging for missing item not working") diff --git a/ecommerce_integrations/unicommerce/tests/test_status.py b/ecommerce_integrations/unicommerce/tests/test_status.py index 6d61564c5..8cdc6581c 100644 --- a/ecommerce_integrations/unicommerce/tests/test_status.py +++ b/ecommerce_integrations/unicommerce/tests/test_status.py @@ -15,7 +15,6 @@ def test_serialization(self): _serialize_items([si_item.as_dict()]) def test_delete_cancelled_items(self): - item1 = frappe.new_doc("Sales Order Item").update({ORDER_ITEM_CODE_FIELD: "cancelled"}) item2 = frappe.new_doc("Sales Order Item").update({ORDER_ITEM_CODE_FIELD: "not cancelled"}) diff --git a/ecommerce_integrations/unicommerce/tests/utils.py b/ecommerce_integrations/unicommerce/tests/utils.py index 3c0e06880..d779c5365 100644 --- a/ecommerce_integrations/unicommerce/tests/utils.py +++ b/ecommerce_integrations/unicommerce/tests/utils.py @@ -2,6 +2,7 @@ import json import os import unittest +from typing import ClassVar import frappe @@ -12,7 +13,7 @@ class TestCase(unittest.TestCase): - config = { + config: ClassVar = { "is_enabled": 1, "enable_inventory_sync": 1, "use_stock_entry_for_grn": 1, diff --git a/ecommerce_integrations/unicommerce/utils.py b/ecommerce_integrations/unicommerce/utils.py index 966c53eea..cd4d699a6 100644 --- a/ecommerce_integrations/unicommerce/utils.py +++ b/ecommerce_integrations/unicommerce/utils.py @@ -48,7 +48,7 @@ def force_sync(document) -> None: def get_unicommerce_date(timestamp: int) -> datetime.date: - """ Convert unicommerce ms timestamp to datetime.""" + """Convert unicommerce ms timestamp to datetime.""" return datetime.date.fromtimestamp(timestamp // 1000) diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js b/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js index 6177800ea..10e6614f4 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_category/zenoti_category.js @@ -1,8 +1,7 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see license.txt -frappe.ui.form.on('Zenoti Category', { +frappe.ui.form.on("Zenoti Category", { // refresh: function(frm) { - // } }); diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js b/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js index 09f21a475..e38403f9b 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_center/zenoti_center.js @@ -1,145 +1,187 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see license.txt -frappe.ui.form.on('Zenoti Center', { +frappe.ui.form.on("Zenoti Center", { refresh(frm) { - frm.add_custom_button('Employees', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Employees", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); - - frm.add_custom_button('Customers', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Customers", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); + frm.add_custom_button( + __("Employees"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Employees", + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); - frm.add_custom_button('Items', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Items", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); + frm.add_custom_button( + __("Customers"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Customers", + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); - frm.add_custom_button('Categories', function() { - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Categories", - }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - }, 'Sync'); + frm.add_custom_button( + __("Items"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Items", + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); - frm.add_custom_button('Sales Invoice', function() { - let d = new frappe.ui.Dialog({ - title: __('Sync Sales Invoice'), - fields: [ - { - "label" : "From Date", - "fieldname": "start_date", - "fieldtype": "Date", - "reqd": 1 + frm.add_custom_button( + __("Categories"), + function () { + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Categories", }, - { - "label" : "To Date", - "fieldname": "end_date", - "fieldtype": "Date", - "reqd": 1 - } - ], - primary_action: function() { - let data = d.get_values(); - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Sales Invoice", - start_date: data.start_date, - end_date: data.end_date + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + }, + __("Sync") + ); + + frm.add_custom_button( + __("Sales Invoice"), + function () { + let d = new frappe.ui.Dialog({ + title: __("Sync Sales Invoice"), + fields: [ + { + label: "From Date", + fieldname: "start_date", + fieldtype: "Date", + reqd: 1, }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - d.hide(); - }, - primary_action_label: __('Sync Sales Invoice') - }); - d.show(); - }, 'Sync'); + { + label: "To Date", + fieldname: "end_date", + fieldtype: "Date", + reqd: 1, + }, + ], + primary_action: function () { + let data = d.get_values(); + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Sales Invoice", + start_date: data.start_date, + end_date: data.end_date, + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + d.hide(); + }, + primary_action_label: __("Sync Sales Invoice"), + }); + d.show(); + }, + __("Sync") + ); - frm.add_custom_button('Stock Reconciliation', function() { - let d = new frappe.ui.Dialog({ - title: __('Sync Stock Reconciliation'), - fields: [ - { - "label" : "Date", - "fieldname": "date", - "fieldtype": "Date", - "reqd": 1 - } - ], - primary_action: function() { - let data = d.get_values(); - frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", - args:{ - center: frm.doc.name, - record_type: "Stock Reconciliation", - start_date: data.date + frm.add_custom_button( + __("Stock Reconciliation"), + function () { + let d = new frappe.ui.Dialog({ + title: __("Sync Stock Reconciliation"), + fields: [ + { + label: "Date", + fieldname: "date", + fieldtype: "Date", + reqd: 1, }, - callback: function(r){ - frappe.show_alert({message:__("Syncing"), indicator:'orange'}); - } - }) - d.hide(); - }, - primary_action_label: __('Sync Stock Reconciliation') - }); - d.show(); - }, 'Sync'); + ], + primary_action: function () { + let data = d.get_values(); + frappe.call({ + method: "ecommerce_integrations.zenoti.doctype.zenoti_center.zenoti_center.sync", + args: { + center: frm.doc.name, + record_type: "Stock Reconciliation", + start_date: data.date, + }, + callback: function (r) { + frappe.show_alert({ + message: __("Syncing"), + indicator: "orange", + }); + }, + }); + d.hide(); + }, + primary_action_label: __("Sync Stock Reconciliation"), + }); + d.show(); + }, + __("Sync") + ); }, setup(frm) { - frm.set_query("erpnext_cost_center", function() { + frm.set_query("erpnext_cost_center", function () { return { filters: { is_group: 0, - } - } + }, + }; }); - frm.set_query("erpnext_warehouse", function() { + frm.set_query("erpnext_warehouse", function () { return { filters: { is_group: 0, - } - } + }, + }; }); - } + }, }); diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js b/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js index 466346963..931c347a4 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_error_logs/zenoti_error_logs.js @@ -1,8 +1,7 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see LICENSE -frappe.ui.form.on('Zenoti Error Logs', { +frappe.ui.form.on("Zenoti Error Logs", { // refresh: function(frm) { - // } }); diff --git a/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js b/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js index 1a69aa61c..0d8c3fc26 100644 --- a/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js +++ b/ecommerce_integrations/zenoti/doctype/zenoti_settings/zenoti_settings.js @@ -1,65 +1,67 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see LICENSE -frappe.ui.form.on('Zenoti Settings', { - setup: function(frm){ - frm.set_query("liability_income_account_for_gift_and_prepaid_cards", function() { - if (!frm.doc.company) { - frappe.throw(__("Please select company first")) - } - return { - filters: { - root_type: "Liability", - is_group: 0, - account_type: "Income Account", - company: frm.doc.company +frappe.ui.form.on("Zenoti Settings", { + setup: function (frm) { + frm.set_query( + "liability_income_account_for_gift_and_prepaid_cards", + function () { + if (!frm.doc.company) { + frappe.throw(__("Please select company first")); } + return { + filters: { + root_type: "Liability", + is_group: 0, + account_type: "Income Account", + company: frm.doc.company, + }, + }; } - }); + ); - frm.set_query("default_purchase_warehouse", function() { + frm.set_query("default_purchase_warehouse", function () { if (!frm.doc.company) { - frappe.throw(__("Please select company first")) + frappe.throw(__("Please select company first")); } return { filters: { is_group: 0, - company: frm.doc.company - } + company: frm.doc.company, + }, }; }); - frm.set_query("default_buying_price_list", function() { + frm.set_query("default_buying_price_list", function () { return { filters: { buying: 1, - } - } + }, + }; }); - frm.set_query("default_selling_price_list", function() { + frm.set_query("default_selling_price_list", function () { return { filters: { selling: 1, - } - } + }, + }; }); }, refresh(frm) { - if(cint(frm.doc.enable_zenoti)) { - frm.add_custom_button('Update Centers', function() { + if (cint(frm.doc.enable_zenoti)) { + frm.add_custom_button(__("Update Centers"), function () { frappe.call({ - method:"ecommerce_integrations.zenoti.doctype.zenoti_settings.zenoti_settings.update_centers", + method: "ecommerce_integrations.zenoti.doctype.zenoti_settings.zenoti_settings.update_centers", freeze: true, - freeze_message: "Updating Centers...", - callback: function(r){ + freeze_message: __("Updating Centers..."), + callback: function (r) { if (!r.exc) { - frappe.show_alert(__("Centers Updated")) + frappe.show_alert(__("Centers Updated")); } - } - }) - d.hide(); + }, + }); }); } - } + }, }); diff --git a/ecommerce_integrations/zenoti/purchase_transactions.py b/ecommerce_integrations/zenoti/purchase_transactions.py index e49840c8e..c4a66e0e0 100644 --- a/ecommerce_integrations/zenoti/purchase_transactions.py +++ b/ecommerce_integrations/zenoti/purchase_transactions.py @@ -28,9 +28,7 @@ def get_list_of_purchase_orders_for_center(center, date=None): start_date = add_to_date(end_date, days=-1) route = "inventory/purchase_orders?center_id=" url_end = "&show_delivery_details=true&date_criteria=1&status=-1" - full_url = ( - api_url + route + center + "&start_date=" + start_date + "&end_date=" + end_date + url_end - ) + full_url = api_url + route + center + "&start_date=" + start_date + "&end_date=" + end_date + url_end all_orders = make_api_call(full_url) return all_orders @@ -208,7 +206,9 @@ def add_items(doc, item_data): invoice_item[key] = value if key == "item_code": item_code = frappe.db.get_value( - "Item", {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, "item_code" + "Item", + {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, + "item_code", ) invoice_item["item_code"] = item_code diff --git a/ecommerce_integrations/zenoti/sales_transactions.py b/ecommerce_integrations/zenoti/sales_transactions.py index 5fe131b1e..a1ae3cf6d 100644 --- a/ecommerce_integrations/zenoti/sales_transactions.py +++ b/ecommerce_integrations/zenoti/sales_transactions.py @@ -250,9 +250,7 @@ def process_sales_line_items(invoice, cost_center, center): if len(item_err_msg_list): item_err_msg = "\n".join(err for err in item_err_msg_list) err_msg_list.append(item_err_msg) - emp_err_msg = check_for_employee( - line_item["employee"]["name"], line_item["employee"]["code"], center - ) + emp_err_msg = check_for_employee(line_item["employee"]["name"], line_item["employee"]["code"], center) if emp_err_msg: err_msg_list.append(emp_err_msg) sold_by = frappe.db.get_value( @@ -449,9 +447,7 @@ def make_invoice(invoice_details): doc.posting_time = invoice_details["posting_time"] doc.due_date = invoice_details["posting_date"] doc.cost_center = invoice_details["cost_center"] - doc.selling_price_list = frappe.db.get_single_value( - "Zenoti Settings", "default_selling_price_list" - ) + doc.selling_price_list = frappe.db.get_single_value("Zenoti Settings", "default_selling_price_list") doc.set_warehouse = invoice_details["set_warehouse"] doc.update_stock = 1 doc.rounding_adjustment = invoice_details["rounding_adjustment"] diff --git a/ecommerce_integrations/zenoti/stock_reconciliation.py b/ecommerce_integrations/zenoti/stock_reconciliation.py index 249374f71..2f9e1ddef 100644 --- a/ecommerce_integrations/zenoti/stock_reconciliation.py +++ b/ecommerce_integrations/zenoti/stock_reconciliation.py @@ -10,9 +10,7 @@ def process_stock_reconciliation(center, error_logs, date=None): if not date: date = now() list_for_entry = [] - stock_quantities_of_products_in_a_center = retrieve_stock_quantities_of_products( - center.name, date - ) + stock_quantities_of_products_in_a_center = retrieve_stock_quantities_of_products(center.name, date) if stock_quantities_of_products_in_a_center: cost_center = center.get("erpnext_cost_center") if not cost_center: @@ -31,7 +29,7 @@ def process_stock_reconciliation(center, error_logs, date=None): def retrieve_stock_quantities_of_products(center, date): - url = api_url + "inventory/stock?center_id={0}&inventory_date={1}".format(center, date) + url = api_url + f"inventory/stock?center_id={center}&inventory_date={date}" stock_quantities_of_products = make_api_call(url) return stock_quantities_of_products @@ -81,7 +79,9 @@ def add_items_to_reconcile(doc, list_for_entry): invoice_item[key] = value if key == "item_code": item_code = frappe.db.get_value( - "Item", {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, "item_code" + "Item", + {"zenoti_item_code": item["item_code"], "item_name": item["item_name"]}, + "item_code", ) invoice_item["item_code"] = item_code doc.append("items", invoice_item) diff --git a/ecommerce_integrations/zenoti/utils.py b/ecommerce_integrations/zenoti/utils.py index 16b696927..3d7682ee4 100644 --- a/ecommerce_integrations/zenoti/utils.py +++ b/ecommerce_integrations/zenoti/utils.py @@ -80,9 +80,7 @@ def check_for_item(list_of_items, item_group, center=None): def make_item(item, item_group, center=None): item_details, center = get_item_details(item, item_group, center) if not item_details: - err_msg = _("Details for Item {0} does not exist in Zenoti").format( - frappe.bold(item["item_name"]) - ) + err_msg = _("Details for Item {0} does not exist in Zenoti").format(frappe.bold(item["item_name"])) return err_msg create_item(item, item_details, item_group, center) @@ -276,7 +274,7 @@ def get_state(country_id, state_id): if list_of_states_of_the_country: for states in list_of_states_of_the_country["states"]: if states["id"] == state_id: - state == states + state = states return state diff --git a/pyproject.toml b/pyproject.toml index c11448c3f..deac6bb67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,14 +20,39 @@ file = "./LICENSE" requires = ["flit_core >=3.4,<4"] build-backend = "flit_core.buildapi" -[tool.black] -line-length = 99 +[tool.ruff] +line-length = 110 +target-version = "py310" -[tool.isort] -line_length = 99 -multi_line_output = 3 -include_trailing_comma = true -force_grid_wrap = 0 -use_parentheses = true -ensure_newline_before_comments = true -indent = " " +[tool.ruff.lint] +select = [ + "F", + "E", + "W", + "I", + "UP", + "B", + "RUF", +] +ignore = [ + "B017", # assertRaises(Exception) - should be more specific + "B018", # useless expression, not assigned to anything + "B023", # function doesn't bind loop variable - will have last iteration's value + "B904", # raise inside except without from + "E101", # indentation contains mixed spaces and tabs + "E402", # module level import not at top of file + "E501", # line too long + "E741", # ambiguous variable name + "F401", # "unused" imports + "F403", # can't detect undefined names from * import + "F405", # can't detect undefined names from * import + "F722", # syntax error in forward type annotation + "W191", # indentation contains tabs + "RUF001", # string contains ambiguous unicode character +] +typing-modules = ["frappe.types.DF"] + +[tool.ruff.format] +quote-style = "double" +indent-style = "tab" +docstring-code-format = true