From 57d3a21e4394896e1f4450709ca2dcfa7202a89a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 19 Aug 2024 11:30:44 -0500 Subject: [PATCH 1/4] fix: improve logic for matching CORE stock purchase to Rattail payment we were already "trying" to match on date only, but only as a sort of fallback. now we still try "exact" date/time match first but then also an explicit date match, before other fallback logic --- rattail_corepos/importing/corepos/db.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/rattail_corepos/importing/corepos/db.py b/rattail_corepos/importing/corepos/db.py index 63b6894..59d4b0e 100644 --- a/rattail_corepos/importing/corepos/db.py +++ b/rattail_corepos/importing/corepos/db.py @@ -953,7 +953,17 @@ class MemberEquityPaymentImporter(FromCOREPOS, corepos_importing.model.MemberEqu if len(match) == 1: return match[0] - # nb. avoid datetime for this one + # then try to match on date only, not time + match = [payment for payment in payments + if payment.corepos_transaction_number == stock_purchase.transaction_number + and payment.corepos_transaction_id == stock_purchase.transaction_id + and payment.amount == stock_purchase.amount + and payment.corepos_department_number == stock_purchase.department_number + and self.app.localtime(payment.corepos_datetime, from_utc=True).date() == dt.date()] + if len(match) == 1: + return match[0] + + # nb. avoid date/time for this one matches = [payment for payment in payments if payment.corepos_transaction_number == stock_purchase.transaction_number and payment.corepos_transaction_id == stock_purchase.transaction_id @@ -966,6 +976,9 @@ class MemberEquityPaymentImporter(FromCOREPOS, corepos_importing.model.MemberEqu stock_purchase.amount, stock_purchase.datetime) + # TODO: now that we try to match on date above, this logic + # may no longer be necssary/useful? + # so there is one match, but its timestamp may be way off, # so let's also make sure at least date matches payment = matches[0] From c954c4304bc0937f3fa1903271ef34be665c2427 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Mon, 19 Aug 2024 12:02:28 -0500 Subject: [PATCH 2/4] =?UTF-8?q?bump:=20version=200.3.8=20=E2=86=92=200.3.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1815f59..28bd885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to rattail-corepos will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v0.3.9 (2024-08-19) + +### Fix + +- improve logic for matching CORE stock purchase to Rattail payment + ## v0.3.8 (2024-08-18) ### Fix diff --git a/pyproject.toml b/pyproject.toml index 2cf8f29..4e1763a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "hatchling.build" [project] name = "rattail_corepos" -version = "0.3.8" +version = "0.3.9" description = "Rattail Software Interfaces for CORE POS" readme = "README.rst" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] From 7cc5c7abad6d3a0d55bd03d1cb66922924c4bc94 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 13 Sep 2024 18:46:06 -0500 Subject: [PATCH 3/4] docs: use markdown for readme file --- README.md | 11 +++++++++++ README.rst | 14 -------------- pyproject.toml | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 README.md delete mode 100644 README.rst diff --git a/README.md b/README.md new file mode 100644 index 0000000..cb82d29 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ + +# rattail-corepos + +Rattail is a retail software framework, released under the GNU General Public +License. + +This package contains software interfaces for the [CORE +POS](https://github.com/CORE-POS/IS4C) system. + +Please see Rattail's [home page](https://rattailproject.org/) for more +information. diff --git a/README.rst b/README.rst deleted file mode 100644 index 5f5141b..0000000 --- a/README.rst +++ /dev/null @@ -1,14 +0,0 @@ - -rattail_corepos -=============== - -Rattail is a retail software framework, released under the GNU General Public -License. - -This package contains software interfaces for the `CORE POS`_ system. - -.. _`CORE POS`: https://github.com/CORE-POS/IS4C - -Please see Rattail's `home page`_ for more information. - -.. _`home page`: https://rattailproject.org/ diff --git a/pyproject.toml b/pyproject.toml index 4e1763a..e55beae 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ build-backend = "hatchling.build" name = "rattail_corepos" version = "0.3.9" description = "Rattail Software Interfaces for CORE POS" -readme = "README.rst" +readme = "README.md" authors = [{name = "Lance Edgar", email = "lance@edbob.org"}] license = {text = "GNU GPL v3+"} classifiers = [ From 49d897ab86b37c4c67d4d6a51c3d53be7a147452 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sat, 14 Sep 2024 12:11:06 -0500 Subject: [PATCH 4/4] docs: update project links, kallithea -> forgejo --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e55beae..11e679d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,10 +33,10 @@ dependencies = [ [project.urls] -Homepage = "https://redmine.rattailproject.org/projects/corepos-integration" -Repository = "https://kallithea.rattailproject.org/rattail-project/rattail-corepos" -Issues = "https://redmine.rattailproject.org/projects/corepos-integration/issues" -Changelog = "https://kallithea.rattailproject.org/rattail-project/rattail-corepos/files/master/CHANGELOG.md" +Homepage = "https://rattailproject.org" +Repository = "https://forgejo.wuttaproject.org/rattail/rattail-corepos" +Issues = "https://forgejo.wuttaproject.org/rattail/rattail-corepos/issues" +Changelog = "https://forgejo.wuttaproject.org/rattail/rattail-corepos/src/branch/master/CHANGELOG.md" [project.scripts]