From 38a8b015a64f63842dd97cf7e91023621518714c Mon Sep 17 00:00:00 2001
From: Juliana <juliana@le-filament.com>
Date: Thu, 19 Aug 2021 12:00:21 +0200
Subject: [PATCH] Ajout du controle pour passer au paiement

---
 __manifest__.py                               |   2 +-
 controllers/__pycache__/main.cpython-37.pyc   | Bin 1791 -> 1881 bytes
 controllers/main.py                           |  39 ++++--------------
 models/__pycache__/__init__.cpython-37.pyc    | Bin 253 -> 0 bytes
 .../res_config_settings.cpython-37.pyc        | Bin 615 -> 0 bytes
 models/__pycache__/website.cpython-37.pyc     | Bin 507 -> 0 bytes
 models/product.py                             |  10 -----
 views/product_views.xml                       |  17 --------
 views/template.xml                            |  20 ---------
 9 files changed, 8 insertions(+), 80 deletions(-)
 delete mode 100644 models/__pycache__/__init__.cpython-37.pyc
 delete mode 100644 models/__pycache__/res_config_settings.cpython-37.pyc
 delete mode 100644 models/__pycache__/website.cpython-37.pyc
 delete mode 100755 models/product.py
 delete mode 100755 views/product_views.xml

diff --git a/__manifest__.py b/__manifest__.py
index d75bcc4..69ec486 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -1,7 +1,7 @@
 {
     "name": "VRACOOP - Website Cart Limit",
     "summary": "VRACOOP - Website Cart Limit",
-    "version": "12.0.1.0.1",
+    "version": "12.0.1.0.0",
     "development_status": "Beta",
     "author": "Le Filament",
     "maintainers": ["remi-filament"],
diff --git a/controllers/__pycache__/main.cpython-37.pyc b/controllers/__pycache__/main.cpython-37.pyc
index 1c498fa880a4aabdf4f61a9e5cf8b3194a904496..16bd31dd14519e9b1180c476785b7647e30d8d02 100644
GIT binary patch
delta 939
zcmey*dy|jPiI<m)fq{WxzNTE_YvGA}5{x+$)fEC6a#^BSav7r-b6KNUbJ?QU7#UI+
zQdn}>b2*|oz--nW&Rni2E=C4-h7`6G_7;W|_EfHB<|r<Ah7^tz&K8Cg&Qy+O<|vL7
zu3!dD?uiYO5-hja(lS$XQi_Y17#J9Cv6kfL=M>*!jGs88kdb3D7vo()4v;uYa$-?Q
z5i<h=LlMv9AB;MT{F7Cg7O@I4Ffi~=KEtHP$T#^nlbJ1ue~ULhJ~=0`xHvgACnr9>
zNCu<{L})S=NrTw3AOd76Hv<DhF$)6&0|%1`V-d&XJZ4G8sEOz0>)RR97*p6&I9fQG
z8KYQJnX_0@IMW$Zm{OQixY8L@SW;M1xO>@B1i<R}Qutdqn;E0n+8J0FqS%8OGzE*;
z85kI<`1Ff2@(c8nGg6bY^Gi#>9xUQyU|<Mw(_|?Eg>Vtb1w}j{_wX_>FeEdALY;x3
zo&n@h5C+K?n=mjilrUs5E?`>7P|H-ql*J6<WwB&47Aci5EMQGxT*w&AP{LNiUc=DL
zl*N(8P{Y{A7|fu_<X6Q7bwgrNi6$pB{6N+Tfd~;0!4C>vj-u3*%%arfk|F^H28MdD
z`)_f;T&~GnBnnb00V1Rr7#Lt72@2IBaB!+HFfcfSf)f<33`|^%e2iR-RU+Z3NyV8Z
zslkaksd_Nesss^k(l0GYNi0dd#S-8j9HPkz4HR*Zlh|`pOEU6PiowBiizT_ZC~dM9
ztD73gfe`m`gVIDi!~{(?uoG`_6%^&ClqQ!<UdJLP&y-zWB#G6znhXpKUX%B*s--g(
zX@GnM3VBVAA~_IS9z-aB2vCwNQUtL;{wo6MDpCS*!5#+@u#f-;0w~r&VN}cpN>kcO
z>=KM%m-=aPPYz_0<|zWDwIWuK0c?{q+4LFNC(mRvGzSG4B9%f|AoFf<*yQG?l;)(`
Wf%FxFk_itZ52FMl4<iq=051UJAiBQ*

delta 911
zcmcb~_n()~iI<m)fq{YHthsDrFxNyr3C56#>I#7@xvWvFj0`CZDJ(f`x$IHwj12A!
zDXb}MEet7asqD?nQS9yvDeNg6Eet6fsjSV+QLHJP!3>&QFF}TBGTvgzC@Cq>WW2>*
zlv-GtT3j;mWFaH#WNXH|f~*V-47XU46N^fUm>C!tiZ~~0GU+h#Ob%mO#LCCOz`!&4
zFOwc4_hcPrGg}b<7H@ofa!z7#adK)-PJDckBuEp8&}1x<0I{V&1jtm7M~Yb(7#KL1
zL>P-$C(mb=WK5XEC|RG*2y%J~doNpxU^_z^V+v;qR|{t|V-#yDa~4YqcRFJVPYQDi
z3z9k^usZ$}0kAr@b_N!PDE43mP2nPt1yy4D#Toep`XFEEmlmWXmZZjK73b&OVgZpw
zY+x@2_y>oCxM{K$)w6?K$N>^$&rL1K$WJLQ;so(nl8cMd{E|V+LBR%62Ew3VDVAYi
zU?^cIVXR?jW?H~h!&t*q!(78s!@7{QmaT>@m_d`#Pm{Tb7i2QXMYjY%Ziz>7iza)K
z5Xcg)g8HKTl+xsq_{@}B>^YfvsbEH8N=kfTN#!l};?xodBPFxAASbc1NQ{Aj0T#BP
za4rG|unGeM1BeF>U<M`$#wwZc)TH9flGNbDoK!t@+p7c-A;bd>q9P^+28PKwtZqIC
zXLBQI)MNv@xJVV`DRmH`0rCJ-b~z3=X)`b|$W7*DQ>$n3^YaVQWGd1E>0$(VfTKtn
z#0CXpkt~P>vb;zR!~%Jx2&A`29>fLt3Y@B7o(B6D6sY113=GAfc;jG_U=(1HU<60L
zpC-pGmi(0be6W9RaptGwPhQ2wJ^2Wm4kOFtk8Fmfpu`9^5s3g9dW*v*H$SB`C)EyQ
PdNC-y@-TuSvj8suB(B9D

diff --git a/controllers/main.py b/controllers/main.py
index c0682e0..ac4fe92 100644
--- a/controllers/main.py
+++ b/controllers/main.py
@@ -1,8 +1,8 @@
 # Copyright 2021 Le Filament (<http://www.le-filament.com>)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo import http
 from odoo.http import request
+from odoo import http, _
 from odoo.addons.website_sale.controllers.main import WebsiteSale
 from odoo.addons.website_coupon.controllers.main import WebsiteCoupon
 
@@ -22,34 +22,9 @@ class WebsiteCoupon(WebsiteCoupon):
 
 class WebsiteSale(WebsiteSale):
 
-    @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True, csrf=False)
-    def cart_update_json(self, product_id, line_id=None, add_qty=None, set_qty=None, display=True):
-        res = super(WebsiteSale, self).cart_update_json(product_id, line_id, add_qty, set_qty, display)
-        return res
-
-    @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True, csrf=False)
-    def cart_update(self, product_id, add_qty=1, set_qty=0, **kw):
-        res = super(WebsiteSale, self).cart_update(product_id, add_qty, set_qty, **kw)
-        return res
-        # """This route is called when adding a product to cart (no options)."""
-        # sale_order = request.website.sale_get_order(force_create=True)
-        # if sale_order.state != 'draft':
-        #     request.session['sale_order_id'] = None
-        #     sale_order = request.website.sale_get_order(force_create=True)
-        #
-        # product_custom_attribute_values = None
-        # if kw.get('product_custom_attribute_values'):
-        #     product_custom_attribute_values = json.loads(kw.get('product_custom_attribute_values'))
-        #
-        # no_variant_attribute_values = None
-        # if kw.get('no_variant_attribute_values'):
-        #     no_variant_attribute_values = json.loads(kw.get('no_variant_attribute_values'))
-        #
-        # sale_order._cart_update(
-        #     product_id=int(product_id),
-        #     add_qty=add_qty,
-        #     set_qty=set_qty,
-        #     product_custom_attribute_values=product_custom_attribute_values,
-        #     no_variant_attribute_values=no_variant_attribute_values
-        # )
-        # return request.redirect("/shop/cart")
\ No newline at end of file
+    @http.route(['/shop/checkout'], type='http', auth="public", website=True, sitemap=False)
+    def checkout(self, **post):
+        order = request.website.sale_get_order()
+        if order.amount_total <= request.website.amount_limit:
+            return request.redirect('/shop/cart')
+        return super(WebsiteSale, self).checkout(**post)
diff --git a/models/__pycache__/__init__.cpython-37.pyc b/models/__pycache__/__init__.cpython-37.pyc
deleted file mode 100644
index d6bdf9acaa440179cb560a14ce285d0330310bbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 253
zcmZ?b<>g{vU|{%kMka9+0|Ucj5C?{t7#J8F7#J9eWf&M3QW#Pga~N_NqZk=MY^EHB
zT&5@{MursTU<OT=my8Sy44RC$go{#(<CF9A(lXQIi&INVGV{`lH5qTQm!~EbXO^V;
zX)@npC<2*V#LU3Ju#%yOm4N|5{EE>JElw>e*3T-)FHOlW)z44K&j%BRM*7L6#U=T<
z`ej9l$@%#OFghM;YJ72GPHKE|Vo^zaPG)XqiGFT=N@`BAetdjpUS>&ryk0@&Ee@O9
S{FKt1R67=shd?giVFUnewM8oc

diff --git a/models/__pycache__/res_config_settings.cpython-37.pyc b/models/__pycache__/res_config_settings.cpython-37.pyc
deleted file mode 100644
index 0014610850d374bf332de568851852643ef222df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 615
zcmZ?b<>g{vU|@K9Mkdjkje+4Yhy%kc3=9ko3=9m#S_}*fDGVu$ISjdsQH;4vQB1ka
zQOt}C?hGkRDa<VlDa@%%SuD-WQLHH}!3>(LFF__~GT&lL%S_ElDZa&)o1c=JQ+$g#
zu^=-UBnQK+FdGyY7#LC+q8L*cqL@+`qnJ}!vRFZ8r?8~3_A*DYrLYAvXtLiD3`#9_
z&d*EBOb<>iDap)BFRl_UN-fq)28-zx!vxiR^Ycm)^GXzQGxIWYOLG+p@=J>p3KENp
zQ;QT5OBD(dGgEU@^Gd43%TtqzGfPtAGgI^ubMs5{O5$@eb2CfaK&~$?Day=Czr|jZ
znv+<PnsSSyC^a!9KQE`!Pm}!?M|^x<Vs2`D{4K8d_}u)I(i{+*CqBNgG%*J%!x5jE
zmyueOSyIHrz`$^e)h#DKu_THI*`k#UMSKhl5aL(5erR!OQL%njL4IjUeyM(bN`5|=
zFf`InE-fy}&($w0N=(krFM!eUF!vWH=A_0aCl*27uMY`v{i4+3cu3&H!vaUIpt1-Q
z?(CqL<zQf7;9z87WnpAu1dIA<vfW|<*$Z}Z5i`hbpmcDHFQh0juQ)R`uf!J=nP9~T
Xr$bo$AYXFWKtjU~q^%g_aS>(!JQl9l

diff --git a/models/__pycache__/website.cpython-37.pyc b/models/__pycache__/website.cpython-37.pyc
deleted file mode 100644
index 173f3ad4ac12f84f0e2d39616a97550f0b76d7ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 507
zcmZ?b<>g{vU|=|OMketRD+9x05C?`?7#J8F7#J9ewHO!}QW#Pga~N_NqZo6UqL^}-
zqnH^P+!<1sQkYv9QkYYjvRIm#qgYc|f*CYfUxG}~WWL3gmYJH9QhbXoH$Npcr}!3g
zVnJpyNDhXXVKzuHFfgPtL@}l?L@}i>Mlq+dEMQGxTF4m1mcks&pviKJJv=q3II|@6
z7JE5_QKjyipI4HYSE7)cnU|ScnyXNdUs|M4kXT%tTBMLzs!))anVOrLSK_D1ev2bM
zJ})shH9r0pSA2YKeoAQ$h|LopUs#%$1C`;3&&<n6Ey^q@Vq#!mxW($0lb={}izhKR
zzcjBTJ|{Cbvt%Vh5ibJ+g!mP$A6lGRRIHy>kYAdTU#g#<lAjMI42|@YON&eLbM?!L
z5|i`u3t)6S)amiXi8-n9$%#c!WA!1yqYstVE2u1DWnf@n2L(MS4mcQDSivHGnrydN
qK=y#0SOf~aB9MYxtiGTC2CG515W?aEd4|IV;%PgO>SB=pM3@1<v4_b3

diff --git a/models/product.py b/models/product.py
deleted file mode 100755
index dc72c56..0000000
--- a/models/product.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# © 2021 Le Filament (<http://www.le-filament.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from odoo import api, fields, models
-
-
-class ProductTempleate(models.Model):
-    _inherit = "product.template"
-
-    is_coupon = fields.Boolean('Est une artilce type coupon')
\ No newline at end of file
diff --git a/views/product_views.xml b/views/product_views.xml
deleted file mode 100755
index c0e994b..0000000
--- a/views/product_views.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-	<record model="ir.ui.view" id="product_template_form_view">
-        <field name="name">product.template.product.coupon.form</field>
-        <field name="model">product.template</field>
-        <field name="inherit_id" ref="website_sale.product_template_form_view"/>
-        <field name="arch" type="xml">
-            <div name="options" position="inside">
-                <div>
-                    <field name="is_coupon"/>
-                </div>
-            </div>
-        </field>
-    </record>
-
-</odoo>
\ No newline at end of file
diff --git a/views/template.xml b/views/template.xml
index 4e8bd57..8284bbb 100755
--- a/views/template.xml
+++ b/views/template.xml
@@ -2,18 +2,6 @@
 <odoo>
 
     <template id="cart" inherit_id="website_sale.cart">
-        <xpath expr="//a[hasclass('btn', 'btn-primary', 'float-right', 'd-none', 'd-xl-inline-block')]" position="replace">
-            <a role="button" t-if="website_sale_order and website_sale_order.website_order_line and not no_pass_payment" class="btn btn-primary float-right d-none d-xl-inline-block" href="/shop/checkout?express=1">
-                <span class="">Process Checkout</span>
-                <span class="fa fa-chevron-right" />
-            </a>
-        </xpath>
-        <xpath expr="//a[hasclass('btn', 'btn-primary', 'float-right')]" position="replace">
-            <a role="button" t-if="website_sale_order and website_sale_order.website_order_line and not no_pass_payment" class="btn btn-primary float-right" href="/shop/checkout?express=1">
-                <span class="">Process Checkout</span>
-                <span class="fa fa-chevron-right" />
-            </a>
-        </xpath>
 
         <xpath expr="//div[hasclass('mt8', 'mb8', 'alert', 'alert-info')]" position="before">
             <div t-if="no_pass_payment" class="alert alert-danger" role="alert">
@@ -24,12 +12,4 @@
         </xpath>
     </template>
 
-    <template id="short_cart_summary" inherit_id="website_sale.short_cart_summary">
-        <xpath expr="//a[hasclass('btn', 'btn-secondary', 'float-right', 'd-none', 'd-xl-inline-block')]" position="replace">
-            <a role="button" t-if="website_sale_order and website_sale_order.website_order_line and not no_pass_payment" class="btn btn-secondary float-right d-none d-xl-inline-block" href="/shop/checkout?express=1">
-                <span>Process Checkout</span>
-            </a>
-        </xpath>
-    </template>
-
 </odoo>
\ No newline at end of file
-- 
GitLab