Compare commits

..

No commits in common. "master" and "upstream" have entirely different histories.

36 changed files with 399 additions and 871 deletions

706
COPYING
View File

@ -1,674 +1,32 @@
GNU GENERAL PUBLIC LICENSE Copyright 2014-2016 Raphael Michel
Version 3, 29 June 2007
Licensed under the Apache License, Version 2.0 (the "License");
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> you may not use this file except in compliance with the License.
Everyone is permitted to copy and distribute verbatim copies You may obtain a copy of the License at
of this license document, but changing it is not allowed.
http://www.apache.org/licenses/LICENSE-2.0
Preamble
Unless required by applicable law or agreed to in writing, software
The GNU General Public License is a free, copyleft license for distributed under the License is distributed on an "AS IS" BASIS,
software and other kinds of works. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
The licenses for most software and other practical works are designed limitations under the License.
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to This project includes the work of others, namely:
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the * Django, (c) Django Software Foundation and contributors, BSD License
GNU General Public License for most of our software; it applies also to * Font Awesome, (c) Dave Gandy, SIL Open Font License and MIT License
any other work released this way by its authors. You can apply it to * Bootstrap, (c) Twitter, Inc., MIT License
your programs, too. * jQuery, (c) jQuery Foundation and contributors, MIT License
* django-formset-js, (c) Ionata Web Solutions, BSD License
When we speak of free software, we are referring to freedom, not * CleanerVersion, (c) Jean-Christophe Zulian, Brian King, Andrea Marcacci, Manuel Jeckelmann, Apache License
price. Our General Public Licenses are designed to make sure that you * django-bootstrap3, (c) Dylan Verheul, Apache License
have the freedom to distribute copies of free software (and charge for * pytz, (c) Stuart Bishop, MIT License
them if you wish), that you receive source code or can get it if you * python-dateutil, (c) Yaron de Leeuw, BSD License
want it, that you can change the software or use pieces of it in new * startbootstrap-sb-admin-2, (c) Iron Summit Media Strategies, LLC, Apache License
free programs, and that you know you can do these things. * metismenu, (c) Osman Nuri Okumus, MIT License
* easy-thumbnails, (c) Chris Beaven and contributors
To protect your rights, we need to prevent others from denying you * reportlab, (c) ReportLab Europe Ltd, BSD License
these rights or asking you to surrender the rights. Therefore, you have * django-compressor, (c) Jannis Leidel and contributors, MIT License
certain responsibilities if you distribute copies of the software, or if * static3, (c) Roman Mohr and contributors, LGPL License
you modify it: responsibilities to respect the freedom of others. * Lightbox, (c) Lokesh Dhakar, MIT License
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

View File

@ -1,6 +0,0 @@
# pretix-stripe2
[Stripe](https://stripe.com/) payment processor integration for [Pretix](https://pretix.eu/) which uses global (rather than per-event) publishable and secret API keys.
Copyright © Pretix Contributors. Adapted under the Apache Licence v2.0.
Copyright © 2020 Lee Yingtong Li (RunasSudo). Licensed under the GNU GPL v3.0 or later.

View File

@ -1,46 +0,0 @@
import os
from distutils.command.build import build
from django.core import management
from setuptools import find_packages, setup
from pretix_stripe2 import __version__
try:
with open(os.path.join(os.path.dirname(__file__), 'README.rst'), encoding='utf-8') as f:
long_description = f.read()
except:
long_description = ''
class CustomBuild(build):
def run(self):
management.call_command('compilemessages', verbosity=1)
build.run(self)
cmdclass = {
'build': CustomBuild
}
setup(
name='pretix_stripe2',
version=__version__,
description='Stripe',
long_description=long_description,
url='https://yingtongli.me',
author='Lee Yingtong Li',
author_email='yli@yingtongli.me',
license='GPLv3+',
install_requires=[],
packages=find_packages(exclude=['tests', 'tests.*']),
include_package_data=True,
cmdclass=cmdclass,
entry_points="""
[pretix.plugin]
pretix_stripe2=pretix_stripe2:PretixPluginMeta
""",
)

View File

@ -2,17 +2,17 @@ from django.apps import AppConfig
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
__version__ = '1.0' from pretix import __version__ as version
class StripeApp(AppConfig): class StripeApp(AppConfig):
name = 'pretix_stripe2' name = 'pretix.plugins.stripe'
verbose_name = _("Stripe2") verbose_name = _("Stripe")
class PretixPluginMeta: class PretixPluginMeta:
name = _("Stripe2") name = _("Stripe")
author = _("Lee Yingtong Li") author = _("the pretix team")
version = __version__ version = version
category = 'PAYMENT' category = 'PAYMENT'
description = _("This plugin allows you to receive credit card payments " + description = _("This plugin allows you to receive credit card payments " +
"via Stripe") "via Stripe")
@ -30,4 +30,4 @@ class StripeApp(AppConfig):
return errs return errs
default_app_config = 'pretix_stripe2.StripeApp' default_app_config = 'pretix.plugins.stripe.StripeApp'

View File

@ -18,7 +18,7 @@ class Command(BaseCommand):
self.stderr.write(self.style.ERROR("Stripe Connect is not set up!")) self.stderr.write(self.style.ERROR("Stripe Connect is not set up!"))
return return
for e in Event.objects.filter(plugins__icontains="pretix_stripe2"): for e in Event.objects.filter(plugins__icontains="pretix.plugins.stripe"):
uid = e.settings.payment_stripe_connect_user_id uid = e.settings.payment_stripe_connect_user_id
if uid and not e.settings.payment_stripe_merchant_country: if uid and not e.settings.payment_stripe_merchant_country:
if uid in cache: if uid in cache:

View File

@ -16,7 +16,7 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='ReferencedStripe2Object', name='ReferencedStripeObject',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('reference', models.CharField(db_index=True, max_length=190, unique=True)), ('reference', models.CharField(db_index=True, max_length=190, unique=True)),

View File

@ -10,12 +10,12 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('pretixbase', '0096_auto_20180722_0801'), ('pretixbase', '0096_auto_20180722_0801'),
('pretix_stripe2', '0001_initial'), ('stripe', '0001_initial'),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='referencedstripe2object', model_name='referencedstripeobject',
name='payment', name='payment',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.OrderPayment'), field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='pretixbase.OrderPayment'),
), ),

View File

@ -6,12 +6,12 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('pretix_stripe2', '0002_referencedstripe2object_payment'), ('stripe', '0002_referencedstripeobject_payment'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='RegisteredStripe2ApplePayDomain', name='RegisteredApplePayDomain',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('domain', models.CharField(max_length=190)), ('domain', models.CharField(max_length=190)),

View File

@ -1,12 +1,12 @@
from django.db import models from django.db import models
class ReferencedStripe2Object(models.Model): class ReferencedStripeObject(models.Model):
reference = models.CharField(max_length=190, db_index=True, unique=True) reference = models.CharField(max_length=190, db_index=True, unique=True)
order = models.ForeignKey('pretixbase.Order', on_delete=models.CASCADE) order = models.ForeignKey('pretixbase.Order', on_delete=models.CASCADE)
payment = models.ForeignKey('pretixbase.OrderPayment', null=True, blank=True, on_delete=models.CASCADE) payment = models.ForeignKey('pretixbase.OrderPayment', null=True, blank=True, on_delete=models.CASCADE)
class RegisteredStripe2ApplePayDomain(models.Model): class RegisteredApplePayDomain(models.Model):
domain = models.CharField(max_length=190) domain = models.CharField(max_length=190)
account = models.CharField(max_length=190) account = models.CharField(max_length=190)

View File

@ -30,34 +30,71 @@ from pretix.base.services.mail import SendMailException
from pretix.base.settings import SettingsSandbox from pretix.base.settings import SettingsSandbox
from pretix.helpers.urls import build_absolute_uri as build_global_uri from pretix.helpers.urls import build_absolute_uri as build_global_uri
from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
from pretix_stripe2.forms import StripeKeyValidator from pretix.plugins.stripe.forms import StripeKeyValidator
from pretix_stripe2.models import ( from pretix.plugins.stripe.models import (
ReferencedStripe2Object, RegisteredStripe2ApplePayDomain, ReferencedStripeObject, RegisteredApplePayDomain,
) )
from pretix_stripe2.tasks import ( from pretix.plugins.stripe.tasks import (
get_stripe_account_key, stripe_verify_domain, get_stripe_account_key, stripe_verify_domain,
) )
logger = logging.getLogger('pretix_stripe2') logger = logging.getLogger('pretix.plugins.stripe')
class StripeSettingsHolder(BasePaymentProvider): class StripeSettingsHolder(BasePaymentProvider):
identifier = 'stripe_settings' identifier = 'stripe_settings'
verbose_name = _('Stripe2') verbose_name = _('Stripe')
is_enabled = False is_enabled = False
is_meta = True is_meta = True
def __init__(self, event: Event): def __init__(self, event: Event):
super().__init__(event) super().__init__(event)
self.settings = SettingsSandbox('payment', 'stripe2', event) self.settings = SettingsSandbox('payment', 'stripe', event)
def get_connect_url(self, request):
request.session['payment_stripe_oauth_event'] = request.event.pk
if 'payment_stripe_oauth_token' not in request.session:
request.session['payment_stripe_oauth_token'] = get_random_string(32)
return (
"https://connect.stripe.com/oauth/authorize?response_type=code&client_id={}&state={}"
"&scope=read_write&redirect_uri={}"
).format(
self.settings.connect_client_id,
request.session['payment_stripe_oauth_token'],
urllib.parse.quote(build_global_uri('plugins:stripe:oauth.return')),
)
def settings_content_render(self, request): def settings_content_render(self, request):
return "<div class='alert alert-info'>%s<br /><code>%s</code></div>" % ( if self.settings.connect_client_id and not self.settings.secret_key:
_('Please configure a <a href="https://dashboard.stripe.com/account/webhooks">Stripe Webhook</a> to ' # Use Stripe connect
'the following endpoint in order to automatically cancel orders when charges are refunded externally ' if not self.settings.connect_user_id:
'and to process asynchronous payment methods like SOFORT.'), return (
build_global_uri('plugins:pretix_stripe2:webhook') "<p>{}</p>"
) "<a href='{}' class='btn btn-primary btn-lg'>{}</a>"
).format(
_('To accept payments via Stripe, you will need an account at Stripe. By clicking on the '
'following button, you can either create a new Stripe account connect pretix to an existing '
'one.'),
self.get_connect_url(request),
_('Connect with Stripe')
)
else:
return (
"<button formaction='{}' class='btn btn-danger'>{}</button>"
).format(
reverse('plugins:stripe:oauth.disconnect', kwargs={
'organizer': self.event.organizer.slug,
'event': self.event.slug,
}),
_('Disconnect from Stripe')
)
else:
return "<div class='alert alert-info'>%s<br /><code>%s</code></div>" % (
_('Please configure a <a href="https://dashboard.stripe.com/account/webhooks">Stripe Webhook</a> to '
'the following endpoint in order to automatically cancel orders when charges are refunded externally '
'and to process asynchronous payment methods like SOFORT.'),
build_global_uri('plugins:stripe:webhook')
)
@property @property
def settings_form_fields(self): def settings_form_fields(self):
@ -85,20 +122,60 @@ class StripeSettingsHolder(BasePaymentProvider):
else: else:
moto_settings = [] moto_settings = []
fields = [ if self.settings.connect_client_id and not self.settings.secret_key:
('endpoint', # Stripe connect
forms.ChoiceField( if self.settings.connect_user_id:
label=_('Endpoint'), fields = [
initial='live', ('connect_user_name',
choices=( forms.CharField(
('live', pgettext('stripe', 'Live')), label=_('Stripe account'),
('test', pgettext('stripe', 'Testing')), disabled=True
), )),
help_text=_('If your event is in test mode, we will always use Stripe\'s test API, ' ('endpoint',
'regardless of this setting.') forms.ChoiceField(
)), label=_('Endpoint'),
] initial='live',
choices=(
('live', pgettext('stripe', 'Live')),
('test', pgettext('stripe', 'Testing')),
),
help_text=_('If your event is in test mode, we will always use Stripe\'s test API, '
'regardless of this setting.')
)),
]
else:
return {}
else:
allcountries = list(countries)
allcountries.insert(0, ('', _('Select country')))
fields = [
('publishable_key',
forms.CharField(
label=_('Publishable key'),
help_text=_('<a target="_blank" rel="noopener" href="{docs_url}">{text}</a>').format(
text=_('Click here for a tutorial on how to obtain the required keys'),
docs_url='https://docs.pretix.eu/en/latest/user/payments/stripe.html'
),
validators=(
StripeKeyValidator('pk_'),
),
)),
('secret_key',
forms.CharField(
label=_('Secret key'),
validators=(
StripeKeyValidator(['sk_', 'rk_']),
),
)),
('merchant_country',
forms.ChoiceField(
choices=allcountries,
label=_('Merchant country'),
help_text=_('The country in which your Stripe-account is registered in. Usually, this is your '
'country of residence.'),
)),
]
d = OrderedDict( d = OrderedDict(
fields + [ fields + [
('method_cc', ('method_cc',
@ -188,11 +265,15 @@ class StripeMethod(BasePaymentProvider):
def __init__(self, event: Event): def __init__(self, event: Event):
super().__init__(event) super().__init__(event)
self.settings = SettingsSandbox('payment', 'stripe2', event) self.settings = SettingsSandbox('payment', 'stripe', event)
@property @property
def test_mode_message(self): def test_mode_message(self):
if not (self.settings.get('endpoint', 'live') == 'live' and not self.event.testmode): if self.settings.connect_client_id and not self.settings.secret_key:
is_testmode = True
else:
is_testmode = '_test_' in self.settings.secret_key
if is_testmode:
return mark_safe( return mark_safe(
_('The Stripe plugin is operating in test mode. You can use one of <a {args}>many test ' _('The Stripe plugin is operating in test mode. You can use one of <a {args}>many test '
'cards</a> to perform a transaction. No money will actually be transferred.').format( 'cards</a> to perform a transaction. No money will actually be transferred.').format(
@ -230,6 +311,20 @@ class StripeMethod(BasePaymentProvider):
def _get_amount(self, payment): def _get_amount(self, payment):
return self._decimal_to_int(payment.amount) return self._decimal_to_int(payment.amount)
def _connect_kwargs(self, payment):
d = {}
if self.settings.connect_client_id and self.settings.connect_user_id:
fee = Decimal('0.00')
if self.settings.get('connect_app_fee_percent', as_type=Decimal):
fee = round_decimal(self.settings.get('connect_app_fee_percent', as_type=Decimal) * payment.amount / Decimal('100.00'), self.event.currency)
if self.settings.connect_app_fee_max:
fee = min(fee, self.settings.get('connect_app_fee_max', as_type=Decimal))
if self.settings.get('connect_app_fee_min', as_type=Decimal):
fee = max(fee, self.settings.get('connect_app_fee_min', as_type=Decimal))
if fee:
d['application_fee_amount'] = self._decimal_to_int(fee)
return d
def statement_descriptor(self, payment, length=22): def statement_descriptor(self, payment, length=22):
return '{event}-{code} {eventname}'.format( return '{event}-{code} {eventname}'.format(
event=self.event.slug.upper(), event=self.event.slug.upper(),
@ -239,13 +334,20 @@ class StripeMethod(BasePaymentProvider):
@property @property
def api_kwargs(self): def api_kwargs(self):
if self.settings.get('endpoint', 'live') == 'live' and not self.event.testmode: if self.settings.connect_client_id and self.settings.connect_user_id:
kwargs = { if self.settings.get('endpoint', 'live') == 'live' and not self.event.testmode:
'api_key': self.settings.secret_key, kwargs = {
} 'api_key': self.settings.connect_secret_key,
'stripe_account': self.settings.connect_user_id
}
else:
kwargs = {
'api_key': self.settings.connect_test_secret_key,
'stripe_account': self.settings.connect_user_id
}
else: else:
kwargs = { kwargs = {
'api_key': self.settings.test_secret_key, 'api_key': self.settings.secret_key,
} }
return kwargs return kwargs
@ -259,7 +361,7 @@ class StripeMethod(BasePaymentProvider):
) )
def checkout_confirm_render(self, request) -> str: def checkout_confirm_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_confirm.html') template = get_template('pretixplugins/stripe/checkout_payment_confirm.html')
ctx = {'request': request, 'event': self.event, 'settings': self.settings, 'provider': self} ctx = {'request': request, 'event': self.event, 'settings': self.settings, 'provider': self}
return template.render(ctx) return template.render(ctx)
@ -272,6 +374,7 @@ class StripeMethod(BasePaymentProvider):
if not source.startswith('src_'): if not source.startswith('src_'):
params['statement_descriptor'] = self.statement_descriptor(payment) params['statement_descriptor'] = self.statement_descriptor(payment)
params.update(self.api_kwargs) params.update(self.api_kwargs)
params.update(self._connect_kwargs(payment))
charge = stripe.Charge.create( charge = stripe.Charge.create(
amount=self._get_amount(payment), amount=self._get_amount(payment),
currency=self.event.currency.lower(), currency=self.event.currency.lower(),
@ -317,7 +420,7 @@ class StripeMethod(BasePaymentProvider):
raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch ' raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch '
'with us if this problem persists.')) 'with us if this problem persists.'))
else: else:
ReferencedStripe2Object.objects.get_or_create( ReferencedStripeObject.objects.get_or_create(
reference=charge.id, reference=charge.id,
defaults={'order': payment.order, 'payment': payment} defaults={'order': payment.order, 'payment': payment}
) )
@ -348,7 +451,7 @@ class StripeMethod(BasePaymentProvider):
payment_info = json.loads(payment.info) payment_info = json.loads(payment.info)
else: else:
payment_info = None payment_info = None
template = get_template('pretixplugins/stripe2/pending.html') template = get_template('pretixplugins/stripe/pending.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -377,7 +480,7 @@ class StripeMethod(BasePaymentProvider):
payment_info['amount'] /= 10 ** settings.CURRENCY_PLACES.get(self.event.currency, 2) payment_info['amount'] /= 10 ** settings.CURRENCY_PLACES.get(self.event.currency, 2)
else: else:
payment_info = None payment_info = None
template = get_template('pretixplugins/stripe2/control.html') template = get_template('pretixplugins/stripe/control.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -450,7 +553,7 @@ class StripeMethod(BasePaymentProvider):
raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch ' raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch '
'with us if this problem persists.')) 'with us if this problem persists.'))
ReferencedStripe2Object.objects.get_or_create( ReferencedStripeObject.objects.get_or_create(
reference=source.id, reference=source.id,
defaults={'order': payment.order, 'payment': payment} defaults={'order': payment.order, 'payment': payment}
) )
@ -464,7 +567,7 @@ class StripeMethod(BasePaymentProvider):
if request.session.get('iframe_session', False): if request.session.get('iframe_session', False):
signer = signing.Signer(salt='safe-redirect') signer = signing.Signer(salt='safe-redirect')
return ( return (
build_absolute_uri(request.event, 'plugins:pretix_stripe2:redirect') + '?url=' + build_absolute_uri(request.event, 'plugins:stripe:redirect') + '?url=' +
urllib.parse.quote(signer.sign(url)) urllib.parse.quote(signer.sign(url))
) )
else: else:
@ -504,7 +607,7 @@ class StripeMethod(BasePaymentProvider):
obj.save(update_fields=['info']) obj.save(update_fields=['info'])
for le in obj.order.all_logentries().filter( for le in obj.order.all_logentries().filter(
action_type="pretix_stripe2.event" action_type="pretix.plugins.stripe.event"
).exclude(data="", shredded=True): ).exclude(data="", shredded=True):
d = le.parsed_data d = le.parsed_data
if 'data' in d: if 'data' in d:
@ -524,10 +627,10 @@ class StripeCC(StripeMethod):
def payment_form_render(self, request, total) -> str: def payment_form_render(self, request, total) -> str:
account = get_stripe_account_key(self) account = get_stripe_account_key(self)
if not RegisteredStripe2ApplePayDomain.objects.filter(account=account, domain=request.host).exists(): if not RegisteredApplePayDomain.objects.filter(account=account, domain=request.host).exists():
stripe_verify_domain.apply_async(args=(self.event.pk, request.host)) stripe_verify_domain.apply_async(args=(self.event.pk, request.host))
template = get_template('pretixplugins/stripe2/checkout_payment_form_cc.html') template = get_template('pretixplugins/stripe/checkout_payment_form_cc.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -576,6 +679,7 @@ class StripeCC(StripeMethod):
try: try:
if self.payment_is_valid_session(request): if self.payment_is_valid_session(request):
params = {} params = {}
params.update(self._connect_kwargs(payment))
params.update(self.api_kwargs) params.update(self.api_kwargs)
if self.is_moto(request, payment): if self.is_moto(request, payment):
@ -605,7 +709,7 @@ class StripeCC(StripeMethod):
}, },
# TODO: Is this sufficient? # TODO: Is this sufficient?
idempotency_key=str(self.event.id) + payment.order.code + request.session['payment_stripe_payment_method_id'], idempotency_key=str(self.event.id) + payment.order.code + request.session['payment_stripe_payment_method_id'],
return_url=build_absolute_uri(self.event, 'plugins:pretix_stripe2:sca.return', kwargs={ return_url=build_absolute_uri(self.event, 'plugins:stripe:sca.return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -652,7 +756,7 @@ class StripeCC(StripeMethod):
raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch ' raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch '
'with us if this problem persists.')) 'with us if this problem persists.'))
else: else:
ReferencedStripe2Object.objects.get_or_create( ReferencedStripeObject.objects.get_or_create(
reference=intent.id, reference=intent.id,
defaults={'order': payment.order, 'payment': payment} defaults={'order': payment.order, 'payment': payment}
) )
@ -660,7 +764,7 @@ class StripeCC(StripeMethod):
payment.info = str(intent) payment.info = str(intent)
payment.state = OrderPayment.PAYMENT_STATE_CREATED payment.state = OrderPayment.PAYMENT_STATE_CREATED
payment.save() payment.save()
return build_absolute_uri(self.event, 'plugins:pretix_stripe2:sca', kwargs={ return build_absolute_uri(self.event, 'plugins:stripe:sca', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -707,7 +811,7 @@ class StripeCC(StripeMethod):
intent = stripe.PaymentIntent.confirm( intent = stripe.PaymentIntent.confirm(
payment_info['id'], payment_info['id'],
return_url=build_absolute_uri(self.event, 'plugins:pretix_stripe2:sca.return', kwargs={ return_url=build_absolute_uri(self.event, 'plugins:stripe:sca.return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -754,7 +858,7 @@ class StripeGiropay(StripeMethod):
method = 'giropay' method = 'giropay'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -785,7 +889,7 @@ class StripeGiropay(StripeMethod):
}, },
statement_descriptor=self.statement_descriptor(payment, 35), statement_descriptor=self.statement_descriptor(payment, 35),
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -818,7 +922,7 @@ class StripeIdeal(StripeMethod):
method = 'ideal' method = 'ideal'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple_noform.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple_noform.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -838,7 +942,7 @@ class StripeIdeal(StripeMethod):
}, },
statement_descriptor=self.statement_descriptor(payment), statement_descriptor=self.statement_descriptor(payment),
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -862,7 +966,7 @@ class StripeAlipay(StripeMethod):
method = 'alipay' method = 'alipay'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple_noform.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple_noform.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -881,7 +985,7 @@ class StripeAlipay(StripeMethod):
'code': payment.order.code 'code': payment.order.code
}, },
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -905,7 +1009,7 @@ class StripeBancontact(StripeMethod):
method = 'bancontact' method = 'bancontact'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -936,7 +1040,7 @@ class StripeBancontact(StripeMethod):
}, },
statement_descriptor=self.statement_descriptor(payment, 35), statement_descriptor=self.statement_descriptor(payment, 35),
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -969,7 +1073,7 @@ class StripeSofort(StripeMethod):
method = 'sofort' method = 'sofort'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -1005,7 +1109,7 @@ class StripeSofort(StripeMethod):
'country': request.session.get('payment_stripe_sofort_bank_country'), 'country': request.session.get('payment_stripe_sofort_bank_country'),
}, },
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -1038,7 +1142,7 @@ class StripeEPS(StripeMethod):
method = 'eps' method = 'eps'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -1069,7 +1173,7 @@ class StripeEPS(StripeMethod):
}, },
statement_descriptor=self.statement_descriptor(payment), statement_descriptor=self.statement_descriptor(payment),
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -1102,7 +1206,7 @@ class StripeMultibanco(StripeMethod):
method = 'multibanco' method = 'multibanco'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple_noform.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple_noform.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -1125,7 +1229,7 @@ class StripeMultibanco(StripeMethod):
'email': payment.order.email 'email': payment.order.email
}, },
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -1149,7 +1253,7 @@ class StripePrzelewy24(StripeMethod):
method = 'przelewy24' method = 'przelewy24'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple_noform.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple_noform.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -1173,7 +1277,7 @@ class StripePrzelewy24(StripeMethod):
}, },
statement_descriptor=self.statement_descriptor(payment, 35), statement_descriptor=self.statement_descriptor(payment, 35),
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -1197,7 +1301,7 @@ class StripeWeChatPay(StripeMethod):
method = 'wechatpay' method = 'wechatpay'
def payment_form_render(self, request) -> str: def payment_form_render(self, request) -> str:
template = get_template('pretixplugins/stripe2/checkout_payment_form_simple_noform.html') template = get_template('pretixplugins/stripe/checkout_payment_form_simple_noform.html')
ctx = { ctx = {
'request': request, 'request': request,
'event': self.event, 'event': self.event,
@ -1218,7 +1322,7 @@ class StripeWeChatPay(StripeMethod):
}, },
statement_descriptor=self.statement_descriptor(payment, 32), statement_descriptor=self.statement_descriptor(payment, 32),
redirect={ redirect={
'return_url': build_absolute_uri(self.event, 'plugins:pretix_stripe2:return', kwargs={ 'return_url': build_absolute_uri(self.event, 'plugins:stripe:return', kwargs={
'order': payment.order.code, 'order': payment.order.code,
'payment': payment.pk, 'payment': payment.pk,
'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(), 'hash': hashlib.sha1(payment.order.secret.lower().encode()).hexdigest(),
@ -1252,7 +1356,7 @@ class StripeWeChatPay(StripeMethod):
raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch ' raise PaymentException(_('We had trouble communicating with Stripe. Please try again and get in touch '
'with us if this problem persists.')) 'with us if this problem persists.'))
ReferencedStripe2Object.objects.get_or_create( ReferencedStripeObject.objects.get_or_create(
reference=source.id, reference=source.id,
defaults={'order': payment.order, 'payment': payment} defaults={'order': payment.order, 'payment': payment}
) )

View File

@ -14,11 +14,11 @@ from pretix.base.signals import (
requiredaction_display, requiredaction_display,
) )
from pretix.control.signals import nav_organizer from pretix.control.signals import nav_organizer
from pretix_stripe2.forms import StripeKeyValidator from pretix.plugins.stripe.forms import StripeKeyValidator
from pretix.presale.signals import html_head from pretix.presale.signals import html_head
@receiver(register_payment_providers, dispatch_uid="payment_stripe2") @receiver(register_payment_providers, dispatch_uid="payment_stripe")
def register_payment_provider(sender, **kwargs): def register_payment_provider(sender, **kwargs):
from .payment import ( from .payment import (
StripeSettingsHolder, StripeCC, StripeGiropay, StripeIdeal, StripeAlipay, StripeBancontact, StripeSettingsHolder, StripeCC, StripeGiropay, StripeIdeal, StripeAlipay, StripeBancontact,
@ -31,20 +31,20 @@ def register_payment_provider(sender, **kwargs):
] ]
@receiver(html_head, dispatch_uid="payment_stripe2_html_head") @receiver(html_head, dispatch_uid="payment_stripe_html_head")
def html_head_presale(sender, request=None, **kwargs): def html_head_presale(sender, request=None, **kwargs):
from .payment import StripeSettingsHolder from .payment import StripeSettingsHolder
provider = StripeSettingsHolder(sender) provider = StripeSettingsHolder(sender)
url = resolve(request.path_info) url = resolve(request.path_info)
if provider.settings.get('_enabled', as_type=bool) and ("checkout" in url.url_name or "order.pay" in url.url_name): if provider.settings.get('_enabled', as_type=bool) and ("checkout" in url.url_name or "order.pay" in url.url_name):
template = get_template('pretixplugins/stripe2/presale_head.html') template = get_template('pretixplugins/stripe/presale_head.html')
ctx = { ctx = {
'event': sender, 'event': sender,
'settings': provider.settings, 'settings': provider.settings,
'testmode': ( 'testmode': (
(provider.settings.get('endpoint', 'live') == 'test' or sender.testmode) (provider.settings.get('endpoint', 'live') == 'test' or sender.testmode)
and provider.settings.test_publishable_key and provider.settings.publishable_test_key
) )
} }
return template.render(ctx) return template.render(ctx)
@ -52,9 +52,9 @@ def html_head_presale(sender, request=None, **kwargs):
return "" return ""
@receiver(signal=logentry_display, dispatch_uid="stripe2_logentry_display") @receiver(signal=logentry_display, dispatch_uid="stripe_logentry_display")
def pretixcontrol_logentry_display(sender, logentry, **kwargs): def pretixcontrol_logentry_display(sender, logentry, **kwargs):
if logentry.action_type != 'pretix_stripe2.event': if logentry.action_type != 'pretix.plugins.stripe.event':
return return
data = json.loads(logentry.data) data = json.loads(logentry.data)
@ -85,70 +85,89 @@ def pretixcontrol_logentry_display(sender, logentry, **kwargs):
return _('Stripe reported an event: {}').format(text) return _('Stripe reported an event: {}').format(text)
settings_hierarkey.add_default('payment_stripe2_method_cc', True, bool) settings_hierarkey.add_default('payment_stripe_method_cc', True, bool)
settings_hierarkey.add_default('payment_stripe2_reseller_moto', False, bool) settings_hierarkey.add_default('payment_stripe_reseller_moto', False, bool)
@receiver(register_global_settings, dispatch_uid='stripe2_global_settings') @receiver(register_global_settings, dispatch_uid='stripe_global_settings')
def register_global_settings(sender, **kwargs): def register_global_settings(sender, **kwargs):
return OrderedDict([ return OrderedDict([
('payment_stripe2_secret_key', SecretKeySettingsField( ('payment_stripe_connect_client_id', forms.CharField(
label=_('Stripe2: Secret key'), label=_('Stripe Connect: Client ID'),
required=False,
validators=(
StripeKeyValidator('ca_'),
),
)),
('payment_stripe_connect_secret_key', SecretKeySettingsField(
label=_('Stripe Connect: Secret key'),
required=False, required=False,
validators=( validators=(
StripeKeyValidator(['sk_live_', 'rk_live_']), StripeKeyValidator(['sk_live_', 'rk_live_']),
), ),
)), )),
('payment_stripe2_publishable_key', forms.CharField( ('payment_stripe_connect_publishable_key', forms.CharField(
label=_('Stripe2: Publishable key'), label=_('Stripe Connect: Publishable key'),
required=False, required=False,
validators=( validators=(
StripeKeyValidator('pk_live_'), StripeKeyValidator('pk_live_'),
), ),
)), )),
('payment_stripe2_test_secret_key', SecretKeySettingsField( ('payment_stripe_connect_test_secret_key', SecretKeySettingsField(
label=_('Stripe2: Secret key (test)'), label=_('Stripe Connect: Secret key (test)'),
required=False, required=False,
validators=( validators=(
StripeKeyValidator(['sk_test_', 'rk_test_']), StripeKeyValidator(['sk_test_', 'rk_test_']),
), ),
)), )),
('payment_stripe2_test_publishable_key', forms.CharField( ('payment_stripe_connect_test_publishable_key', forms.CharField(
label=_('Stripe2: Publishable key (test)'), label=_('Stripe Connect: Publishable key (test)'),
required=False, required=False,
validators=( validators=(
StripeKeyValidator('pk_test_'), StripeKeyValidator('pk_test_'),
), ),
)) )),
('payment_stripe_connect_app_fee_percent', forms.DecimalField(
label=_('Stripe Connect: App fee (percent)'),
required=False,
)),
('payment_stripe_connect_app_fee_max', forms.DecimalField(
label=_('Stripe Connect: App fee (max)'),
required=False,
)),
('payment_stripe_connect_app_fee_min', forms.DecimalField(
label=_('Stripe Connect: App fee (min)'),
required=False,
)),
]) ])
@receiver(signal=requiredaction_display, dispatch_uid="stripe2_requiredaction_display") @receiver(signal=requiredaction_display, dispatch_uid="stripe_requiredaction_display")
def pretixcontrol_action_display(sender, action, request, **kwargs): def pretixcontrol_action_display(sender, action, request, **kwargs):
# DEPRECATED # DEPRECATED
if not action.action_type.startswith('pretix_stripe2'): if not action.action_type.startswith('pretix.plugins.stripe'):
return return
data = json.loads(action.data) data = json.loads(action.data)
if action.action_type == 'pretix_stripe2.refund': if action.action_type == 'pretix.plugins.stripe.refund':
template = get_template('pretixplugins/stripe2/action_refund.html') template = get_template('pretixplugins/stripe/action_refund.html')
elif action.action_type == 'pretix_stripe2.overpaid': elif action.action_type == 'pretix.plugins.stripe.overpaid':
template = get_template('pretixplugins/stripe2/action_overpaid.html') template = get_template('pretixplugins/stripe/action_overpaid.html')
elif action.action_type == 'pretix_stripe2.double': elif action.action_type == 'pretix.plugins.stripe.double':
template = get_template('pretixplugins/stripe2/action_double.html') template = get_template('pretixplugins/stripe/action_double.html')
ctx = {'data': data, 'event': sender, 'action': action} ctx = {'data': data, 'event': sender, 'action': action}
return template.render(ctx, request) return template.render(ctx, request)
@receiver(nav_organizer, dispatch_uid="stripe2_nav_organizer") @receiver(nav_organizer, dispatch_uid="stripe_nav_organizer")
def nav_o(sender, request, organizer, **kwargs): def nav_o(sender, request, organizer, **kwargs):
if request.user.has_active_staff_session(request.session.session_key): if request.user.has_active_staff_session(request.session.session_key):
url = resolve(request.path_info) url = resolve(request.path_info)
return [{ return [{
'label': _('Stripe Connect'), 'label': _('Stripe Connect'),
'url': reverse('plugins:pretix_stripe2:settings.connect', kwargs={ 'url': reverse('plugins:stripe:settings.connect', kwargs={
'organizer': request.organizer.slug 'organizer': request.organizer.slug
}), }),
'parent': reverse('control:organizer.edit', kwargs={ 'parent': reverse('control:organizer.edit', kwargs={

View File

@ -7,7 +7,7 @@ from django.conf import settings
from pretix.base.services.tasks import EventTask from pretix.base.services.tasks import EventTask
from pretix.celery_app import app from pretix.celery_app import app
from pretix.multidomain.urlreverse import get_event_domain from pretix.multidomain.urlreverse import get_event_domain
from pretix_stripe2.models import RegisteredStripe2ApplePayDomain from pretix.plugins.stripe.models import RegisteredApplePayDomain
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -29,11 +29,11 @@ def get_stripe_account_key(prov):
@app.task(base=EventTask, max_retries=5, default_retry_delay=1) @app.task(base=EventTask, max_retries=5, default_retry_delay=1)
def stripe_verify_domain(event, domain): def stripe_verify_domain(event, domain):
from pretix_stripe2.payment import StripeCC from pretix.plugins.stripe.payment import StripeCC
prov = StripeCC(event) prov = StripeCC(event)
account = get_stripe_account_key(prov) account = get_stripe_account_key(prov)
if RegisteredStripe2ApplePayDomain.objects.filter(account=account, domain=domain).exists(): if RegisteredApplePayDomain.objects.filter(account=account, domain=domain).exists():
return return
try: try:
@ -45,7 +45,7 @@ def stripe_verify_domain(event, domain):
logger.exception('Could not verify domain with Stripe') logger.exception('Could not verify domain with Stripe')
else: else:
if resp.livemode: if resp.livemode:
RegisteredStripe2ApplePayDomain.objects.create( RegisteredApplePayDomain.objects.create(
domain=domain, domain=domain,
account=account account=account
) )

View File

@ -10,7 +10,7 @@
You need to confirm your payment. Please click the link below to do so or start a new payment. You need to confirm your payment. Please click the link below to do so or start a new payment.
{% endblocktrans %} {% endblocktrans %}
<div class="text-right flip"> <div class="text-right flip">
<a href="{% eventurl event "plugins:pretix_stripe2:sca" order=order.code payment=payment.pk hash=payment_hash %}" <a href="{% eventurl event "plugins:stripe:sca" order=order.code payment=payment.pk hash=payment_hash %}"
class="btn btn-primary"> class="btn btn-primary">
{% trans "Confirm payment" %} {% trans "Confirm payment" %}
</a> </a>

View File

@ -3,13 +3,13 @@
{% load i18n %} {% load i18n %}
{% compress js %} {% compress js %}
<script type="text/javascript" src="{% static "pretixplugins/stripe2/pretix-stripe.js" %}"></script> <script type="text/javascript" src="{% static "pretixplugins/stripe/pretix-stripe.js" %}"></script>
{% endcompress %} {% endcompress %}
{% compress css %} {% compress css %}
<link type="text/css" rel="stylesheet" href="{% static "pretixplugins/stripe2/pretix-stripe.css" %}"> <link type="text/css" rel="stylesheet" href="{% static "pretixplugins/stripe/pretix-stripe.css" %}">
{% endcompress %} {% endcompress %}
{% if testmode %} {% if testmode %}
<script type="text/plain" id="stripe_pubkey">{{ settings.test_publishable_key }}</script> <script type="text/plain" id="stripe_pubkey">{{ settings.publishable_test_key }}</script>
{% else %} {% else %}
<script type="text/plain" id="stripe_pubkey">{{ settings.publishable_key }}</script> <script type="text/plain" id="stripe_pubkey">{{ settings.publishable_key }}</script>
{% endif %} {% endif %}

View File

@ -5,7 +5,7 @@
{% block title %}{% trans "Pay order" %}{% endblock %} {% block title %}{% trans "Pay order" %}{% endblock %}
{% block custom_header %} {% block custom_header %}
{{ block.super }} {{ block.super }}
{% include "pretixplugins/stripe2/presale_head.html" with settings=stripe_settings %} {% include "pretixplugins/stripe/presale_head.html" with settings=stripe_settings %}
<script type="text/plain" id="stripe_payment_intent_client_secret">{{ payment_intent_client_secret }}</script> <script type="text/plain" id="stripe_payment_intent_client_secret">{{ payment_intent_client_secret }}</script>
<script type="text/plain" id="stripe_payment_intent_next_action_redirect_url">{{ payment_intent_next_action_redirect_url }}</script> <script type="text/plain" id="stripe_payment_intent_next_action_redirect_url">{{ payment_intent_next_action_redirect_url }}</script>
{% endblock %} {% endblock %}

View File

@ -6,7 +6,7 @@
{% block title %}{% trans "Pay order" %}{% endblock %} {% block title %}{% trans "Pay order" %}{% endblock %}
{% block custom_header %} {% block custom_header %}
{{ block.super }} {{ block.super }}
{% include "pretixplugins/stripe2/presale_head.html" with settings=stripe_settings %} {% include "pretixplugins/stripe/presale_head.html" with settings=stripe_settings %}
<script type="text/plain" id="stripe_payment_intent_SCA_status">3DS-authentication-complete</script> <script type="text/plain" id="stripe_payment_intent_SCA_status">3DS-authentication-complete</script>
<script type="text/plain" id="order_status">{{ order.status }}</script> <script type="text/plain" id="order_status">{{ order.status }}</script>
{% endblock %} {% endblock %}

View File

@ -9,7 +9,7 @@ from .views import (
) )
event_patterns = [ event_patterns = [
url(r'^stripe2/', include([ url(r'^stripe/', include([
event_url(r'^webhook/$', webhook, name='webhook', require_live=False), event_url(r'^webhook/$', webhook, name='webhook', require_live=False),
url(r'^redirect/$', redirect_view, name='redirect'), url(r'^redirect/$', redirect_view, name='redirect'),
url(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'), url(r'^return/(?P<order>[^/]+)/(?P<hash>[^/]+)/(?P<payment>[0-9]+)/$', ReturnView.as_view(), name='return'),
@ -27,12 +27,12 @@ organizer_patterns = [
] ]
urlpatterns = [ urlpatterns = [
url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/stripe2/disconnect/', url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/stripe/disconnect/',
oauth_disconnect, name='oauth.disconnect'), oauth_disconnect, name='oauth.disconnect'),
url(r'^control/organizer/(?P<organizer>[^/]+)/stripe2connect/', url(r'^control/organizer/(?P<organizer>[^/]+)/stripeconnect/',
OrganizerSettingsFormView.as_view(), name='settings.connect'), OrganizerSettingsFormView.as_view(), name='settings.connect'),
url(r'^_stripe2/webhook/$', webhook, name='webhook'), url(r'^_stripe/webhook/$', webhook, name='webhook'),
url(r'^_stripe2/oauth_return/$', oauth_return, name='oauth.return'), url(r'^_stripe/oauth_return/$', oauth_return, name='oauth.return'),
url(r'^.well-known/apple-developer-merchantid-domain-association$', url(r'^.well-known/apple-developer-merchantid-domain-association$',
applepay_association, name='applepay.association'), applepay_association, name='applepay.association'),
] ]

View File

@ -30,14 +30,14 @@ from pretix.control.permissions import (
from pretix.control.views.event import DecoupleMixin from pretix.control.views.event import DecoupleMixin
from pretix.control.views.organizer import OrganizerDetailViewMixin from pretix.control.views.organizer import OrganizerDetailViewMixin
from pretix.multidomain.urlreverse import eventreverse from pretix.multidomain.urlreverse import eventreverse
from pretix_stripe2.forms import OrganizerStripeSettingsForm from pretix.plugins.stripe.forms import OrganizerStripeSettingsForm
from pretix_stripe2.models import ReferencedStripe2Object from pretix.plugins.stripe.models import ReferencedStripeObject
from pretix_stripe2.payment import StripeCC, StripeSettingsHolder from pretix.plugins.stripe.payment import StripeCC, StripeSettingsHolder
from pretix_stripe2.tasks import ( from pretix.plugins.stripe.tasks import (
get_domain_for_event, stripe_verify_domain, get_domain_for_event, stripe_verify_domain,
) )
logger = logging.getLogger('pretix_stripe2') logger = logging.getLogger('pretix.plugins.stripe')
@xframe_options_exempt @xframe_options_exempt
@ -48,7 +48,7 @@ def redirect_view(request, *args, **kwargs):
except signing.BadSignature: except signing.BadSignature:
return HttpResponseBadRequest('Invalid parameter') return HttpResponseBadRequest('Invalid parameter')
r = render(request, 'pretixplugins/stripe2/redirect.html', { r = render(request, 'pretixplugins/stripe/redirect.html', {
'url': url, 'url': url,
}) })
r._csp_ignore = True r._csp_ignore = True
@ -57,7 +57,93 @@ def redirect_view(request, *args, **kwargs):
@scopes_disabled() @scopes_disabled()
def oauth_return(request, *args, **kwargs): def oauth_return(request, *args, **kwargs):
raise Exception('Unexpected OAuth') if 'payment_stripe_oauth_event' not in request.session:
messages.error(request, _('An error occurred during connecting with Stripe, please try again.'))
return redirect(reverse('control:index'))
event = get_object_or_404(Event, pk=request.session['payment_stripe_oauth_event'])
if request.GET.get('state') != request.session['payment_stripe_oauth_token']:
messages.error(request, _('An error occurred during connecting with Stripe, please try again.'))
return redirect(reverse('control:event.settings.payment.provider', kwargs={
'organizer': event.organizer.slug,
'event': event.slug,
'provider': 'stripe_settings'
}))
gs = GlobalSettingsObject()
testdata = {}
try:
resp = requests.post('https://connect.stripe.com/oauth/token', data={
'grant_type': 'authorization_code',
'client_secret': (
gs.settings.payment_stripe_connect_secret_key or gs.settings.payment_stripe_connect_test_secret_key
),
'code': request.GET.get('code')
})
data = resp.json()
if 'error' not in data:
account = stripe.Account.retrieve(
data['stripe_user_id'],
api_key=gs.settings.payment_stripe_connect_secret_key or gs.settings.payment_stripe_connect_test_secret_key
)
except:
logger.exception('Failed to obtain OAuth token')
messages.error(request, _('An error occurred during connecting with Stripe, please try again.'))
else:
if 'error' not in data and data['livemode']:
try:
testresp = requests.post('https://connect.stripe.com/oauth/token', data={
'grant_type': 'refresh_token',
'client_secret': gs.settings.payment_stripe_connect_test_secret_key,
'refresh_token': data['refresh_token']
})
testdata = testresp.json()
except:
logger.exception('Failed to obtain OAuth token')
messages.error(request, _('An error occurred during connecting with Stripe, please try again.'))
return redirect(reverse('control:event.settings.payment.provider', kwargs={
'organizer': event.organizer.slug,
'event': event.slug,
'provider': 'stripe_settings'
}))
if 'error' in data:
messages.error(request, _('Stripe returned an error: {}').format(data['error_description']))
elif data['livemode'] and 'error' in testdata:
messages.error(request, _('Stripe returned an error: {}').format(testdata['error_description']))
else:
messages.success(request,
_('Your Stripe account is now connected to pretix. You can change the settings in '
'detail below.'))
event.settings.payment_stripe_publishable_key = data['stripe_publishable_key']
# event.settings.payment_stripe_connect_access_token = data['access_token'] we don't need it, right?
event.settings.payment_stripe_connect_refresh_token = data['refresh_token']
event.settings.payment_stripe_connect_user_id = data['stripe_user_id']
event.settings.payment_stripe_merchant_country = account.get('country')
if account.get('business_name') or account.get('display_name') or account.get('email'):
event.settings.payment_stripe_connect_user_name = (
account.get('business_name') or account.get('display_name') or account.get('email')
)
if data['livemode']:
event.settings.payment_stripe_publishable_test_key = testdata['stripe_publishable_key']
else:
event.settings.payment_stripe_publishable_test_key = event.settings.payment_stripe_publishable_key
if request.session.get('payment_stripe_oauth_enable', False):
event.settings.payment_stripe__enabled = True
del request.session['payment_stripe_oauth_enable']
stripe_verify_domain.apply_async(args=(event.pk, get_domain_for_event(event)))
return redirect(reverse('control:event.settings.payment.provider', kwargs={
'organizer': event.organizer.slug,
'event': event.slug,
'provider': 'stripe_settings'
}))
@csrf_exempt @csrf_exempt
@ -87,21 +173,21 @@ def webhook(request, *args, **kwargs):
return HttpResponse("Not interested in this data type", status=200) return HttpResponse("Not interested in this data type", status=200)
try: try:
rso = ReferencedStripe2Object.objects.select_related('order', 'order__event').get(reference=objid) rso = ReferencedStripeObject.objects.select_related('order', 'order__event').get(reference=objid)
return func(rso.order.event, event_json, objid, rso) return func(rso.order.event, event_json, objid, rso)
except ReferencedStripe2Object.DoesNotExist: except ReferencedStripeObject.DoesNotExist:
if event_json['data']['object']['object'] == "charge" and 'payment_intent' in event_json['data']['object']: if event_json['data']['object']['object'] == "charge" and 'payment_intent' in event_json['data']['object']:
# If we receive a charge webhook *before* the payment intent webhook, we don't know the charge ID yet # If we receive a charge webhook *before* the payment intent webhook, we don't know the charge ID yet
# and can't match it -- but we know the payment intent ID! # and can't match it -- but we know the payment intent ID!
try: try:
rso = ReferencedStripe2Object.objects.select_related('order', 'order__event').get( rso = ReferencedStripeObject.objects.select_related('order', 'order__event').get(
reference=event_json['data']['object']['payment_intent'] reference=event_json['data']['object']['payment_intent']
) )
return func(rso.order.event, event_json, objid, rso) return func(rso.order.event, event_json, objid, rso)
except ReferencedStripe2Object.DoesNotExist: except ReferencedStripeObject.DoesNotExist:
return HttpResponse("Unable to detect event", status=200) return HttpResponse("Unable to detect event", status=200)
elif hasattr(request, 'event') and func != paymentintent_webhook: elif hasattr(request, 'event') and func != paymentintent_webhook:
# This is a legacy integration from back when didn't have ReferencedStripe2Object. This can't happen for # This is a legacy integration from back when didn't have ReferencedStripeObject. This can't happen for
# payment intents or charges connected with payment intents since they didn't exist back then. Our best # payment intents or charges connected with payment intents since they didn't exist back then. Our best
# hope is to go for request.event and see if we can find the order ID. # hope is to go for request.event and see if we can find the order ID.
return func(request.event, event_json, objid, None) return func(request.event, event_json, objid, None)
@ -171,7 +257,7 @@ def charge_webhook(event, event_json, charge_id, rso):
prov = payment.payment_provider prov = payment.payment_provider
prov._init_api() prov._init_api()
order.log_action('pretix_stripe2.event', data=event_json) order.log_action('pretix.plugins.stripe.event', data=event_json)
is_refund = charge['refunds']['total_count'] or charge['dispute'] is_refund = charge['refunds']['total_count'] or charge['dispute']
if is_refund: if is_refund:
@ -265,7 +351,7 @@ def source_webhook(event, event_json, source_id, rso):
prov = payment.payment_provider prov = payment.payment_provider
prov._init_api() prov._init_api()
order.log_action('pretix_stripe2.event', data=event_json) order.log_action('pretix.plugins.stripe.event', data=event_json)
go = (event_json['type'] == 'source.chargeable' and go = (event_json['type'] == 'source.chargeable' and
payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED) and payment.state in (OrderPayment.PAYMENT_STATE_PENDING, OrderPayment.PAYMENT_STATE_CREATED) and
src.status == 'chargeable') src.status == 'chargeable')
@ -296,7 +382,7 @@ def paymentintent_webhook(event, event_json, paymentintent_id, rso):
return HttpResponse('Charge not found', status=500) return HttpResponse('Charge not found', status=500)
for charge in paymentintent.charges.data: for charge in paymentintent.charges.data:
ReferencedStripe2Object.objects.get_or_create( ReferencedStripeObject.objects.get_or_create(
reference=charge.id, reference=charge.id,
defaults={'order': rso.payment.order, 'payment': rso.payment} defaults={'order': rso.payment.order, 'payment': rso.payment}
) )
@ -307,12 +393,25 @@ def paymentintent_webhook(event, event_json, paymentintent_id, rso):
@event_permission_required('can_change_event_settings') @event_permission_required('can_change_event_settings')
@require_POST @require_POST
def oauth_disconnect(request, **kwargs): def oauth_disconnect(request, **kwargs):
raise Exception('Unexpected OAuth') del request.event.settings.payment_stripe_publishable_key
del request.event.settings.payment_stripe_publishable_test_key
del request.event.settings.payment_stripe_connect_access_token
del request.event.settings.payment_stripe_connect_refresh_token
del request.event.settings.payment_stripe_connect_user_id
del request.event.settings.payment_stripe_connect_user_name
request.event.settings.payment_stripe__enabled = False
messages.success(request, _('Your Stripe account has been disconnected.'))
return redirect(reverse('control:event.settings.payment.provider', kwargs={
'organizer': request.event.organizer.slug,
'event': request.event.slug,
'provider': 'stripe_settings'
}))
@xframe_options_exempt @xframe_options_exempt
def applepay_association(request, *args, **kwargs): def applepay_association(request, *args, **kwargs):
r = render(request, 'pretixplugins/stripe2/apple-developer-merchantid-domain-association') r = render(request, 'pretixplugins/stripe/apple-developer-merchantid-domain-association')
r._csp_ignore = True r._csp_ignore = True
return r return r
@ -442,7 +541,7 @@ class ScaView(StripeOrderView, View):
elif intent.next_action.type == 'redirect_to_url': elif intent.next_action.type == 'redirect_to_url':
ctx['payment_intent_next_action_redirect_url'] = intent.next_action.redirect_to_url['url'] ctx['payment_intent_next_action_redirect_url'] = intent.next_action.redirect_to_url['url']
r = render(request, 'pretixplugins/stripe2/sca.html', ctx) r = render(request, 'pretixplugins/stripe/sca.html', ctx)
r._csp_ignore = True r._csp_ignore = True
return r return r
else: else:
@ -466,17 +565,17 @@ class ScaReturnView(StripeOrderView, View):
self.order.refresh_from_db() self.order.refresh_from_db()
return render(request, 'pretixplugins/stripe2/sca_return.html', {'order': self.order}) return render(request, 'pretixplugins/stripe/sca_return.html', {'order': self.order})
class OrganizerSettingsFormView(DecoupleMixin, OrganizerDetailViewMixin, AdministratorPermissionRequiredMixin, FormView): class OrganizerSettingsFormView(DecoupleMixin, OrganizerDetailViewMixin, AdministratorPermissionRequiredMixin, FormView):
model = Organizer model = Organizer
permission = 'can_change_organizer_settings' permission = 'can_change_organizer_settings'
form_class = OrganizerStripeSettingsForm form_class = OrganizerStripeSettingsForm
template_name = 'pretixplugins/stripe2/organizer_stripe.html' template_name = 'pretixplugins/stripe/organizer_stripe.html'
def get_success_url(self): def get_success_url(self):
return reverse('plugins:pretix_stripe2:settings.connect', kwargs={ return reverse('plugins:stripe:settings.connect', kwargs={
'organizer': self.request.organizer.slug, 'organizer': self.request.organizer.slug,
}) })