nathan/ptcoffee_django
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 54b7053292 Add subtitle to order line item master Nathan Chapman 2024-03-23 14:53:14 -06:00
  • 39a7b56b40 Add USDA Organic sticker Nathan Chapman 2024-03-18 11:19:23 -06:00
  • f6015afdb8 Merge branch 'develop' Nathan Chapman 2024-01-23 08:45:03 -07:00
  • a122003265 Add ssl section for forwarded domain Nathan Chapman 2024-01-23 08:44:56 -07:00
  • 914c7d5036 Merge branch 'develop' Nathan Chapman 2024-01-03 13:42:42 -07:00
  • aa025696e8 Merge branch 'develop' Nathan Chapman 2023-12-29 18:15:23 -07:00
  • edaeb7950e Change from active campaign to squareup Nathan Chapman 2023-12-29 18:12:21 -07:00
  • 2a4429eb86 Change from active campaign to squareup Nathan Chapman 2023-12-29 18:12:21 -07:00
  • 7710064a83 Change from active campaign to squareup Nathan Chapman 2023-12-29 18:12:21 -07:00
  • e52c763234
         Fix subscription checkout shipping calculation Nathan Chapman 2023-11-20 08:21:57 -07:00
  • f65169ebbc Implement basic shipping with XPS Ship API Nathan Chapman 2023-11-17 22:31:21 -07:00
  • 520142fd62
         Add xps integration Nathan Chapman 2023-11-17 18:59:06 -07:00
  • 4b31688c25 Write own usps library Nathan Chapman 2023-11-16 19:30:54 -07:00
  • 7d0606143d
         Fix price limit Nathan Chapman 2023-10-20 08:04:49 -06:00
  • 88b5b4bc87 Merge branch 'master' into develop Nathan Chapman 2023-09-04 21:47:35 -06:00
  • f6eb763d4c Merge branch 'release/3.6.4' Nathan Chapman 2023-09-04 21:44:04 -06:00
  • 8cf25ec8c0 Revert "Update banner for sale" Nathan Chapman 2023-09-04 21:40:14 -06:00
  • 607b35fbac Merge branch 'hotfix/3.6.3' Nathan Chapman 2023-09-01 12:32:03 -06:00
  • 6ea1b821bc Fix amount Nathan Chapman 2023-09-01 12:31:53 -06:00
  • 1f84389086 Merge tag '3.6.2' into develop Nathan Chapman 2023-09-01 07:58:13 -06:00
  • 8749b3a884 Merge branch 'release/3.6.2' Nathan Chapman 2023-09-01 07:58:12 -06:00
  • 7462c676d5 Update banner for sale Nathan Chapman 2023-08-31 19:59:55 -06:00
  • d2811ddae7 Merge tag 'v3.6.1' into develop Nathan Chapman 2023-08-22 22:36:48 -06:00
  • f380094271 Merge branch 'hotfix/3.6.1' Nathan Chapman 2023-08-22 22:36:43 -06:00
  • 52e62d6003 Fix carousel images and text Nathan Chapman 2023-08-22 22:36:35 -06:00
  • d88694f67c Merge tag 'v3.6.0' into develop Nathan Chapman 2023-08-22 22:02:00 -06:00
  • 64100af82d Merge branch 'release/3.6.0' Nathan Chapman 2023-08-22 22:01:51 -06:00
  • a87b8f1db1 Merge branch 'feature/wholesale' into develop Nathan Chapman 2023-08-22 22:00:47 -06:00
  • b61114babb Finalize wholesale orders Nathan Chapman 2023-08-22 21:57:28 -06:00
  • 10cd9cf0c5 Update form Nathan Chapman 2023-08-01 22:21:16 -06:00
  • f5ae448c98 Add intermediary page for wholesale Nathan Chapman 2023-07-30 20:29:45 -06:00
  • c598f805e2 Add base for wholesale orders Nathan Chapman 2023-07-29 11:48:17 -06:00
  • e514d72c8d Remove username field as it is no longer used Nathan Chapman 2023-08-17 08:44:56 -06:00
  • 499b95f74e Merge tag '3.5.1' into develop Nathan Chapman 2023-08-02 12:15:37 -06:00
  • 10e4af2a7b Merge branch 'release/3.5.1' Nathan Chapman 2023-08-02 12:15:37 -06:00
  • ba6aa1039f Update free-sample banner image Nathan Chapman 2023-08-02 12:15:03 -06:00
  • 6a7ea43f79 Merge tag 'v3.5.0' into develop Nathan Chapman 2023-07-31 20:31:45 -06:00
  • 6a95facf9e Merge branch 'release/3.5.0' Nathan Chapman 2023-07-31 20:31:45 -06:00
  • 9884014229 Remove django-allauth and replace with basic user creation/login with just email Nathan Chapman 2023-07-31 19:57:14 -06:00
  • 61f98295ee Merge tag '3.4.2' into develop Nathan Chapman 2023-07-31 14:45:51 -06:00
  • b0ba350c14 Merge branch 'release/3.4.2' Nathan Chapman 2023-07-31 14:45:51 -06:00
  • 2bd2e35308 Add free sample banner Nathan Chapman 2023-07-31 14:44:52 -06:00
  • 111757be35 Merge tag 'fix-make-password' into develop Nathan Chapman 2023-07-24 08:09:08 -06:00
  • 105e3023ab Merge branch 'hotfix/fix-make-password' Nathan Chapman 2023-07-24 08:09:08 -06:00
  • 0e47679e9a Fix wrong function call for auto-creating a new user Nathan Chapman 2023-07-24 08:08:51 -06:00
  • 41b898e942 Merge branch 'master' into develop Nathan Chapman 2023-07-17 08:05:25 -06:00
  • b50b10208f Merge branch 'hotfix/subscription-has-no-attr-address' Nathan Chapman 2023-07-17 08:05:25 -06:00
  • 468948a2c8 Correct shipping fields when creating an Order from a Subscription Nathan Chapman 2023-07-17 08:05:16 -06:00
  • 71f7db9827 Merge tag 'v3.4.0' into develop Nathan Chapman 2023-07-16 12:43:46 -06:00
  • adf275331c Merge branch 'release/3.4.0' Nathan Chapman 2023-07-16 12:43:38 -06:00
  • e75f1dc1bc Finish address template changes Nathan Chapman 2023-07-16 12:42:58 -06:00
  • cf4a1e5ec7 Add host name check in nginx conf Nathan Chapman 2023-07-14 23:04:41 -06:00
  • 9108c7ea1a Merge branch 'feature/remove-address-model' into develop Nathan Chapman 2023-07-14 23:02:51 -06:00
  • faf9b5b734 Remove address model and unnecessary apps Nathan Chapman 2023-07-14 22:59:03 -06:00
  • de329a5340 Move address to the User, Order, and Subscription models respectively Nathan Chapman 2023-07-14 21:04:20 -06:00
  • c09184078a Merge tag '3.3.4' into develop Nathan Chapman 2023-07-11 09:38:04 -06:00
  • f6d15bd30c Merge branch 'release/3.3.4' Nathan Chapman 2023-07-11 09:37:59 -06:00
  • 29950b4e6a Add Terms and conditions and Privacy Policy Nathan Chapman 2023-07-11 09:37:14 -06:00
  • a6e0b1a276 Merge tag '3.3.3' into develop Nathan Chapman 2023-07-06 10:35:37 -06:00
  • a9970244f4 Merge branch 'release/3.3.3' Nathan Chapman 2023-07-06 10:35:29 -06:00
  • 239bfa200b Increase pagination td colspan Nathan Chapman 2023-07-06 10:34:43 -06:00
  • 721fbe1986 Merge tag 'v3.3.2' into develop Nathan Chapman 2023-07-04 15:08:07 -06:00
  • 689413989f Merge branch 'release/3.3.2' Nathan Chapman 2023-07-04 15:07:49 -06:00
  • 156b90a213 Add search to dashboard customer and order lists Nathan Chapman 2023-07-04 15:06:45 -06:00
  • cb6f311d68 Merge tag 'checkout-nonetype-operand' into develop Nathan Chapman 2023-06-26 08:10:07 -06:00
  • b095585372 Merge branch 'hotfix/checkout-nonetype-operand' Nathan Chapman 2023-06-26 08:10:07 -06:00
  • 5a6fa1d17b Fix unsupported operand type(s) for -: 'NoneType' and 'int' Nathan Chapman 2023-06-26 08:09:54 -06:00
  • bc7067495c Merge tag 'cart-add-nonetype' into develop Nathan Chapman 2023-06-26 07:39:56 -06:00
  • 021313b5a6 Merge branch 'hotfix/cart-add-nonetype' Nathan Chapman 2023-06-26 07:39:56 -06:00
  • c62207a16f Add check for NoneType Nathan Chapman 2023-06-26 07:39:41 -06:00
  • b4764c4e18 Merge tag 'v3.3.1' into develop Nathan Chapman 2023-06-21 18:24:30 -06:00
  • a3c1cb9ce9 Merge branch 'release/3.3.1' Nathan Chapman 2023-06-21 18:24:05 -06:00
  • 7a676de22d Fix order limit on cart add Nathan Chapman 2023-06-21 18:20:01 -06:00
  • 8281b774c1 Merge tag '3.3.0' into develop Nathan Chapman 2023-06-20 10:35:34 -06:00
  • ed5e8891ce Merge branch 'release/3.3.0' Nathan Chapman 2023-06-20 10:35:34 -06:00
  • 94b12c9f3a Merge branch 'feature/free-sample-form' into develop Nathan Chapman 2023-06-20 10:23:52 -06:00
  • 2d4e4ba631 Add free order checkout process Nathan Chapman 2023-06-20 10:19:06 -06:00
  • 81f825c389 Add basic query to find items Nathan Chapman 2023-06-19 22:40:59 -06:00
  • 027ad28394 Merge tag 'v3.2.2' into develop Nathan Chapman 2023-05-07 19:39:20 -06:00
  • 0aa8a1bfb3 Merge branch 'release/3.2.2' Nathan Chapman 2023-05-07 19:39:20 -06:00
  • 730721d204 Add captcha to signup page Nathan Chapman 2023-05-07 19:38:44 -06:00
  • 319c50cf4f Merge tag '3.2.1' into develop Nathan Chapman 2023-04-27 14:17:45 -06:00
  • 60751997cd Merge branch 'release/3.2.1' Nathan Chapman 2023-04-27 14:17:45 -06:00
  • 32d96bf0eb Update stripe link to manage Stripe account Nathan Chapman 2023-04-27 14:15:20 -06:00
  • dac049214d Merge tag 'v3.2.0' into develop Nathan Chapman 2023-04-09 11:09:20 -06:00
  • f9e7a50e58 Merge branch 'release/3.2.0' Nathan Chapman 2023-04-09 11:09:20 -06:00
  • dc6596e45d Fix debug setting Nathan Chapman 2023-04-09 11:08:55 -06:00
  • a405ab44c7 Subscriptions: grid, font sizes, and more information Nathan Chapman 2023-04-09 11:08:35 -06:00
  • 8c6272aabe Update dependencies Nathan Chapman 2023-04-03 18:56:53 -06:00
  • f64d8e4e7f Merge tag 'v3.1.0' into develop Nathan Chapman 2023-04-03 18:56:36 -06:00
  • 77944b3dd0 Merge branch 'release/3.1.0' Nathan Chapman 2023-04-03 18:56:36 -06:00
  • a92154676e Updated editor config Nathan Chapman 2023-04-03 18:55:47 -06:00
  • 0ea8d12c9f Add quick-fill button to Fulfillment form Nathan Chapman 2023-04-03 18:55:30 -06:00
  • 3cf7688844 Add order status to readme Nathan Chapman 2023-04-01 09:13:52 -06:00
  • 98a0ce3407 Merge tag '3.0.19' into develop Nathan Chapman 2023-03-20 15:26:34 -06:00
  • 99b5b1a6e2 Merge branch 'release/3.0.19' Nathan Chapman 2023-03-20 15:26:34 -06:00
  • 27d9e73166 Capture correct subtotal amount when creating order Nathan Chapman 2023-03-20 15:26:06 -06:00
  • 10c4435490 Merge tag '3.0.18' into develop Nathan Chapman 2023-03-20 14:01:52 -06:00
  • 8d7646d289 Merge branch 'release/3.0.18' Nathan Chapman 2023-03-20 14:01:52 -06:00
  • 8145380a9a Update copy Nathan Chapman 2023-03-20 13:57:33 -06:00