From a98038a4bc1395f8181e5142e4228a0ba9eb81a7 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 25 Sep 2020 23:24:21 -0500 Subject: [PATCH] Add app settings for Catapult integration --- theo/appsettings/__init__.py | 0 theo/appsettings/catapult.py | 32 ++++++++++++++++++++ theo/{appsettings.py => appsettings/theo.py} | 4 +-- theo/config.py | 7 +++-- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 theo/appsettings/__init__.py create mode 100644 theo/appsettings/catapult.py rename theo/{appsettings.py => appsettings/theo.py} (95%) diff --git a/theo/appsettings/__init__.py b/theo/appsettings/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/theo/appsettings/catapult.py b/theo/appsettings/catapult.py new file mode 100644 index 0000000..5bed5a2 --- /dev/null +++ b/theo/appsettings/catapult.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8; -*- +################################################################################ +# +# Rattail -- Retail Software Framework +# Copyright © 2010-2020 Lance Edgar +# +# This file is part of Rattail. +# +# Rattail is free software: you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation, either version 3 of the License, or (at your option) any later +# version. +# +# Rattail is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# Rattail. If not, see . +# +################################################################################ +""" +Theo app settings, for Catapult integration +""" + +# bring in some common settings from rattail +from rattail_onager.settings import ( + + # Catapult + rattail_onager_catapult_importing_db_default_models, +) diff --git a/theo/appsettings.py b/theo/appsettings/theo.py similarity index 95% rename from theo/appsettings.py rename to theo/appsettings/theo.py index 6291268..620ac82 100644 --- a/theo/appsettings.py +++ b/theo/appsettings/theo.py @@ -39,7 +39,7 @@ from rattail.settings import ( rattail_mail_record_attempts, # Products - rattail_product_key, - rattail_product_key_title, + # rattail_product_key, + # rattail_product_key_title, tailbone_products_show_pod_image, ) diff --git a/theo/config.py b/theo/config.py index 7cc56e8..0e6d9dd 100644 --- a/theo/config.py +++ b/theo/config.py @@ -41,28 +41,29 @@ class TheoConfig(ConfigExtension): # Theo comes with its own menu for web app config.setdefault('tailbone', 'menus', 'theo.web.menus') - # custom App Settings - config.setdefault('rattail', 'settings', 'theo.appsettings') - # do we integrate w/ CORE-POS? if integrate_corepos(config): config.setdefault('rattail', 'model', 'theo.db.model_corepos') + config.setdefault('rattail', 'settings', 'theo.appsettings.theo') config.setdefault('rattail.mail', 'emails', 'theo.emails.theo, theo.emails.corepos') config.setdefault('rattail.importing', 'versions.handler', 'theo.importing.versions_corepos:FromTheoToTheoVersions') # do we integrate w/ Catapult? elif integrate_catapult(config): config.setdefault('rattail', 'model', 'theo.db.model_catapult') + config.setdefault('rattail', 'settings', 'theo.appsettings.theo, theo.appsettings.catapult') config.setdefault('rattail.mail', 'emails', 'theo.emails.theo, theo.emails.catapult') config.setdefault('rattail.importing', 'versions.handler', 'theo.importing.versions_catapult:FromTheoToTheoVersions') # do we integrate w/ LOC SMS? elif integrate_locsms(config): config.setdefault('rattail', 'model', 'theo.db.model_locsms') + config.setdefault('rattail', 'settings', 'theo.appsettings.theo') config.setdefault('rattail.mail', 'emails', 'theo.emails.theo, theo.emails.locsms') config.setdefault('rattail.importing', 'versions.handler', 'theo.importing.versions_locsms:FromTheoToTheoVersions') else: # no integration + config.setdefault('rattail', 'settings', 'theo.appsettings.theo') config.setdefault('rattail.mail', 'emails', 'theo.emails.theo')