From 3b6da8c2470dea7063bd89ee5537bd52175d5690 Mon Sep 17 00:00:00 2001 From: "watcha.h" Date: Wed, 4 Feb 2015 12:13:10 +0700 Subject: [PATCH] account --- .../layouts/clinic_account_setting.xml | 1 + .../layouts/clinic_hd_case_form.xml | 3 +- netforce_clinic/layouts/clinic_prod_form.xml | 5 ++ netforce_clinic/layouts/clinic_prod_list.xml | 2 +- netforce_clinic/layouts/clinic_setting.xml | 9 ++-- netforce_clinic/layouts/clinic_shop_form.xml | 3 +- netforce_clinic/models/__init__.py | 6 ++- netforce_clinic/models/hd_case.py | 11 ++--- netforce_clinic/models/product.py | 9 ++++ netforce_clinic/models/setting.py | 42 +++++++++++++--- .../models/setting_account_product.py | 1 + .../models/setting_shop_product.py | 24 ++++++++++ netforce_clinic/models/shop.py | 48 ++++++++++++++++++- netforce_clinic/models/shop_line.py | 1 + netforce_clinic/todo.txt | 11 +++-- 15 files changed, 145 insertions(+), 31 deletions(-) create mode 100644 netforce_clinic/layouts/clinic_prod_form.xml create mode 100644 netforce_clinic/models/product.py create mode 100644 netforce_clinic/models/setting_shop_product.py diff --git a/netforce_clinic/layouts/clinic_account_setting.xml b/netforce_clinic/layouts/clinic_account_setting.xml index 670cc93..41c0877 100644 --- a/netforce_clinic/layouts/clinic_account_setting.xml +++ b/netforce_clinic/layouts/clinic_account_setting.xml @@ -28,6 +28,7 @@ + diff --git a/netforce_clinic/layouts/clinic_hd_case_form.xml b/netforce_clinic/layouts/clinic_hd_case_form.xml index 55cb4cc..e2f3447 100644 --- a/netforce_clinic/layouts/clinic_hd_case_form.xml +++ b/netforce_clinic/layouts/clinic_hd_case_form.xml @@ -60,7 +60,8 @@ - + + diff --git a/netforce_clinic/layouts/clinic_prod_form.xml b/netforce_clinic/layouts/clinic_prod_form.xml new file mode 100644 index 0000000..ed2a5e8 --- /dev/null +++ b/netforce_clinic/layouts/clinic_prod_form.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/netforce_clinic/layouts/clinic_prod_list.xml b/netforce_clinic/layouts/clinic_prod_list.xml index b2432ab..789d7ef 100644 --- a/netforce_clinic/layouts/clinic_prod_list.xml +++ b/netforce_clinic/layouts/clinic_prod_list.xml @@ -1,4 +1,4 @@ - + diff --git a/netforce_clinic/layouts/clinic_setting.xml b/netforce_clinic/layouts/clinic_setting.xml index 271b0a7..4f8054b 100644 --- a/netforce_clinic/layouts/clinic_setting.xml +++ b/netforce_clinic/layouts/clinic_setting.xml @@ -12,13 +12,9 @@ - - + - - - @@ -28,6 +24,9 @@ + + +