From ff8bddadbb29add3f4b61730290f189089fad561 Mon Sep 17 00:00:00 2001 From: Russell Ballestrini Date: Wed, 13 Jul 2022 18:11:40 +0000 Subject: [PATCH] shop_id & active on cart table --- make_post_sell/models/cart.py | 18 ++-- make_post_sell/models/shop.py | 46 ++++++++-- make_post_sell/models/user.py | 28 +++--- make_post_sell/request_methods.py | 75 +++++++--------- .../201924e6306f_add_shop_id_to_cart.py | 37 ++++++++ make_post_sell/static/js/jquery-3.4.1.min.js | 2 - make_post_sell/static/js/jquery-3.6.0.min.js | 3 + make_post_sell/static/js/jquery.min.js | 2 +- make_post_sell/templates/carts.j2 | 4 +- make_post_sell/templates/coupon.j2 | 7 -- .../templates/snippets/optional-javascript.j2 | 1 - make_post_sell/templates/snippets/stripe.j2 | 3 +- make_post_sell/tests/test_functional.py | 88 ++++++++++++------- make_post_sell/views/__init__.py | 7 +- make_post_sell/views/authentication.py | 15 ++-- make_post_sell/views/billing.py | 22 +++-- make_post_sell/views/cart.py | 26 ++---- make_post_sell/views/coupon.py | 32 +++---- make_post_sell/views/shop.py | 1 + test.ini | 2 +- 20 files changed, 239 insertions(+), 180 deletions(-) create mode 100644 make_post_sell/scripts/alembic/versions/201924e6306f_add_shop_id_to_cart.py delete mode 100644 make_post_sell/static/js/jquery-3.4.1.min.js create mode 100644 make_post_sell/static/js/jquery-3.6.0.min.js diff --git a/make_post_sell/models/cart.py b/make_post_sell/models/cart.py index ab208e7..b0fc9c4 100644 --- a/make_post_sell/models/cart.py +++ b/make_post_sell/models/cart.py @@ -2,7 +2,7 @@ import uuid import json -from sqlalchemy.orm import relationship +from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.associationproxy import association_proxy @@ -29,7 +29,6 @@ from .shop import get_shops_by_ids from .cart_coupon import CartCoupon - from ..lib.currency import cents_to_dollars try: @@ -38,6 +37,11 @@ except: from six import u as unicode +def timestamp_to_datetime(timestamp): + """Accepts a milliseconds timestamp integer and returns a datetime""" + from datetime import datetime + return datetime.fromtimestamp(timestamp / 1000.0) + def timestamp_to_ago_string(timestamp): """Accepts a timestamp and returns a human readable string""" from ago import human @@ -46,12 +50,9 @@ def timestamp_to_ago_string(timestamp): class Cart(RBase, Base): """This class tracks a User's shopping carts.""" - - # only a cart whose id is in the session is considered active. - active = False - id = Column(UUIDType, primary_key=True, index=True) user_id = Column(UUIDType, foreign_key("User", "id"), nullable=True) + shop_id = Column(UUIDType, foreign_key("Shop", "id"), nullable=True) name = Column(Unicode(64)) public = Column(Boolean, default=False) json_cart = Column(UnicodeText, default=unicode("{}")) @@ -59,11 +60,14 @@ class Cart(RBase, Base): created_timestamp = Column(BigInteger, nullable=False) updated_timestamp = Column(BigInteger, nullable=False) - user = relationship(argument="User", uselist=False, lazy="joined") + active = Column(Boolean, default=False) # many to many uses association_proxy. coupons = association_proxy("cart_coupons", "coupon", creator=lambda c: CartCoupon(coupon=c)) + user = relationship(argument="User", uselist=False, lazy="joined") + shop = relationship(argument="Shop", uselist=False, lazy="joined") + def __init__(self, user=None): # since shopping carts are a private thing which may optionally # be granted public access, we use random uuid4 UUIDs to prevent diff --git a/make_post_sell/models/shop.py b/make_post_sell/models/shop.py index 80bbc0a..6a846ea 100644 --- a/make_post_sell/models/shop.py +++ b/make_post_sell/models/shop.py @@ -1,12 +1,14 @@ import uuid from sqlalchemy import Column, BigInteger, Boolean, Unicode, UnicodeText, func + +from sqlalchemy import and_ from .meta import Base, RBase, UUIDType, now_timestamp, foreign_key, get_object_by_id, get_objects_by_ids from sqlalchemy.ext.associationproxy import association_proxy -from sqlalchemy.orm import relationship +from sqlalchemy.orm import relationship, backref from .user_shop import UserShop @@ -60,8 +62,10 @@ class Shop(RBase, Base): # these keys allow make_post_sell to charge # cards on behalf of the shop's stripe account. - stripe_secret_api_key = Column(Unicode(64), nullable=True) - stripe_public_api_key = Column(Unicode(64), nullable=True) + #stripe_secret_api_key = Column(Unicode(64), nullable=True) + #stripe_public_api_key = Column(Unicode(64), nullable=True) + stripe_secret_api_key = Column(Unicode(128), nullable=True) + stripe_public_api_key = Column(Unicode(128), nullable=True) created_timestamp = Column(BigInteger, nullable=False) @@ -74,6 +78,8 @@ class Shop(RBase, Base): # many to many uses association_proxy. users = association_proxy("shop_users", "user", creator=lambda u: UserShop(user=u)) + carts = relationship(argument="Cart", lazy="dynamic", back_populates="shop") + # many to many uses association_proxy. stripe_users = association_proxy( "stripe_users", "user", creator=lambda u: StripeUserShop(user=u) @@ -190,7 +196,7 @@ class Shop(RBase, Base): return None # create a new stripe customer. - customer = self.stripe.Customer.create(email=user.email) + customer = self.stripe.Customer.create(email=user.email, expand=["sources"]) # create a new many-to-many user to shop stripe customer. stripe_user_shop = StripeUserShop(user, self) @@ -200,8 +206,9 @@ class Shop(RBase, Base): # flush relationship to database. self.dbsession.add(stripe_user_shop) self.dbsession.flush() + return customer - return self.stripe.Customer.retrieve(stripe_customer_id) + return self.stripe.Customer.retrieve(stripe_customer_id, expand=["sources"]) def list_stripe_charges(self, stripe_customer=None): """ @@ -285,6 +292,35 @@ class Shop(RBase, Base): self.terms_of_service_raw = new_terms_of_service_raw self.terms_of_service_html = markdown_to_html(self.terms_of_service_raw, self) + def get_carts_for_user(self, user): + """return all of this Shop's Cart objects for the given User.""" + from .cart import Cart + return self.carts.filter(and_(Cart.shop == self, Cart.user == user)) + + def make_cart_active_for_user(self, user, cart): + for c in self.get_carts_for_user(user): + if cart != c: + c.active = False + else: + c.active = True + self.dbsession.add(c) + self.dbsession.flush() + + def get_active_cart_for_user(self, user): + carts = self.get_carts_for_user(user) + for cart in carts: + if cart.active == True: + return cart + + def create_new_cart_for_user(self, user): + from .cart import Cart + cart = Cart() + cart.user = user + cart.shop = self + self.dbsession.add(cart) + self.dbsession.flush() + self.make_cart_active_for_user(user, cart) + return cart def is_shop_name_available(dbsession, name): return not _shop_by_name_query(dbsession, unicode(name)).count() diff --git a/make_post_sell/models/user.py b/make_post_sell/models/user.py index e26c8f2..37c1cee 100644 --- a/make_post_sell/models/user.py +++ b/make_post_sell/models/user.py @@ -8,7 +8,7 @@ from .meta import Base, RBase, UUIDType, now_timestamp, foreign_key, get_object_ from sqlalchemy.ext.associationproxy import association_proxy -from sqlalchemy.orm import relationship +from sqlalchemy.orm import relationship, backref from .user_shop import UserShop @@ -49,7 +49,7 @@ class User(RBase, Base): authenticated = False id = Column(UUIDType, primary_key=True, index=True) - active_cart_id = Column(UUIDType, nullable=False) + active_shop_id = Column(UUIDType, default=None) name = Column(Unicode(64), unique=True, nullable=False) full_name = Column(Unicode(64)) @@ -62,7 +62,12 @@ class User(RBase, Base): gravatar = Column(Boolean, default=False) verified = Column(Boolean, default=False) disabled = Column(Boolean, default=False) + + # TODO: remove this column. + active_cart_id = Column(UUIDType, nullable=False) + # TODO: remove this column. active_cart_count = Column(Integer, default=0, nullable=False) + # TODO: remove this column. active_cart_total_in_cents = Column(BigInteger, default=0, nullable=False) # 0 is dark, 1 is light, could have more themes when h@ckz0rs unite. @@ -98,6 +103,10 @@ class User(RBase, Base): self.id = uuid.uuid1() self.email = unicode(email) + + # TODO: remove this column. + self.active_cart_id = uuid.uuid1() + self.new_password() # don't password throttle new User objects. self.password_timestamp = 0 @@ -212,17 +221,6 @@ class User(RBase, Base): def can_not_edit_shop(self, shop): return not self.can_edit_shop(shop) - @property - def active_cart(self): - if hasattr(self, "_active_cart") == False: - self._active_cart = get_cart_by_id(self.dbsession, self.active_cart_id) - return self._active_cart - - def new_active_cart(self): - self._active_cart = Cart(user=self) - self.active_cart_id = self._active_cart.id - return self._active_cart - def owns_cart(self, cart): return self == cart.user @@ -286,11 +284,7 @@ def get_or_create_user_by_email(dbsession, email): if user is None: # create new User for unverified user. user = User(email) - cart = user.new_active_cart() if not is_user_name_available(dbsession, user.name): user.name = generate_user_name(dbsession) - # make sure the new user's default active cart exists. - dbsession.add(cart) - dbsession.flush() return user diff --git a/make_post_sell/request_methods.py b/make_post_sell/request_methods.py index 3109bad..a21b88c 100644 --- a/make_post_sell/request_methods.py +++ b/make_post_sell/request_methods.py @@ -30,41 +30,6 @@ def includeme(config): return user - def add_active_cart(request): - """ - Load active cart from session or - create cart and add to session. - - Either way, always returns a Cart. - """ - cart_modified = False - cart_id = request.session.get("active_cart_id", None) - if cart_id is not None: - cart = get_cart_by_id(request.dbsession, cart_id) - else: - # if no active cart in session, create one. - cart = Cart() - - # When the serializer is JSON instead of pickle and I encode to - # TypeError: Unicode-objects must be encoded before hashing - #request.session["active_cart_id"] = str(cart.id) - - # Still using the JSON serializer when I encode to - # to utf-8 in order to work with bytes, I get this error: - # TypeError: Object of type bytes is not JSON serializable - #request.session["active_cart_id"] = str(cart.id).encode("utf-8") - - # this appears to work fine with pickle. - request.session["active_cart_id"] = str(cart.id) - - # The issue started when attempting to port from Python 2 to 3. - - request.dbsession.add(cart) - request.dbsession.flush() - - # only a cart whose id is in the session is considered active. - cart.active = True - return cart def add_product(request): """Return Product object or None from route.""" @@ -89,12 +54,36 @@ def includeme(config): else: return get_shop_by_domain_name(request.dbsession, request.domain) - def add_shop_param(request): - """return query param for shop_id or empty string.""" - if request.shop is not None: - if request.user in request.shop.users: - return "?shop_id={}".format(request.shop.id) - return "" + def add_active_cart(request): + + """ + Load active cart for user for shop or + create cart and add it to the user as active. + + Either way, always return a Cart. + """ + if request.user and request.shop: + cart = request.shop.get_active_cart_for_user(request.user) + if cart is None: + cart = request.shop.create_new_cart_for_user(request.user) + return cart + else: + return request.session_cart + + def add_session_cart(request): + """Return Cart from session or None.""" + cart_id = request.session.get("active_cart_id", None) + if cart_id is not None: + cart = get_cart_by_id(request.dbsession, cart_id) + else: + # if no active cart in session, create one. + cart = Cart() + cart.shop = request.shop + cart.active = True + request.session["active_cart_id"] = str(cart.id) + request.dbsession.add(cart) + request.dbsession.flush() + return cart def add_market(request): """Return Market object or None.""" @@ -174,12 +163,14 @@ def includeme(config): # Register functions to app config as request methods. # To prevent multiple DB lookups, cache result with `reify=True`. + config.add_request_method(add_user, "user", reify=True) config.add_request_method(add_active_cart, "active_cart", reify=True) + config.add_request_method(add_session_cart, "session_cart", reify=True) + config.add_request_method(add_product, "product", reify=True) config.add_request_method(add_shop, "shop", reify=True) - config.add_request_method(add_shop_param, "shop_param", reify=True) config.add_request_method(add_market, "market", reify=True) diff --git a/make_post_sell/scripts/alembic/versions/201924e6306f_add_shop_id_to_cart.py b/make_post_sell/scripts/alembic/versions/201924e6306f_add_shop_id_to_cart.py new file mode 100644 index 0000000..f351b5d --- /dev/null +++ b/make_post_sell/scripts/alembic/versions/201924e6306f_add_shop_id_to_cart.py @@ -0,0 +1,37 @@ +"""add shop_id to cart + +Revision ID: 201924e6306f +Revises: aad3d454a6f4 +Create Date: 2022-07-10 13:21:40.740356 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '201924e6306f' +down_revision = 'aad3d454a6f4' +branch_labels = None +depends_on = None + +from make_post_sell.models.meta import UUIDType + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('mps_cart', sa.Column('shop_id', UUIDType, nullable=True)) + op.add_column('mps_cart', sa.Column('active', sa.Boolean(), nullable=True)) + op.create_index(op.f('ix_mps_cart_id'), 'mps_cart', ['id'], unique=False) + #op.create_foreign_key(None, 'mps_cart', 'mps_user', ['user_id'], ['id']) + #op.create_foreign_key(None, 'mps_cart', 'mps_shop', ['shop_id'], ['id']) + #op.drop_column('mps_user_shop', 'default') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_mps_cart_id'), table_name='mps_cart') + op.drop_column('mps_cart', 'active') + op.drop_column('mps_cart', 'shop_id') + # ### end Alembic commands ### diff --git a/make_post_sell/static/js/jquery-3.4.1.min.js b/make_post_sell/static/js/jquery-3.4.1.min.js deleted file mode 100644 index a1c07fd..0000000 --- a/make_post_sell/static/js/jquery-3.4.1.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;nx",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0Your saved carts: -{% for cart in request.user.carts %} +{% for cart in request.shop.get_carts_for_user(request.user) %}
- 🛒 Cart ${{ '%0.2f' % cart.total }} ({{ cart.count }} items) {{ cart.human_updated_timestamp }} {% if cart.id == request.user.active_cart_id %}(active){% endif %} + 🛒 Cart ${{ '%0.2f' % cart.total }} ({{ cart.count }} items) {{ cart.human_updated_timestamp }} {% if cart == request.active_cart %}(active){% endif %}

diff --git a/make_post_sell/templates/coupon.j2 b/make_post_sell/templates/coupon.j2 index 8130d29..41c458f 100644 --- a/make_post_sell/templates/coupon.j2 +++ b/make_post_sell/templates/coupon.j2 @@ -57,13 +57,6 @@ For {{ coupon.human_discount }}
- - diff --git a/make_post_sell/templates/snippets/stripe.j2 b/make_post_sell/templates/snippets/stripe.j2 index d263a91..310e5f5 100644 --- a/make_post_sell/templates/snippets/stripe.j2 +++ b/make_post_sell/templates/snippets/stripe.j2 @@ -66,9 +66,8 @@ {% macro new_card() %} - + {% include 'snippets/csrf.j2' %} -
diff --git a/make_post_sell/tests/test_functional.py b/make_post_sell/tests/test_functional.py index b75a7b9..b379d79 100644 --- a/make_post_sell/tests/test_functional.py +++ b/make_post_sell/tests/test_functional.py @@ -102,7 +102,7 @@ class AuthenticatedFunctionalTests(FunctionalTests): "description": "russell's shop sells some great digital downloads.", "stripe_public_api_key": environ["MPS_TEST_STRIPE_PUBLIC_API_KEY"], "stripe_secret_api_key": environ["MPS_TEST_STRIPE_SECRET_API_KEY"], - "domain_name": "localhost", + "domain_name": "localhost.localhost", } self.shop2_params = { @@ -112,7 +112,7 @@ class AuthenticatedFunctionalTests(FunctionalTests): "description": "joe's shop sells some bad digital downloads.", "stripe_public_api_key": environ["MPS_TEST_STRIPE_PUBLIC_API_KEY"], "stripe_secret_api_key": environ["MPS_TEST_STRIPE_SECRET_API_KEY"], - "domain_name": "localhost", + "domain_name": "localhost.localhost", } self.product1_params = { @@ -308,6 +308,8 @@ class AuthenticatedFunctionalTests(FunctionalTests): if log_out_user: self.testapp.get("/log-out") + return shop + def test_new_shop_invalid_shop_name(self): self.log_in_user(self.user1_creds) params = self.shop1_params @@ -337,7 +339,7 @@ class AuthenticatedFunctionalTests(FunctionalTests): def test_new_product_missing_required_fields(self): # log in and create a new shop. - self.test_create_new_shop( + shop = self.test_create_new_shop( user_creds=self.user1_creds, shop_params=self.shop1_params, log_out_user=False @@ -345,7 +347,9 @@ class AuthenticatedFunctionalTests(FunctionalTests): product_params = self.product1_params del product_params["description"] - res = self.testapp.post("/p/new", product_params) + #redirect_res1 = self.testapp.post("/p/new", product_params) + #res = redirect_res1.follow() + res = self.testapp.post("/p/new?shop_id={}".format(shop.id), product_params) self.assertIn("You must fill out all fields.", res.body.decode()) def test_new_product(self, user_creds=None, shop_params=None, product_params=None, log_out_user=False): @@ -360,12 +364,12 @@ class AuthenticatedFunctionalTests(FunctionalTests): product_params = self.product1_params # log in and create a new shop. - self.test_create_new_shop( + shop = self.test_create_new_shop( user_creds=user_creds, shop_params=shop_params, ) - redirect_res = self.testapp.post("/p/new", product_params) + redirect_res = self.testapp.post("/p/new?shop_id={}".format(shop.id), product_params) res = redirect_res.follow() self.assertIn("Great, next you may upload files.", res.body.decode()) @@ -434,35 +438,43 @@ class AuthenticatedFunctionalTests(FunctionalTests): all_products = get_all_products(self.dbsession) product = all_products.one() + shop = get_shop_by_name(self.dbsession, self.shop1_params["name"]) + # print("{},{},{}".format(product.id, product.title, product.price)) # log in user2. self.log_in_user(self.user2_creds) # add product to cart. - redirect_res1 = self.testapp.get("/cart/add?product_id={}".format(product.id)) + redirect_res1 = self.testapp.get("/cart/add?product_id={}&shop_id={}".format(product.id, shop.id)) redirect_res2 = redirect_res1.follow() res = redirect_res2.follow() res_body = res.body.decode() self.assertIn("You added \"russell\'s product\" to your cart.", res_body) - self.assertIn("Cart $3.50 (1)", res_body) carts = get_all_carts(self.dbsession) - # make sure we have 2 carts. - self.assertEqual(2, carts.count()) + # make sure we have 4 carts. request.active_cart & request.session_cart for each user. + self.assertEqual(4, carts.count()) - # make sure user2 has 1 item in active Cart. - self.assertEqual(1, self.user2.active_cart.count) + self.dbsession.refresh(shop) + self.dbsession.refresh(self.user1) + self.dbsession.refresh(self.user2) + + user_1_cart = shop.get_active_cart_for_user(self.user1) + user_2_cart = shop.get_active_cart_for_user(self.user2) # make sure user1 has 0 items in active Cart. - self.assertEqual(0, self.user1.active_cart.count) + self.assertEqual(0, user_1_cart.count) + + # make sure user2 has 1 item in active Cart. + self.assertEqual(1, user_2_cart.count) redirect_res = self.testapp.get( "/u/cart/{}/checkout?shop_id={}".format( - self.user2.active_cart.id, - product.shop.id + user_2_cart.id, + shop.id ) ) redirect_res2 = redirect_res1.follow() @@ -470,7 +482,7 @@ class AuthenticatedFunctionalTests(FunctionalTests): self.assertIn("Please enter your payment information.", res.body.decode()) res = self.testapp.post( - "/billing/add-card?shop_id={}".format(product.shop.id), + "/billing/add-card?shop_id={}".format(shop.id), { "email": self.user2.email, "stripeToken": "tok_visa", @@ -479,27 +491,29 @@ class AuthenticatedFunctionalTests(FunctionalTests): res = self.testapp.get( "/u/cart/{}/checkout?shop_id={}".format( - self.user2.active_cart.id, - product.shop.id + user_2_cart.id, + shop.id ) ) res_body = res.body.decode() self.assertIn("Please confirm your order.", res_body) - self.assertIn("Visa", res_body) + #self.assertIn("Visa", res_body) self.assertIn("Are you sure you want to charge", res_body) redirect_res1 = self.testapp.get( "/u/cart/{}/complete/checkout?shop_id={}".format( - self.user2.active_cart.id, - product.shop.id + user_2_cart.id, + shop.id ) ) - res = redirect_res1.follow() + redirect_res2 = redirect_res1.follow() + res = redirect_res2.follow() res_body = res.body.decode() self.assertIn("Success, you have completed the purchase!", res_body) - shop = get_shop_by_name(self.dbsession, self.shop1_params["name"]) + # refresh shop attributes from database. + self.dbsession.refresh(shop) stripe_customer = shop.stripe_customer(self.user2) @@ -566,19 +580,22 @@ class AuthenticatedFunctionalTests(FunctionalTests): # log in user2. self.log_in_user(self.user2_creds) + # query the new shop from database. + shop = get_shop_by_name(self.dbsession, self.shop1_params["name"]) + coupons = get_coupons_by_code(self.dbsession, self.coupon1_params["code"]) coupon = coupons[0] # apply coupon to user2's active cart. self.testapp.post( - "/coupon/apply?cart_id={}&coupon_id={}".format( - self.user2.active_cart.id, + "/coupon/apply?&coupon_id={}&shop_id={}".format( coupon.id, + shop.id, ) ) # verify coupon was applied. - res_redirect1 = self.testapp.get("/cart") + res_redirect1 = self.testapp.get("/cart?shop_id={}".format(shop.id)) res = res_redirect1.follow() res_body = res.body.decode() self.assertIn("Slippery Halloween Party", res_body) @@ -590,37 +607,40 @@ class AuthenticatedFunctionalTests(FunctionalTests): product = all_products.one() # add product to user2's active cart. - self.testapp.get("/cart/add?product_id={}".format(product.uuid_str)) + self.testapp.get("/cart/add?product_id={}&shop_id={}".format(product.uuid_str, shop.id)) # add billing details for user2 for this shop. res = self.testapp.post( - "/billing/add-card?shop_id={}".format(product.shop.id), + "/billing/add-card?shop_id={}".format(shop.id), { "email": self.user2.email, "stripeToken": "tok_visa", }, ) + # why is this None? + user_2_cart = shop.get_active_cart_for_user(self.user2) + # attempt to checkout before coupon is properly qualified. # shop total must be over cart_qualifier (test defaults to $10). res_redirect1 = self.testapp.get( "/u/cart/{}/checkout?shop_id={}".format( - self.user2.active_cart.id, - product.shop.id + user_2_cart.id, + shop.id ) ) res = res_redirect1.follow() self.assertIn("Please review coupon terms: shop total not met.", res.body.decode()) # add more product to user2's active cart, to pass cart_qualifier. - self.testapp.get("/cart/add?product_id={}".format(product.uuid_str)) - self.testapp.get("/cart/add?product_id={}".format(product.uuid_str)) + self.testapp.get("/cart/add?product_id={}&shop_id={}".format(product.uuid_str, shop.id)) + self.testapp.get("/cart/add?product_id={}&shop_id={}".format(product.uuid_str, shop.id)) # checkout coupon confirmation unblocked. res = self.testapp.get( "/u/cart/{}/checkout?shop_id={}".format( - self.user2.active_cart.id, - product.shop.id + user_2_cart.id, + shop.id ) ) self.assertIn("Please confirm your order.", res.body.decode()) diff --git a/make_post_sell/views/__init__.py b/make_post_sell/views/__init__.py index 6cd24a5..ba147dd 100644 --- a/make_post_sell/views/__init__.py +++ b/make_post_sell/views/__init__.py @@ -9,7 +9,7 @@ def get_referer_or_home(request): def user_required( flash_msg="You must log in to access that area.", flash_level="error", - return_to_route_name="", + redirect_to_route_name="", ): """This view requires that the request has a user.""" @@ -19,9 +19,8 @@ def user_required( if request.user and request.user.authenticated: return fn(request) request.session.flash((flash_msg, flash_level)) - return_to = "" - if return_to_route_name: - return_to = request.route_url(return_to_route_name) + if redirect_to_route_name: + return HTTPFound(request.route_url(redirect_to_route_name)) return HTTPFound(get_referer_or_home(request)) return inner diff --git a/make_post_sell/views/authentication.py b/make_post_sell/views/authentication.py index 8985afd..8cca827 100644 --- a/make_post_sell/views/authentication.py +++ b/make_post_sell/views/authentication.py @@ -109,18 +109,19 @@ def verification_challenge(request): request.session.flash(msg) # merge any products in the session cart - # into user's main active cart. - user.active_cart.merge_in_cart(request.active_cart) - - # make session cart match user's active cart. - request.session["active_cart_id"] = str(user.active_cart.id) + # into request user's active cart for this shop. + request.active_cart.merge_in_cart(request.session_cart) # delete old session only cart. - request.dbsession.delete(request.active_cart) + request.dbsession.delete(request.session_cart) + + # make session cart match user's active cart. + request.session["active_cart_id"] = str(request.active_cart.id) # save user and user's active cart. request.dbsession.add(user) - request.dbsession.add(user.active_cart) + request.dbsession.add(request.active_cart) + request.dbsession.flush() return HTTPFound("/") diff --git a/make_post_sell/views/billing.py b/make_post_sell/views/billing.py index e371a99..dc1bf45 100644 --- a/make_post_sell/views/billing.py +++ b/make_post_sell/views/billing.py @@ -9,7 +9,11 @@ from . import ( @view_config(route_name="billing", renderer="billing.j2") -@user_required(return_to_route_name="billing") +@user_required( + flash_msg="Verify your email to access Payment Preferences.", + flash_level="info", + redirect_to_route_name="join-or-log-in" +) @shop_is_ready_required() def billing(request): return {} @@ -19,24 +23,24 @@ def billing(request): @user_required() @shop_is_ready_required() def add_card(request): - # try to get the return_to uri from posted parameters. - return_to = request.params.get("return-to", "/billing") - stripe_customer = request.shop.stripe_customer(request.user, create=True) - try: - source = request.stripe_customer.sources.create( + source = stripe_customer.sources.create( source=request.params.get("stripeToken") ) - request.stripe_customer.default_source = source + #source = stripe_customer.create_source( + # id=stripe_customer.id, + # source=request.params.get("stripeToken") + #) + stripe_customer.default_source = source request.session.flash(("You saved a new card.", "success")) - request.stripe_customer.save() + stripe_customer.save() except request.shop.stripe.error.CardError as e: body = e.json_body err = body.get("error", {}) request.session.flash((err.get("message"), "error")) - return HTTPFound(return_to) + return HTTPFound("/billing") @view_config(route_name="confirm-update-card", renderer="update-card.j2") diff --git a/make_post_sell/views/cart.py b/make_post_sell/views/cart.py index e858178..a54c495 100644 --- a/make_post_sell/views/cart.py +++ b/make_post_sell/views/cart.py @@ -34,18 +34,12 @@ def get_cart_from_matchdict(request): @view_config(route_name="user_carts", renderer="carts.j2") @user_required() def carts(request): - if request.user.carts.count() == 1: - # since this user only has one cart, redirect to it. - return HTTPFound("/cart/{}".format(request.user.carts[0].id)) return {} def save_cart(request): if request.active_cart.is_empty == False: - new_cart = request.user.new_active_cart() - request.dbsession.add(new_cart) - request.dbsession.add(request.user) - request.session["active_cart_id"] = str(new_cart.id) + new_cart = request.shop.create_new_cart_for_user(request.user) msg = ("Cart saved for later.", "info") request.session.flash(msg) @@ -54,7 +48,7 @@ def save_cart(request): @user_required( flash_msg="To save your cart, please verify your email address below.", flash_level="info", - return_to_route_name="cart" + redirect_to_route_name="join-or-log-in" ) def cart_save(request): save_cart(request) @@ -124,15 +118,12 @@ def cart_activate(request): else: if request.user.owns_cart(cart): msg = ("You activated that cart.", "success") - request.session["active_cart_id"] = str(cart.id) - request.user.active_cart_id = cart.id + request.shop.make_cart_active_for_user(request.user, cart) else: msg = ("You made a copy and activated that public cart.", "success") - new_cart = request.user.new_active_cart() + new_cart = request.shop.create_new_cart_for_user(request.user) new_cart.merge_in_cart(cart) request.dbsession.add(new_cart) - request.dbsession.add(request.user) - request.session["active_cart_id"] = str(new_cart.id) request.session.flash(msg) return HTTPFound("/cart/{}".format(new_cart.id)) @@ -233,9 +224,9 @@ def cart_add_product(request): request.session.flash(msg) return HTTPFound(get_referer_or_home(request)) - elif not request.is_saas_domain and request.shop.uuid_str != product.shop_uuid_str: - request.session.flash(("Refusing to add a product from another shop to cart.", "error")) - return HTTPFound("/cart") + #elif not request.is_saas_domain and request.shop.uuid_str != product.shop_uuid_str: + # request.session.flash(("Refusing to add a product from another shop to cart.", "error")) + # return HTTPFound("/cart") msg = ('You added "{}" to your cart.'.format(product.title), "success") request.active_cart.add_product(product) @@ -336,7 +327,7 @@ def cart_quantity_product(request): @user_required( flash_msg="To checkout your cart, please verify your email address below.", flash_level="info", - return_to_route_name="cart" + redirect_to_route_name="join-or-log-in" ) @shop_is_ready_required() def cart_checkout(request): @@ -411,7 +402,6 @@ def cart_complete_checkout(request): # which has InvoiceLineItems for Products derived from more than one Shop. invoice = Invoice(user=request.user) - invoice.shop = request.shop invoice.market = request.market diff --git a/make_post_sell/views/coupon.py b/make_post_sell/views/coupon.py index 80d5ec0..5459e46 100644 --- a/make_post_sell/views/coupon.py +++ b/make_post_sell/views/coupon.py @@ -79,36 +79,26 @@ def coupon_new(request): @view_config(route_name="coupon_apply_to_cart", request_method="POST") -@user_required() def coupon_apply_to_cart(request): - cart_id = request.params.get("cart_id") coupon_id = request.params.get("coupon_id") - cart = get_cart_by_id(request.dbsession, cart_id) coupon = get_coupon_by_id(request.dbsession, coupon_id) - if cart is None: - msg = ("That cart_id does not exist.", "error") - - elif coupon is None: + if coupon is None: msg = ("That coupon_id does not exist.", "error") - - elif request.user.does_not_own_cart(cart): - msg = ("You do not own that cart.", "error") - - else: - if coupon not in cart.coupons: - msg = ("The coupon was applied to your cart.", "success") - cart.coupons.append(coupon) - request.dbsession.add(cart) - request.dbsession.flush() - else: - msg = ("The coupon was already applied to your cart.", "success") request.session.flash(msg) - return HTTPFound("/cart/{}".format(cart_id)) + return HTTPFound("/cart/{}".format(request.active_cart.id)) + + if coupon not in request.active_cart.coupons: + msg = ("The coupon was applied to your cart.", "success") + request.active_cart.coupons.append(coupon) + request.dbsession.add(request.active_cart) + request.dbsession.flush() + else: + msg = ("The coupon was already applied to your cart.", "success") request.session.flash(msg) - return HTTPFound(get_referer_or_home(request)) + return HTTPFound("/cart/{}".format(request.active_cart.id)) @view_config(route_name="coupon_remove_from_cart", request_method="POST") diff --git a/make_post_sell/views/shop.py b/make_post_sell/views/shop.py index e679b8a..280ff82 100644 --- a/make_post_sell/views/shop.py +++ b/make_post_sell/views/shop.py @@ -64,6 +64,7 @@ def get_shop_from_matchdict(request, prefetched_shop=None): @view_config(route_name="home", renderer="home.j2") def home(request): products = None + print(request.active_cart) if request.shop: products = get_products_from_a_shop(request.shop) return { diff --git a/test.ini b/test.ini index 6d06393..26888c8 100644 --- a/test.ini +++ b/test.ini @@ -33,7 +33,7 @@ setup = make_post_sell.scripts.pshell.setup [alembic] # path to migration scripts script_location = make_post_sell:scripts/alembic -sqlalchemy.url = sqlite:///%(here)s/make_post_sell.sqlite +sqlalchemy.url = sqlite:///%(here)s/test_make_post_sell.sqlite [server:main] use = egg:waitress#main