oneCInteraction 1.2.0__tar.gz → 1.2.1__tar.gz

{onecinteraction-1.2.0/src/oneCInteraction.egg-info → onecinteraction-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.2.0
+Version: 1.2.1
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3

{onecinteraction-1.2.0 → onecinteraction-1.2.1}/src/oneCInteraction/__init__.py

@@ -8,7 +8,8 @@ from .structures import (
     Category,
     Customer,
     OrderItem,
-    Order
+    Order,
+    DiscountGroup
 )
 
 __all__ = [
@@ -21,5 +22,6 @@ __all__ = [
     'Category',
     'Customer',
     'OrderItem',
-    'Order'
+    'Order',
+    'DiscountGroup'
 ]

{onecinteraction-1.2.0 → onecinteraction-1.2.1}/src/oneCInteraction/connection.py

@@ -8,6 +8,7 @@ from .orders import OrdersManager
 from .characteristics import CharacteristicsManager
 from .categories import CategoriesManager
 from .customers import CustomersManager
+from .discounts import DiscountsManager
 
 
 class Connection:
@@ -39,6 +40,7 @@ class Connection:
         self.characteristics = CharacteristicsManager(self)
         self.categories = CategoriesManager(self)
         self.customers = CustomersManager(self)
+        self.discounts = DiscountsManager(self)
 
     def initiate_connection(self) -> None:
         """Establishes COM connection to 1C and caches price type references."""

onecinteraction-1.2.1/src/oneCInteraction/discounts.py

@@ -0,0 +1,103 @@
+from datetime import datetime
+from .log import log_sys
+from . import structures
+
+class DiscountsManager:
+    def __init__(self, c_connectionIn):
+        self.c_connection = c_connectionIn
+
+    @property
+    def c_v8(self):
+        return self.c_connection.c_v8
+
+    def get_active_groups(self) -> list:
+        """Retrieves and groups all active nomenclature discounts into DiscountGroup structures."""
+        if not self.c_v8:
+            log_sys("Failed to get active discount groups: No connection to 1C.", 1)
+            return []
+
+        try:
+            log_sys("Fetching active nomenclature discounts from 1C...")
+            query = self.c_v8.NewObject("Query")
+            query.Text = """
+                SELECT
+                    Скидки.Регистратор.Номер КАК DocNumber,
+                    ISNULL(Скидки.Регистратор.ТипСкидкиНаценки.Наименование, "Знижка") КАК DiscountName,
+                    ISNULL(Скидки.Регистратор.ТипСкидкиНаценки.Код, "") КАК DiscountTypeCode,
+                    Скидки.ПроцентСкидкиНаценки КАК DiscountPercent,
+                    Скидки.Номенклатура КАК ProductRef,
+                    Скидки.Номенклатура.Код КАК ProductCode,
+                    Скидки.Номенклатура.Наименование КАК ProductName,
+                    ISNULL(Скидки.ХарактеристикаНоменклатуры.Наименование, "") AS CharName,
+                    ISNULL(Скидки.Регистратор.Комментарий, "") AS DocComment
+                FROM
+                    РегистрСведений.СкидкиНаценкиНоменклатуры.СрезПоследних(&CurrentDate, ) КАК Скидки
+                WHERE
+                    Скидки.ПроцентСкидкиНаценки > 0
+            """
+            
+            c_currDate = datetime.now(self.c_connection.tz_kiev).replace(tzinfo=None)
+            query.SetParameter("CurrentDate", c_currDate)
+
+            c_result = query.Execute()
+            if c_result is None or c_result.IsEmpty():
+                log_sys("No active discounts found in register.")
+                return []
+
+            # Group the results by (DocNumber, DiscountTypeCode, DiscountPercent)
+            d_groups = {} # {(doc_num, type_code, percent): {"name": str, "comment": str, "items": list}}
+
+            c_selection = c_result.Select()
+            while c_selection.Next():
+                s_doc_number = self.c_v8.String(c_selection.DocNumber)
+                s_type_code = self.c_v8.String(c_selection.DiscountTypeCode)
+                n_percent = float(c_selection.DiscountPercent)
+                s_name = self.c_v8.String(c_selection.DiscountName)
+                s_comment = self.c_v8.String(c_selection.DocComment)
+
+                s_product_code = self.c_v8.String(c_selection.ProductCode)
+                s_product_name = self.c_v8.String(c_selection.ProductName)
+                s_char_name = self.c_v8.String(c_selection.CharName)
+                s_product_uuid = self.c_v8.String(c_selection.ProductRef.UUID())
+
+                key = (s_doc_number, s_type_code, n_percent)
+                if key not in d_groups:
+                    d_groups[key] = {
+                        "name": s_name,
+                        "comment": s_comment,
+                        "items": []
+                    }
+
+                d_groups[key]["items"].append({
+                    "code": s_product_code,
+                    "name": s_product_name,
+                    "uuid": s_product_uuid,
+                    "char_name": s_char_name if s_char_name else None
+                })
+
+            # Convert dictionary groups into structures.DiscountGroup objects
+            l_discount_groups = []
+            type_counters = {}
+            for (s_doc_number, s_type_code, n_percent), d_group_data in d_groups.items():
+                s_comment = d_group_data["comment"].strip()
+                if s_comment:
+                    s_display_name = s_comment
+                else:
+                    s_type_name = d_group_data["name"]
+                    type_counters[s_type_code] = type_counters.get(s_type_code, 0) + 1
+                    s_display_name = f"{s_type_name} {type_counters[s_type_code]}"
+
+                l_discount_groups.append(structures.DiscountGroup(
+                    s_nameIn=s_display_name,
+                    s_document_numberIn=s_doc_number,
+                    s_discount_type_codeIn=s_type_code,
+                    n_discount_percentIn=n_percent,
+                    l_nomenclaturesIn=d_group_data["items"]
+                ))
+
+            log_sys(f"Successfully retrieved {len(l_discount_groups)} active discount groups.")
+            return l_discount_groups
+
+        except Exception as e:
+            log_sys(f"Error in DiscountsManager.get_active_groups: {e}", 1)
+            return []

{onecinteraction-1.2.0 → onecinteraction-1.2.1}/src/oneCInteraction/structures.py

@@ -134,3 +134,19 @@ class Order:
         self.s_price_type = s_price_typeIn
         self.s_comment = s_commentIn
 
+
+class DiscountGroup:
+    def __init__(
+        self,
+        s_nameIn: str,
+        s_document_numberIn: str,
+        s_discount_type_codeIn: str,
+        n_discount_percentIn: float,
+        l_nomenclaturesIn: list
+    ):
+        self.s_name = s_nameIn
+        self.s_document_number = s_document_numberIn
+        self.s_discount_type_code = s_discount_type_codeIn
+        self.n_discount_percent = float(n_discount_percentIn)
+        self.l_nomenclatures = l_nomenclaturesIn
+

{onecinteraction-1.2.0 → onecinteraction-1.2.1/src/oneCInteraction.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.2.0
+Version: 1.2.1
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3

{onecinteraction-1.2.0 → onecinteraction-1.2.1}/src/oneCInteraction.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/oneCInteraction/categories.py
 src/oneCInteraction/characteristics.py
 src/oneCInteraction/connection.py
 src/oneCInteraction/customers.py
+src/oneCInteraction/discounts.py
 src/oneCInteraction/groups.py
 src/oneCInteraction/log.py
 src/oneCInteraction/nomenclature.py

{onecinteraction-1.2.0 → onecinteraction-1.2.1}/src/oneCInteraction.egg-info/scm_file_list.json

@@ -7,6 +7,7 @@
     "src/oneCInteraction/groups.py",
     "src/oneCInteraction/__init__.py",
     "src/oneCInteraction/orders.py",
+    "src/oneCInteraction/discounts.py",
     "src/oneCInteraction/structures.py",
     "src/oneCInteraction/log.py",
     "src/oneCInteraction/customers.py",

onecinteraction-1.2.1/src/oneCInteraction.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.2.1",
+  "distance": 0,
+  "node": "g091321de2f563ed05b75c38b33a5e1982999ef72",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-11"
+}

{onecinteraction-1.2.0 → onecinteraction-1.2.1}/tests/test_lib.py

@@ -10,7 +10,7 @@ if hasattr(sys.stdout, 'reconfigure'):
 
 try:
     from datetime import datetime
-    from oneCInteraction import Connection, Customer, Order, OrderItem, Nomenclature, Variety, Price, Characteristic, Group, Category
+    from oneCInteraction import Connection, Customer, Order, OrderItem, Nomenclature, Variety, Price, Characteristic, Group, Category, DiscountGroup
     from oneCInteraction.log import log_sys, LOGS_DIR
     
     print("Success: Imported Connection and all structures successfully from oneCInteraction!")
@@ -86,6 +86,21 @@ try:
     c_cat = Category(s_categoryNameIn="Shoes", l_nomenclaturesIn=[c_nom])
     print("Success: Category instantiated.")
     
+    # Test DiscountGroup instantiation
+    c_dg = DiscountGroup(
+        s_nameIn="Гуртова акція",
+        s_document_numberIn="DOC001",
+        s_discount_type_codeIn="B2B",
+        n_discount_percentIn=10.0,
+        l_nomenclaturesIn=[{"code": "ART001", "name": "Product 1", "uuid": "uuid1", "char_name": None}]
+    )
+    assert c_dg.s_name == "Гуртова акція"
+    assert c_dg.s_document_number == "DOC001"
+    assert c_dg.s_discount_type_code == "B2B"
+    assert c_dg.n_discount_percent == 10.0
+    assert len(c_dg.l_nomenclatures) == 1
+    print("Success: DiscountGroup instantiated.")
+    
     c_conn = Connection(s_oneCDatabasePathIn="test_db", s_usernameIn="admin", s_passwordIn="pass")
     print("Success: Connection class instantiated.")
     
@@ -95,7 +110,13 @@ try:
     assert c_conn.characteristics is not None
     assert c_conn.categories is not None
     assert c_conn.customers is not None
+    assert c_conn.discounts is not None
     print("Success: Checked all composition managers exist.")
+    
+    # Test DiscountsManager when connection is not active
+    discounts_res = c_conn.discounts.get_active_groups()
+    assert isinstance(discounts_res, list) and len(discounts_res) == 0, f"Expected empty list since connection is not active, got {discounts_res}"
+    print("Success: DiscountsManager.get_active_groups tested with no active connection.")
 
     # Test CustomersManager when connection is not active
     cust_res = c_conn.customers.get("CUST001")

onecinteraction-1.2.0/src/oneCInteraction.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.2.0",
-  "distance": 0,
-  "node": "g65e5ae7065d28fefdf225dbf3dfa54f65bfe84a0",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-07-08"
-}