Commit graph

  • 018723f27d syntax Thomas Steen Rasmussen 2016-05-29 16:20:48 +0200
  • 916f1ed59f forgot to include the epay callback url in the form Thomas Steen Rasmussen 2016-05-29 16:15:49 +0200
  • 3eaf9cec91 redirect to clean url after epay payment Thomas Steen Rasmussen 2016-05-29 16:10:06 +0200
  • afc380343a fix block name in closing tag Thomas Steen Rasmussen 2016-05-29 16:00:22 +0200
  • a53811b4c1 use a paymenttype independent order.get_cancel_url everywhere Thomas Steen Rasmussen 2016-05-29 15:55:48 +0200
  • 283f4013a9 spacing Thomas Steen Rasmussen 2016-05-29 15:55:25 +0200
  • c43b275494 wording on order detail page Thomas Steen Rasmussen 2016-05-29 15:44:27 +0200
  • 21b1e2156f fix |truefalseicon filter Thomas Steen Rasmussen 2016-05-29 15:35:14 +0200
  • 9e66a9c4c6 do not use django template code here Thomas Steen Rasmussen 2016-05-29 15:25:49 +0200
  • ef53a8149b do not escape our html string Thomas Steen Rasmussen 2016-05-29 15:21:55 +0200
  • af184cd671 order list styling Thomas Steen Rasmussen 2016-05-29 15:18:36 +0200
  • 93fed32cad styling order list page Thomas Steen Rasmussen 2016-05-29 15:16:29 +0200
  • d55de77201 styling order list page Thomas Steen Rasmussen 2016-05-29 15:04:52 +0200
  • c7906a069b a bit of spacing Thomas Steen Rasmussen 2016-05-29 14:49:47 +0200
  • 4b933f2a06 add more details to order list page Thomas Steen Rasmussen 2016-05-29 14:48:57 +0200
  • a124911a44 forgot the url namespace prefix (again) Thomas Steen Rasmussen 2016-05-29 14:33:41 +0200
  • b3f6131be4 working on shop Thomas Steen Rasmussen 2016-05-29 14:28:47 +0200
  • 57e120c45f add link to previous orders to the shop frontpage Thomas Steen Rasmussen 2016-05-29 14:04:46 +0200
  • 7eae7ee9ff migrations for previous commit Thomas Steen Rasmussen 2016-05-29 13:24:12 +0200
  • 131aa96690 save all coinify callbacks, even the invalid ones; also save headers Thomas Steen Rasmussen 2016-05-29 13:20:51 +0200
  • 2e40dfb1d1 fix json path Thomas Steen Rasmussen 2016-05-29 13:01:36 +0200
  • bb85b77841 define coinify cancel url in the api call, rename cancel url method on Order Thomas Steen Rasmussen 2016-05-29 13:00:00 +0200
  • 7476679c3f register the new models in the admin Thomas Steen Rasmussen 2016-05-29 12:54:02 +0200
  • 6e3accfc79 this field has been renamed Thomas Steen Rasmussen 2016-05-29 12:50:25 +0200
  • c3fbc0aa7b migration Thomas Steen Rasmussen 2016-05-29 12:48:31 +0200
  • e019b241e8 pass request to the url methods on Order Thomas Steen Rasmussen 2016-05-29 12:40:36 +0200
  • 1cbd958327 working on order detail page Thomas Steen Rasmussen 2016-05-29 12:37:14 +0200
  • f73ff466eb forgot () Thomas Steen Rasmussen 2016-05-29 12:36:07 +0200
  • c36e9c6eb0 working on shop and coinify payment Thomas Steen Rasmussen 2016-05-29 12:29:38 +0200
  • b938f1374b missing import Thomas Steen Rasmussen 2016-05-29 12:10:51 +0200
  • 5df37d9f93 more work on coinify payment Thomas Steen Rasmussen 2016-05-29 12:08:29 +0200
  • 490b01a4df change CoinifyRedirectView to a RedirectView with SingleObjectMixin Thomas Steen Rasmussen 2016-05-29 11:52:20 +0200
  • ca3dd850b0 pk not orderid Thomas Steen Rasmussen 2016-05-29 11:40:58 +0200
  • fd7ba26428 typo Thomas Steen Rasmussen 2016-05-29 11:38:23 +0200
  • 1e42ddf7bf just use regular reverse here Thomas Steen Rasmussen 2016-05-29 11:35:04 +0200
  • 7c24f93751 whitespace matters Thomas Steen Rasmussen 2016-05-29 11:30:24 +0200
  • b97fcfc115 add coinify credentials to settings Thomas Steen Rasmussen 2016-05-29 10:55:55 +0200
  • 07d74878c5 working on coinify payments Thomas Steen Rasmussen 2016-05-29 10:43:38 +0200
  • 6016a6b605 Merge remote-tracking branch 'origin/feature/tickets' into feature/tickets Thomas Steen Rasmussen 2016-05-25 22:53:02 +0200
  • 9387b8bdc4 working on coinify payments Thomas Steen Rasmussen 2016-05-25 22:48:02 +0200
  • c0045177aa Marking an Order as paid should generate Tickets Víðir Valberg Guðmundsson 2016-05-25 20:05:31 +0200
  • ff4f42bbdc Adding Ticket model to be able to discern tickets from products. Víðir Valberg Guðmundsson 2016-05-25 19:13:45 +0200
  • 35e1f68eae Boilerplate for law required stuff. Víðir Valberg Guðmundsson 2016-05-19 11:19:51 +0200
  • 407c8c31c4 fix public category filtering Thomas Steen Rasmussen 2016-05-17 21:55:09 +0200
  • 1b0a8019aa where did those quotes come from Thomas Steen Rasmussen 2016-05-17 21:42:28 +0200
  • 42749bacd3 get category object Thomas Steen Rasmussen 2016-05-17 21:24:04 +0200
  • 900bce6bc3 only show public categories Thomas Steen Rasmussen 2016-05-17 21:10:01 +0200
  • 2303b175a0 add migration Thomas Steen Rasmussen 2016-05-17 21:04:40 +0200
  • e5d78099cf move .public to category instead of product Thomas Steen Rasmussen 2016-05-17 20:56:11 +0200
  • 17f17d18f7 return super dispatch Thomas Steen Rasmussen 2016-05-17 20:42:02 +0200
  • b52be5af8c only show public products Thomas Steen Rasmussen 2016-05-17 15:51:25 +0200
  • f5e05ac51c make epay callback code handle multiple callbacks for the same order (happens sometimes) Thomas Steen Rasmussen 2016-05-17 15:35:28 +0200
  • 9ff4be7272 first steps towards an invoice worker Thomas Steen Rasmussen 2016-05-17 15:31:41 +0200
  • 2ed981776f add migration Thomas Steen Rasmussen 2016-05-17 15:15:30 +0200
  • 8a653265cc add Invoice model Thomas Steen Rasmussen 2016-05-17 15:09:40 +0200
  • 9cce10c281 add public field to Product Thomas Steen Rasmussen 2016-05-17 15:09:31 +0200
  • adfca40062 rename file, typo Thomas Steen Rasmussen 2016-05-17 08:38:02 +0200
  • 562314caed move a few more checks to mixins Thomas Steen Rasmussen 2016-05-17 08:34:54 +0200
  • 01779363d5 this code is no longer needed, the mixin checks if the order is paid Thomas Steen Rasmussen 2016-05-17 08:27:13 +0200
  • f06a8c76c3 add a mixin to use when we want to make sure an order is unpaid Thomas Steen Rasmussen 2016-05-17 08:21:59 +0200
  • ffedb8327d missing import Thomas Steen Rasmussen 2016-05-17 08:15:14 +0200
  • f934cbf0aa convert to int, print a warning if we receive a wrong amount from epay Thomas Steen Rasmussen 2016-05-17 08:13:00 +0200
  • ded056baf0 fix __str__ method for epaycallback Thomas Steen Rasmussen 2016-05-17 08:08:30 +0200
  • 8eb943c877 fix ordering and __str__ methods for epaycallback model Thomas Steen Rasmussen 2016-05-17 08:04:53 +0200
  • 528aa2bccf add migration Thomas Steen Rasmussen 2016-05-17 08:01:11 +0200
  • ff6af58eda more work on epay callback - add md5valid field to callback model Thomas Steen Rasmussen 2016-05-17 07:59:42 +0200
  • 1aec9bc4b6 use an OrderedDict to ensure order of query params Thomas Steen Rasmussen 2016-05-17 07:54:54 +0200
  • f62a4dd8a3 forgot the most important bit lol Thomas Steen Rasmussen 2016-05-17 07:46:36 +0200
  • c1203db188 rework epay callback validation Thomas Steen Rasmussen 2016-05-17 07:42:31 +0200
  • 12d76f4330 make order available in epay thanks page Thomas Steen Rasmussen 2016-05-17 07:27:06 +0200
  • 2168477bb4 self.request not just request Thomas Steen Rasmussen 2016-05-17 07:23:46 +0200
  • 089185f38c re-add get_absolute_url method for order Thomas Steen Rasmussen 2016-05-17 07:21:22 +0200
  • dd292c22c7 remember namespace prefixes on reverse() calls Thomas Steen Rasmussen 2016-05-17 07:15:10 +0200
  • 7932302e42 .total not .amount Thomas Steen Rasmussen 2016-05-17 07:13:10 +0200
  • 67cbe33e3a fix trailing commas, rename to epay.py Thomas Steen Rasmussen 2016-05-17 07:10:18 +0200
  • e0c3be498b fix import Thomas Steen Rasmussen 2016-05-17 07:08:03 +0200
  • 0e3fe85dfe working on epay payment Thomas Steen Rasmussen 2016-05-17 07:06:25 +0200
  • ebec7265df missing import Thomas Steen Rasmussen 2016-05-16 21:59:54 +0200
  • 548f052218 order matters Thomas Steen Rasmussen 2016-05-16 21:57:52 +0200
  • 75778344ec missing import Thomas Steen Rasmussen 2016-05-16 21:54:25 +0200
  • 217d7d8af9 add epay models to admin Thomas Steen Rasmussen 2016-05-16 21:45:43 +0200
  • 96582c93ae tell epay to send the user to our thanks url after payment Thomas Steen Rasmussen 2016-05-16 21:45:34 +0200
  • 32779b662e fix epay callback Thomas Steen Rasmussen 2016-05-16 21:14:56 +0200
  • 5e1d9f009e add LETTERHEAD_PDF_PATH to settings Thomas Steen Rasmussen 2016-05-16 21:03:50 +0200
  • 1abbf3acc6 add pdf code and pdf letterheads Thomas Steen Rasmussen 2016-05-16 20:54:34 +0200
  • 029ca1cf00 Adding currency tags to display prices correct Víðir Valberg Guðmundsson 2016-05-16 20:56:52 +0200
  • 1fb5454590 more work on payments Thomas Steen Rasmussen 2016-05-16 19:31:14 +0200
  • ce98d97d74 missing import Thomas Steen Rasmussen 2016-05-16 19:12:59 +0200
  • fc7495c7ce Implement EnsureUserOwnsOrderMixin to keep things DRY Víðir Valberg Guðmundsson 2016-05-16 18:48:15 +0200
  • e8badb817a use DetailView, add epay_thanks, unfinished Thomas Steen Rasmussen 2016-05-16 18:26:27 +0200
  • 0b4125d6d9 epay expects øre not kroner Thomas Steen Rasmussen 2016-05-16 17:48:04 +0200
  • b4235ef642 load bootstrap tags Thomas Steen Rasmussen 2016-05-16 17:46:20 +0200
  • 9dcb47cc3c load jquery on epay page Thomas Steen Rasmussen 2016-05-16 17:44:33 +0200
  • 1c429d0ec2 wrap in str() Thomas Steen Rasmussen 2016-05-16 17:41:24 +0200
  • 334a10359e self.request not just request Thomas Steen Rasmussen 2016-05-16 17:37:10 +0200
  • aed20d2821 provide epay with a complete url to return the customer to after payment Thomas Steen Rasmussen 2016-05-16 17:35:08 +0200
  • d22ef963d4 missing import Thomas Steen Rasmussen 2016-05-16 17:25:57 +0200
  • 5a5efbe69a remember namespace prefix for reverse() lookups Thomas Steen Rasmussen 2016-05-16 17:23:53 +0200
  • 2e079732cf return to order details after adding product to order Thomas Steen Rasmussen 2016-05-16 17:17:14 +0200
  • a49168e95c dk vat is 25% - but only 20% of an amount including vat is vat :) Thomas Steen Rasmussen 2016-05-16 17:11:48 +0200