gistfile1.txt

brian@brian-linux:~/projects/pressed-python$ git pull
remote: Counting objects: 1969, done.
remote: Compressing objects: 100% (1708/1708), done.
remote: Total 1742 (delta 1287), reused 0 (delta 0)
Receiving objects: 100% (1742/1742), 713.63 KiB | 622 KiB/s, done.
Resolving deltas: 100% (1287/1287), completed with 169 local objects.
From git+ssh://pressedgit/pressed-python
   b78346c..a24c152  master     -> origin/master
 * [new branch]      checkout-views -> origin/checkout-views
 * [new branch]      mobile     -> origin/mobile
   b78346c..f0d0e2f  prod       -> origin/prod
   b78346c..ca030a6  qa         -> origin/qa
 * [new branch]      subscriptions -> origin/subscriptions
Updating b78346c..a24c152
Fast-forward
 get-production-database-copy.sh                    |    2 +-
 pressed_backoffice/__init__.py                     |    7 +-
 pressed_backoffice/blueprints/__init__.py          |    3 -
 pressed_backoffice/forms/cleanse.py                |   32 +-
 pressed_backoffice/forms/creditcard.py             |   24 +-
 pressed_backoffice/handlers/account.py             |   14 +-
 pressed_backoffice/handlers/apis.py                |   74 ----
 pressed_backoffice/handlers/cleanse.py             |   41 +--
 pressed_backoffice/handlers/cron.py                |  222 ++++++++++++
 pressed_backoffice/handlers/delivery.py            |    4 +-
 pressed_backoffice/handlers/discount.py            |   52 ++-
 pressed_backoffice/handlers/index.py               |    3 +-
 .../static/images/deliveries/gift_card_header.png  |  Bin 0 -> 33616 bytes
 pressed_backoffice/static/style/global.css         |    2 +-
 pressed_backoffice/templates/account/add.html      |   39 +-
 .../templates/account/addCoolerCredits.html        |    6 +-
 pressed_backoffice/templates/account/cleanses.html |    4 +-
 pressed_backoffice/templates/account/edit.html     |   49 +--
 .../templates/account/scheduleDelivery.html        |   30 +-
 .../templates/apis/productRevenue.html             |   13 -
 pressed_backoffice/templates/base.html             |    2 +-
 .../templates/cleanse/addConfig.html               |   38 +-
 pressed_backoffice/templates/cleanse/configs.html  |    6 +-
 .../templates/cleanse/editConfig.html              |   32 +-
 pressed_backoffice/templates/discount/add.html     |   20 +-
 .../templates/discount/discounts.html              |   92 +++--
 pressed_backoffice/templates/discount/edit.html    |   20 +-
 .../templates/instagram/addInstagram.html          |    8 +-
 .../templates/instagram/editInstagram.html         |    8 +-
 pressed_backoffice/templates/product/edit.html     |    4 +-
 pressed_backoffice/templates/region/regions.html   |    8 +-
 pressed_dotcom/__init__.py                         |  168 ++-------
 .../blueprints/about/templates/tweets.html         |   18 +-
 .../account/templates/addSavedAddress.html         |   19 +-
 .../account/templates/addSavedCreditCard.html      |   12 +-
 .../blueprints/account/templates/details.html      |   45 ++-
 .../account/templates/forgotPassword.html          |    4 +-
 .../blueprints/account/templates/register.html     |   46 +--
 .../account/templates/savedAddresses.html          |   36 +-
 .../account/templates/savedCreditCards.html        |   24 +-
 pressed_dotcom/blueprints/account/views.py         |   91 ++---
 pressed_dotcom/blueprints/apis/views.py            |   83 ++++-
 .../blueprints/cart/cart_ajax_mappings.py          |   12 +
 .../blueprints/cart/checkout_step_address.py       |   75 ++--
 .../blueprints/cart/checkout_step_arrival_dates.py |    7 +-
 .../blueprints/cart/checkout_step_confirmation.py  |   21 +-
 .../blueprints/cart/checkout_step_payment.py       |   45 ++-
 pressed_dotcom/blueprints/cart/config.py           |    8 +-
 pressed_dotcom/blueprints/cart/invoice_visitors.py |  169 +++++++--
 .../blueprints/cart/templates/cartView.html        |   76 ++--
 .../blueprints/cart/templates/checkoutAddress.html |  249 +++++++++++--
 .../cart/templates/checkoutConfirmation.html       |   81 ++---
 .../blueprints/cart/templates/checkoutPayment.html |   97 ++---
 .../blueprints/cart/templates/checkoutReceipt.html |  148 ++++----
 .../cart/templates/checkoutSetArrivalDates.html    |   54 +--
 pressed_dotcom/blueprints/cart/util.py             |   71 ++++
 pressed_dotcom/blueprints/corporate/__init__.py    |    9 +
 .../blueprints/corporate/templates}/__init__.py    |    0
 .../corporate/templates/corporateIndex.html        |    1 +
 pressed_dotcom/blueprints/corporate/views.py       |   19 +
 pressed_dotcom/blueprints/cron/views.py            |  108 ++++--
 pressed_dotcom/blueprints/free_gift/__init__.py    |   11 +
 .../blueprints/free_gift}/templates/__init__.py    |    0
 .../blueprints/free_gift/templates/freeGift.html   |  115 ++++++
 pressed_dotcom/blueprints/free_gift/views.py       |   13 +
 .../blueprints/homepage/templates/homepage.html    |   42 +--
 .../blueprints/homepage/templates/login.html       |   10 +-
 pressed_dotcom/blueprints/homepage/views.py        |   30 +-
 .../blueprints/invoices/templates/invoices.html    |   60 +---
 .../blueprints/learn/templates/cleanseQuiz.html    |    4 +-
 .../blueprints/locations/templates/locations.html  |   51 ++-
 pressed_dotcom/blueprints/locations/views.py       |   26 +-
 .../blueprints/pressedLife/templates/news.html     |    2 +-
 pressed_dotcom/blueprints/pressedLife/views.py     |    4 +-
 .../templates/cleanses/cleanseChoiceConfig.html    |   58 +--
 .../templates/cleanses/cleanseChoices.html         |    4 +-
 .../products/templates/giftCards/giftCards.html    |    4 +-
 .../products/templates/kits/kitDetails.html        |    2 -
 .../products/templates/kits/kitsBySubCategory.html |   10 +-
 .../products/templates/packages/packages.html      |    8 +-
 pressed_dotcom/blueprints/products/views.py        |   47 ++-
 .../templates/auto_populate_cart_discount.html     |    6 +-
 .../promos/templates/cleansePromotion.html         |  190 +++++-----
 pressed_dotcom/blueprints/promos/views.py          |   91 +++--
 .../templates/scheduledDeliveries.html             |   26 +-
 .../blueprints/schedule_deliveries/views.py        |    7 +-
 .../style_guide/templates/style_guide.html         |  138 ++++++--
 .../track_orders/templates/trackOrders.html        |   21 +-
 pressed_dotcom/blueprints/track_orders/views.py    |   14 +-
 pressed_dotcom/bundles.py                          |    6 +
 pressed_dotcom/forms/cleansePromotion.py           |    2 +-
 pressed_dotcom/forms/coolerDelivery.py             |   13 +-
 pressed_dotcom/forms/creditCard.py                 |   24 +-
 pressed_dotcom/forms/deliveryAddress.py            |   25 +-
 .../forms/deliveryAddressAuthenticate.py           |  163 +++++++++
 pressed_dotcom/forms/login.py                      |   23 ++
 pressed_dotcom/forms/payment.py                    |    5 -
 pressed_dotcom/forms/register.py                   |  170 +--------
 pressed_dotcom/oldUrls.py                          |  271 ++++++++++++++
 pressed_dotcom/static/css/about.scss               |   40 ++-
 pressed_dotcom/static/css/account.scss             |   13 +-
 pressed_dotcom/static/css/checkout.scss            |  217 ++++++++++--
 pressed_dotcom/static/css/cooler.scss              |    3 +-
 pressed_dotcom/static/css/global.scss              |  256 ++++++++++----
 pressed_dotcom/static/css/home.scss                |   76 ++--
 pressed_dotcom/static/css/info.scss                |    3 +-
 pressed_dotcom/static/css/learn.scss               |    6 +-
 pressed_dotcom/static/css/locations.scss           |    4 +-
 pressed_dotcom/static/css/login.scss               |    8 +-
 pressed_dotcom/static/css/pressed_life.scss        |    5 +-
 pressed_dotcom/static/css/products.scss            |    3 +-
 pressed_dotcom/static/css/promo.scss               |    3 +-
 pressed_dotcom/static/css/shared/buttons.scss      |  130 ++++++-
 pressed_dotcom/static/css/shared/forms.scss        |   68 +++-
 .../static/css/shared/helper-classes.scss          |   48 ++-
 .../static/css/shared/jquery.bxslider.scss         |    4 +-
 pressed_dotcom/static/css/shared/jquery.scss       |  106 +++---
 pressed_dotcom/static/css/shared/lib.scss          |    4 +
 pressed_dotcom/static/css/shared/mixins.scss       |   12 +
 pressed_dotcom/static/css/shared/modal.scss        |    3 +-
 pressed_dotcom/static/css/shared/select2.scss      |    7 +-
 pressed_dotcom/static/css/shared/tables.scss       |   19 +-
 pressed_dotcom/static/css/shared/variables.scss    |   23 +-
 pressed_dotcom/static/css/shop.scss                |  182 +++++++---
 pressed_dotcom/static/css/style_guide.scss         |   47 ++-
 pressed_dotcom/static/css/user.scss                |    3 +-
 pressed_dotcom/static/font/BrandonText-Bold.otf    |  Bin 0 -> 73508 bytes
 pressed_dotcom/static/font/BrandonText-Light.otf   |  Bin 0 -> 71000 bytes
 pressed_dotcom/static/font/BrandonText-Medium.otf  |  Bin 0 -> 73000 bytes
 pressed_dotcom/static/font/BrandonText-Regular.otf |  Bin 0 -> 70892 bytes
 .../static/images/email/instagramLogoTn.png        |  Bin 0 -> 4852 bytes
 .../static/images/global/2/bg-calendar-flip.png    |  Bin 0 -> 1946 bytes
 .../static/images/global/2/header-logo-type.png    |  Bin 0 -> 6206 bytes
 .../static/images/global/2/header-mark.png         |  Bin 0 -> 9469 bytes
 .../static/images/global/2/icon-truck.png          |  Bin 0 -> 1335 bytes
 .../static/images/homepage/2/bg-main-promo-4.jpg   |  Bin 0 -> 19888 bytes
 .../static/images/homepage/2/bg-main-promo-5.jpg   |  Bin 0 -> 32418 bytes
 .../static/images/homepage/2/icon-chalkboard.png   |  Bin 0 -> 5349 bytes
 .../static/images/homepage/2/main-chalkboard.jpg   |  Bin 72385 -> 11410 bytes
 .../static/images/homepage/2/main-menu.png         |  Bin 30688 -> 54433 bytes
 .../static/images/homepage/2/main-news.jpg         |  Bin 8903 -> 11659 bytes
 .../static/images/homepage/2/main-news.png         |  Bin 0 -> 17517 bytes
 pressed_dotcom/static/js/cart.js                   |   14 +-
 pressed_dotcom/templates/base.html                 |   22 +-
 pressed_dotcom/templates/checkout_base.html        |   16 +
 pressed_dotcom/templates/snippets/instagram.html   |    1 -
 pressed_dotcom/templates/snippets/nav_macros.html  |    5 +-
 pressed_dotcom/templates/snippets/navigation.html  |   86 +++--
 pressed_lib/cart/__init__.py                       |   17 +
 pressed_lib/cart/persistent_cart_data_model.txt    |    5 +
 pressed_lib/constants.py                           |   24 +-
 pressed_lib/data/migration/scripts/env.py          |    1 +
 .../versions/10a6970ce997_add_discount_created.py  |   21 ++
 .../versions/11f422fd3f39_add_cartid_to_invoic.py  |   21 ++
 .../versions/12dcf96104fe_update_saved_address.py  |   43 +++
 .../scripts/versions/184fadaa7fdf_pressed_pose.py  |   54 +++
 .../versions/2bd5468773f_fix_cleanse_admin.py      |   39 ++
 .../versions/2c59bf154bf1_skinnybitch_book_pro.py  |   59 +++
 .../versions/3748d5480f83_add_nullables2accoun.py  |   37 ++
 .../versions/3b528b17d077_skinny_bitch_des_upd.py  |   40 +++
 .../versions/4baae044cf80_fix_value_store_agai.py  |   42 +++
 .../versions/50340a3c2ece_update_skinny_bitch.py   |   32 ++
 .../versions/51216999ad85_add_lcl_sbscrptn_pro.py  |   72 ++++
 .../scripts/versions/52d15692a06_instagram_news.py |   61 ++++
 .../versions/53a04e93bb3e_add_cartkey_to_invoi.py  |   23 ++
 .../versions/56d7c3ffb351_preconfiguredcleanse.py  |   40 +++
 .../versions/9d0db72173a_fix_value_store.py        |   38 ++
 .../versions/e70dfdc1810_subscriptionmodel.py      |   52 +++
 pressed_lib/data/model/account.py                  |    8 +-
 pressed_lib/data/model/blackoutDate.py             |   21 ++
 pressed_lib/data/model/cleanse.py                  |   11 +-
 pressed_lib/data/model/discount.py                 |   10 +-
 pressed_lib/data/model/invoice.py                  |   16 +-
 pressed_lib/data/model/product.py                  |   47 ++-
 pressed_lib/data/model/subscription.py             |  184 ++++++++++
 pressed_lib/data/model/valueStore.py               |   57 +--
 .../emailTemplates/admin/admin_email_receipt.html  |    2 +-
 .../emailTemplates/checkout/abandoned_cart.html    |    2 +-
 .../emailTemplates/checkout/email_receipt.html     |    2 +-
 .../checkout/promo_email_receipt.html              |    2 +-
 pressed_lib/emailTemplates/cleanse/firstDay.html   |    2 +-
 pressed_lib/emailTemplates/cleanse/lastDay.html    |    2 +-
 .../cooler_delivery/scheduled_notice.html          |    2 +-
 .../emailTemplates/delivery/stopCompleted.html     |    2 +-
 .../emailTemplates/delivery/stopIncomplete.html    |    2 +-
 .../emailTemplates/delivery/stopProblem.html       |    2 +-
 pressed_lib/emailTemplates/email_base.html         |   16 +-
 .../registration/forgotPasswordEmail.html          |    2 +-
 .../emailTemplates/registration/welcomeEmail.html  |    8 +-
 .../subscription/payment_failure.html              |   59 +++
 .../subscription/payment_success.html              |   63 ++++
 pressed_lib/flask/login.py                         |   63 +++-
 pressed_lib/service/emailService.py                |   13 +
 pressed_lib/util/ipython.py                        |   29 ++
 pressed_lib/wtforms/validators.py                  |    2 +-
 runsite.py                                         |    1 +
 .../Preferences.sublime3-settings.ddilley          |  374 ++++++++++++++++++++
 197 files changed, 5594 insertions(+), 1919 deletions(-)
 delete mode 100644 pressed_backoffice/blueprints/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/charity/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/charity/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/cleanse/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/cleanse/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/contact/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/contact/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/delivery/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/delivery/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/depot/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/depot/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/discount/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/discount/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/ingredient/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/ingredient/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/invoice/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/invoice/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/press/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/press/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/product/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/product/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/storefront/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/storefront/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/testimonial/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/testimonial/templates/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/tweet/__init__.py
 delete mode 100644 pressed_backoffice/blueprints/tweet/templates/__init__.py
 create mode 100644 pressed_backoffice/handlers/cron.py
 create mode 100644 pressed_backoffice/static/images/deliveries/gift_card_header.png
 delete mode 100644 pressed_backoffice/templates/apis/productRevenue.html
 create mode 100644 pressed_dotcom/blueprints/corporate/__init__.py
 rename {pressed_backoffice/blueprints/account => pressed_dotcom/blueprints/corporate/templates}/__init__.py (100%)
 create mode 100644 pressed_dotcom/blueprints/corporate/templates/corporateIndex.html
 create mode 100644 pressed_dotcom/blueprints/corporate/views.py
 create mode 100644 pressed_dotcom/blueprints/free_gift/__init__.py
 rename {pressed_backoffice/blueprints/account => pressed_dotcom/blueprints/free_gift}/templates/__init__.py (100%)
 create mode 100644 pressed_dotcom/blueprints/free_gift/templates/freeGift.html
 create mode 100644 pressed_dotcom/blueprints/free_gift/views.py
 create mode 100644 pressed_dotcom/forms/deliveryAddressAuthenticate.py
 create mode 100644 pressed_dotcom/forms/login.py
 create mode 100644 pressed_dotcom/oldUrls.py
 create mode 100644 pressed_dotcom/static/css/shared/lib.scss
 create mode 100755 pressed_dotcom/static/font/BrandonText-Bold.otf
 create mode 100755 pressed_dotcom/static/font/BrandonText-Light.otf
 create mode 100755 pressed_dotcom/static/font/BrandonText-Medium.otf
 create mode 100755 pressed_dotcom/static/font/BrandonText-Regular.otf
 create mode 100644 pressed_dotcom/static/images/email/instagramLogoTn.png
 create mode 100644 pressed_dotcom/static/images/global/2/bg-calendar-flip.png
 create mode 100644 pressed_dotcom/static/images/global/2/header-logo-type.png
 create mode 100644 pressed_dotcom/static/images/global/2/header-mark.png
 create mode 100644 pressed_dotcom/static/images/global/2/icon-truck.png
 create mode 100644 pressed_dotcom/static/images/homepage/2/bg-main-promo-4.jpg
 create mode 100644 pressed_dotcom/static/images/homepage/2/bg-main-promo-5.jpg
 create mode 100644 pressed_dotcom/static/images/homepage/2/icon-chalkboard.png
 create mode 100644 pressed_dotcom/static/images/homepage/2/main-news.png
 create mode 100644 pressed_dotcom/templates/checkout_base.html
 create mode 100644 pressed_lib/data/migration/scripts/versions/10a6970ce997_add_discount_created.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/11f422fd3f39_add_cartid_to_invoic.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/12dcf96104fe_update_saved_address.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/184fadaa7fdf_pressed_pose.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/2bd5468773f_fix_cleanse_admin.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/2c59bf154bf1_skinnybitch_book_pro.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/3748d5480f83_add_nullables2accoun.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/3b528b17d077_skinny_bitch_des_upd.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/4baae044cf80_fix_value_store_agai.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/50340a3c2ece_update_skinny_bitch.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/51216999ad85_add_lcl_sbscrptn_pro.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/52d15692a06_instagram_news.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/53a04e93bb3e_add_cartkey_to_invoi.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/56d7c3ffb351_preconfiguredcleanse.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/9d0db72173a_fix_value_store.py
 create mode 100644 pressed_lib/data/migration/scripts/versions/e70dfdc1810_subscriptionmodel.py
 create mode 100644 pressed_lib/data/model/subscription.py
 create mode 100644 pressed_lib/emailTemplates/subscription/payment_failure.html
 create mode 100644 pressed_lib/emailTemplates/subscription/payment_success.html
 create mode 100644 pressed_lib/util/ipython.py
 create mode 100644 sublime_sesttings/Preferences.sublime3-settings.ddilley
brian@brian-linux:~/projects/pressed-python$ 
brian@brian-linux:~/projects/pressed-python$ 
brian@brian-linux:~/projects/pressed-python$ 
brian@brian-linux:~/projects/pressed-python$ git pull
Already up-to-date.
brian@brian-linux:~/projects/pressed-python$