oneCInteraction 1.3.2__tar.gz → 1.3.4__tar.gz

{onecinteraction-1.3.2/src/oneCInteraction.egg-info → onecinteraction-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.3.2
+Version: 1.3.4
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3
@@ -68,7 +68,6 @@ def __init__(self, s_oneCDatabasePathIn: str, s_usernameIn: str, s_passwordIn: s
 
 #### Key Attributes:
 - `s_warehouse_code` (str): 1C warehouse code for new orders.
-- `s_counteragent_code` (str): 1C counteragent (customer) code for new orders.
 - `s_organisation_code` (str): 1C organization code for new orders.
 - `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая", "Закупочная"]`).
 - `c_v8`: The active 1C COM connection object (equals `None` if not connected).
@@ -239,8 +238,8 @@ Defined in [orders.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
   - Returns the number of the created document in 1C (or an empty string on error).
 - `get(s_codeIn: str) -> Order | None`
   Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID, and the price type is retrieved.
-- `get_today() -> list`
-  Returns a list of all today's orders created for the configured bot counteragent (filtered by current date and counteragent code).
+- `get_by_date(target_date: date | datetime, s_counteragent_code: str = "") -> list`
+  Returns a list of all orders for a specific date (accepting `datetime.date` or `datetime.datetime`), optionally filtered by counteragent or counteragent group code.
 - `update_info(c_orderObjIn: Order) -> bool`
   Updates the comment field of the order in 1C. Writes a formatted string to the comment field:
   `"[Full Name] [Phone] [Telegram ID] [Waybill/TTN] [Status]"`
@@ -312,7 +311,6 @@ c_conn = Connection(
 
 # 2. Configure 1C Default Codes
 c_conn.s_warehouse_code = "000000001"  # Warehouse code
-c_conn.s_counteragent_code = "000000045"  # Bot customer/counteragent code
 c_conn.s_organisation_code = "000000001"  # Organization code
 
 # 3. Establish connection to 1C

{onecinteraction-1.3.2 → onecinteraction-1.3.4}/README.md

@@ -53,7 +53,6 @@ def __init__(self, s_oneCDatabasePathIn: str, s_usernameIn: str, s_passwordIn: s
 
 #### Key Attributes:
 - `s_warehouse_code` (str): 1C warehouse code for new orders.
-- `s_counteragent_code` (str): 1C counteragent (customer) code for new orders.
 - `s_organisation_code` (str): 1C organization code for new orders.
 - `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая", "Закупочная"]`).
 - `c_v8`: The active 1C COM connection object (equals `None` if not connected).
@@ -224,8 +223,8 @@ Defined in [orders.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
   - Returns the number of the created document in 1C (or an empty string on error).
 - `get(s_codeIn: str) -> Order | None`
   Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID, and the price type is retrieved.
-- `get_today() -> list`
-  Returns a list of all today's orders created for the configured bot counteragent (filtered by current date and counteragent code).
+- `get_by_date(target_date: date | datetime, s_counteragent_code: str = "") -> list`
+  Returns a list of all orders for a specific date (accepting `datetime.date` or `datetime.datetime`), optionally filtered by counteragent or counteragent group code.
 - `update_info(c_orderObjIn: Order) -> bool`
   Updates the comment field of the order in 1C. Writes a formatted string to the comment field:
   `"[Full Name] [Phone] [Telegram ID] [Waybill/TTN] [Status]"`
@@ -297,7 +296,6 @@ c_conn = Connection(
 
 # 2. Configure 1C Default Codes
 c_conn.s_warehouse_code = "000000001"  # Warehouse code
-c_conn.s_counteragent_code = "000000045"  # Bot customer/counteragent code
 c_conn.s_organisation_code = "000000001"  # Organization code
 
 # 3. Establish connection to 1C

{onecinteraction-1.3.2 → onecinteraction-1.3.4}/src/oneCInteraction/connection.py

@@ -30,7 +30,6 @@ class Connection:
         
         # Save codes to self for order creation
         self.s_warehouse_code = ""
-        self.s_counteragent_code = ""
         self.s_organisation_code = ""
         self.sl_price_types = ["Розничная", "Оптовая", "Закупочная"]
 

{onecinteraction-1.3.2 → onecinteraction-1.3.4}/src/oneCInteraction/orders.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, date
 from .log import log_sys
 from . import structures
 
@@ -13,12 +13,12 @@ class OrdersManager:
     def push(self, c_orderObjIn) -> str:
         """Pushes a new customer order to 1C database, returning the created order number or empty string."""
         if not self.c_v8:
-            log_sys("Failed to push order: No connection to 1C. Returning None", 1)
-            return None
+            log_sys("Failed to push order: No connection to 1C. Returning \"\"", 1)
+            return ""
             
-        if not self.c_connection.s_warehouse_code or not self.c_connection.s_counteragent_code or not self.c_connection.s_organisation_code:
-            log_sys("Failed to push order: No warehouse code and/or counteragent code and/or organisation code. Returning None", 1)
-            return None
+        if not self.c_connection.s_warehouse_code or not self.c_connection.s_organisation_code:
+            log_sys("Failed to push order: No warehouse code and/or organisation code. Returning \"\"", 1)
+            return ""
 
         try:
             c_newOrder = self.c_v8.Documents.ЗаказПокупателя.CreateDocument()
@@ -50,7 +50,6 @@ class OrdersManager:
             # Client / Counteragent
             c_clientRef = None
             c_customer = getattr(c_orderObjIn, "c_orderCustomer", None)
-            b_isBotCounteragent = False
             
             if c_customer:
                 log_sys("Customer structure found in order. Trying to resolve counteragent in 1C...")
@@ -73,20 +72,11 @@ class OrdersManager:
                                 c_clientRef = c_ref
                                 log_sys("New customer created and resolved.")
                 except Exception as e:
-                    log_sys(f"Failed to resolve customer: {e}. Falling back to bot counteragent...", 1)
+                    log_sys(f"Failed to resolve customer: {e}.", 1)
             
-            # Fallback to Bot Counteragent if customer resolution failed or customer wasn't provided
             if not c_clientRef or c_clientRef.IsEmpty():
-                b_isBotCounteragent = True
-                log_sys(f"Falling back to bot counteragent with code: {self.c_connection.s_counteragent_code}")
-                try:
-                    c_clientRef = self.c_v8.Catalogs.Контрагенты.FindByCode(self.c_connection.s_counteragent_code)
-                    if c_clientRef.IsEmpty():
-                        log_sys(f"Can't find bot contragent by code: {self.c_connection.s_counteragent_code}. Returning \"\"", 1)
-                        return ""
-                except Exception as e:
-                    log_sys(f"Failed to resolve bot contragent: {e}. Returning \"\"", 1)
-                    return ""
+                log_sys("Customer reference is empty or not resolved in 1C. Returning \"\"", 1)
+                return ""
 
             try:
                 c_newOrder.Контрагент = c_clientRef
@@ -397,54 +387,70 @@ class OrdersManager:
             log_sys(f"Error occurred while retrieving order {s_codeIn}: {e}", 1)
             return None
 
-    def get_today(self) -> list:
-        """Retrieves all orders created today for the configured counteragent bot."""
+    def get_by_date(self, target_date, s_counteragent_code: str = "") -> list:
+        """Retrieves all orders for a specific date (date or datetime object), optionally filtered by counteragent or counteragent group code."""
         if not self.c_v8:
-            log_sys("Failed to get today's orders: No connection to 1C.", 1)
+            log_sys("Failed to get orders by date: No connection to 1C.", 1)
             return []
 
-        if len(self.c_connection.s_counteragent_code) < 1:
-            log_sys("Failed to get today's orders: No counteragent code. Returning []", 1)
-            return []
-            
         try:
-            log_sys("Fetching today's orders for bot counteragent...")
-            c_clientRef = self.c_v8.Catalogs.Контрагенты.FindByCode(self.c_connection.s_counteragent_code)
-
-            if c_clientRef is None or c_clientRef.IsEmpty():
-                log_sys(f"Counteragent with code {self.c_connection.s_counteragent_code} not found in 1C.", 1)
+            log_sys(f"Fetching orders for date {target_date}...")
+            
+            if isinstance(target_date, datetime):
+                dt_obj = target_date
+            elif isinstance(target_date, date):
+                dt_obj = datetime.combine(target_date, datetime.min.time())
+            elif hasattr(target_date, "year") and hasattr(target_date, "month") and hasattr(target_date, "day"):
+                dt_obj = datetime(target_date.year, target_date.month, target_date.day)
+            else:
+                log_sys(f"Invalid date format passed to get_by_date: {target_date}. Returning []", 1)
                 return []
 
-            c_startOfToday = self.c_v8.НачалоДня(self.c_v8.ТекущаяДата())
+            if dt_obj.tzinfo is not None:
+                dt_obj = dt_obj.astimezone(self.c_connection.tz_kiev).replace(tzinfo=None)
+
+            c_startDate = dt_obj.replace(hour=0, minute=0, second=0, microsecond=0)
+            c_endDate = dt_obj.replace(hour=23, minute=59, second=59, microsecond=0)
+
             c_query = self.c_v8.NewObject("Query")
-            c_query.Text = """
+            
+            s_query_text = """
                 SELECT Номер AS Number
                 FROM Документ.ЗаказПокупателя
-                WHERE Дата >= &StartDate
-                  AND Контрагент = &ClientBot
+                WHERE Дата >= &StartDate AND Дата <= &EndDate
                   AND ПометкаУдаления = FALSE
-                ORDER BY Дата DESC
             """
-            c_query.SetParameter("StartDate", c_startOfToday)
-            c_query.SetParameter("ClientBot", c_clientRef)
+
+            if s_counteragent_code:
+                c_clientRef = self.c_v8.Catalogs.Контрагенты.FindByCode(s_counteragent_code)
+                if c_clientRef is None or c_clientRef.IsEmpty():
+                    log_sys(f"Counteragent with code '{s_counteragent_code}' not found in 1C. Returning []", 1)
+                    return []
+                s_query_text += "\n  AND Контрагент В ИЕРАРХИИ(&ClientRef)"
+                c_query.SetParameter("ClientRef", c_clientRef)
+
+            s_query_text += "\nORDER BY Дата DESC"
+            c_query.Text = s_query_text
+            c_query.SetParameter("StartDate", c_startDate)
+            c_query.SetParameter("EndDate", c_endDate)
 
             c_result = c_query.Execute()
             l_ordersList = []
 
             if not c_result.IsEmpty():
                 c_selection = c_result.Select()
-                log_sys("Found some orders. Starting to parse...")
+                log_sys("Found some orders for the date. Starting to parse...")
 
                 while c_selection.Next():
                     c_orderObj = self.get(c_selection.Number)
                     if c_orderObj:
                         l_ordersList.append(c_orderObj)
 
-            log_sys(f"Successfully retrieved {len(l_ordersList)} orders for today.")
+            log_sys(f"Successfully retrieved {len(l_ordersList)} orders for date {target_date}.")
             return l_ordersList
 
         except Exception as e:
-            log_sys(f"Error in getTodayOrders: {e}", 1)
+            log_sys(f"Error in get_by_date: {e}", 1)
             return []
 
     def update_info(self, c_orderObjIn) -> bool:

{onecinteraction-1.3.2 → onecinteraction-1.3.4/src/oneCInteraction.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.3.2
+Version: 1.3.4
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3
@@ -68,7 +68,6 @@ def __init__(self, s_oneCDatabasePathIn: str, s_usernameIn: str, s_passwordIn: s
 
 #### Key Attributes:
 - `s_warehouse_code` (str): 1C warehouse code for new orders.
-- `s_counteragent_code` (str): 1C counteragent (customer) code for new orders.
 - `s_organisation_code` (str): 1C organization code for new orders.
 - `sl_price_types` (list): List of price type names to cache automatically (defaults to `["Розничная", "Оптовая", "Закупочная"]`).
 - `c_v8`: The active 1C COM connection object (equals `None` if not connected).
@@ -239,8 +238,8 @@ Defined in [orders.py](file:///c:/Users/agcl/PycharmProjects/oneCInteractionLib/
   - Returns the number of the created document in 1C (or an empty string on error).
 - `get(s_codeIn: str) -> Order | None`
   Retrieves a buyer's order by its 1C document number and parses it into an `Order` object. The comment field is parsed to retrieve the Telegram ID, and the price type is retrieved.
-- `get_today() -> list`
-  Returns a list of all today's orders created for the configured bot counteragent (filtered by current date and counteragent code).
+- `get_by_date(target_date: date | datetime, s_counteragent_code: str = "") -> list`
+  Returns a list of all orders for a specific date (accepting `datetime.date` or `datetime.datetime`), optionally filtered by counteragent or counteragent group code.
 - `update_info(c_orderObjIn: Order) -> bool`
   Updates the comment field of the order in 1C. Writes a formatted string to the comment field:
   `"[Full Name] [Phone] [Telegram ID] [Waybill/TTN] [Status]"`
@@ -312,7 +311,6 @@ c_conn = Connection(
 
 # 2. Configure 1C Default Codes
 c_conn.s_warehouse_code = "000000001"  # Warehouse code
-c_conn.s_counteragent_code = "000000045"  # Bot customer/counteragent code
 c_conn.s_organisation_code = "000000001"  # Organization code
 
 # 3. Establish connection to 1C

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

@@ -0,0 +1,8 @@
+{
+  "tag": "1.3.4",
+  "distance": 0,
+  "node": "g483fede2714a233a4540c6d734c7b7e8d8b9e125",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-29"
+}

{onecinteraction-1.3.2 → onecinteraction-1.3.4}/tests/test_lib.py

@@ -134,6 +134,11 @@ try:
     assert c_conn.properties is not None
     print("Success: Checked all composition managers exist (including properties).")
     
+    # Test OrdersManager when connection is not active
+    assert c_conn.orders.get_by_date(datetime.now()) == []
+    assert c_conn.orders.push(c_order) == ""
+    print("Success: OrdersManager.get_by_date and push tested with no active connection.")
+    
     # Test PropertiesManager when connection is not active
     assert c_conn.properties.get_assigned_properties("ART001") == []
     assert c_conn.properties.write("ART001", "Колір", "Зелений") is False

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

@@ -1,8 +0,0 @@
-{
-  "tag": "1.3.2",
-  "distance": 0,
-  "node": "g943335e5e9d365b5c71c3ba9b304ff20f2940550",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-27"
-}