amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1322 commits 8 branches 146 tags 314 MiB
Commit graph

1322 commits

This branch
This branch
All branches
Author SHA1 Message Date
Levi Velázquez
2362413b60 Merge pull request #137 from levivm/feature/new_digitalglarus 
Feature/new digitalglarus
 2016-10-23 18:22:05 -05:00
Levi Velázquez
6b9d450f34 Merge pull request #136 from levivm/feature/new_digitalglarus 
added debug=false to prod settings
 2016-10-23 18:20:26 -05:00
Levi
98c6bb3ec8 added debug=false to prod settings 2016-10-23 18:18:49 -05:00
Levi Velázquez
e2597f3ed7 Merge pull request #135 from levivm/feature/new_digitalglarus 
Final fixes to DG
 2016-10-23 18:11:57 -05:00
Levi
735089785b Fixed: #2669 Membership date range is incorrect.Fixed: #2671 Error when user try to access membership view without having one.Fixed: #2672: As I user want to know my next membership date range.Fixed #2673: Enable new Main DG index.Fixed #2657 :cancel membership button style fix 2016-10-23 18:09:01 -05:00
Levi Velázquez
7381928afb Merge pull request #134 from levivm/feature/new_digitalglarus 
Delete required membership months and fixed some css style.
 2016-10-22 23:18:03 -05:00
Levi
08d1077ad0 Delete required membership months from booking view. Delete required membership months from booking order view. Delete required membership moths from booking order model. Fixed error on membership date range on order detail.Fixed #2650. Fixed #2652. Checked #2658 2016-10-22 23:15:23 -05:00
Levi Velázquez
8b75ddd64f Merge pull request #133 from levivm/feature/new_digitalglarus 
Feature/new digitalglarus
 2016-10-18 23:31:55 -05:00
Levi
35bd78a78b Fixed #2652: Order confirmation page needs buttons for next action. Fixed #2653: cancel subscription modal position adjustment. Fixed #2658: Billing address info change page. Fixed #2659: order history page booking history list. Issue #2659 Added start date and end _date to membership model attributes. Fixed membership creating process in order to set start and end membership dates. Fixed start date and end date in membership detail view and orders list in order to use new membership attributes model. Adding membership order after booking. Fixed Membership creation when an booking is placed.Fixed #2661 : move DG terms and condition text+ checkbox in order page.Fixed 2663: DG pricing page column width fix.Fixed #2660: DG footer style fix 2016-10-18 23:29:07 -05:00
Levi
042fa547e3 Fixed #2651: Reduce book button size 2016-10-15 17:00:10 -05:00
Levi
102aec9c16 Fixed #2650: Add 'Go back' button to registration/unregistration steps 2016-10-15 16:58:40 -05:00
Levi
ce544a5997 Fixed #2624: view invoice button redirection 2016-10-15 16:34:26 -05:00
Levi Velázquez
5a5b53d4b2 Merge pull request #132 from levivm/feature/new_digitalglarus 
Added Billing Address success message
 2016-10-14 01:19:00 -05:00
Levi
fe01c0baf3 Added Billing Address success message 2016-10-14 01:17:10 -05:00
Levi Velázquez
9a8af193bc Merge pull request #131 from levivm/feature/new_digitalglarus 
Feature/new digitalglarus
 2016-10-14 01:06:52 -05:00
Levi
86583993cd #hotfix removed import pdb 2016-10-14 01:06:09 -05:00
Levi
a44e4f4733 Fixed Error on Allowed booking days by user 2016-10-14 01:04:40 -05:00
Levi Velázquez
fdd57de8a5 Merge pull request #130 from levivm/feature/new_digitalglarus 
Created current user billing address model in membership payment
 2016-10-14 00:53:06 -05:00
Levi
e1a43f1d29 Fixed free days amount when user should pay extra membership months 2016-10-14 00:51:39 -05:00
Levi
05a165095d Fixed redirect signup error. Fixed login next url error 2016-10-14 00:11:05 -05:00
Levi
eaf1f1de86 Created current user billing address model in membership payment 2016-10-13 23:50:13 -05:00
Levi Velázquez
68b149cebd Merge pull request #129 from levivm/feature/new_digitalglarus 
Feature/new digitalglarus
 2016-10-13 23:39:37 -05:00
Levi
082f39e9dc Added url in booking&price menu bar button. Fixed bug when user booked for 1 days and two free days were being given. Created UserBillingAddress. Created UserBillingAddress Form.Created UserBillingAddress after first user payment. Added Previous Billing data to booking payment view if there is one. Moved booking button. Fixed error on free days in booking invoice. Added modal to cancel subscription page. Now a member can booking without entering his billing address or credit card info. Fixed error on free days.Current user billing address is showed on billing and booking order details. Edit billing address form added.Added user_billing_address.html. Added user billing address get views. Filled user billing address view with current user billing address.Now an user can edit his billing address. Added is_free flag in Select Booking Dates in order to now if a booking is free. Changed Booking Order Model in order to allow free payments. Added free payment template. Added free payment into Booking Payment View. Fixed issue #2586: new digitalglarus navbar font change.Fixed issue #2608 : style fix new DG.Fixed #2617: fix input fields and btn responsiveness on DG payment page. Fixed #2620: responsive issue in DG order summary.Fixed #2623: Order history style fix for deativate button and message below.Fixed #2625: DG membership activation page fix. Fixed #2616: fix navbar responsivness for new DG. Fixed #2619: credit card input field responsiveness fix 2016-10-13 23:33:48 -05:00
Levi
30ff53c629 Added Login View Test. Added Signup View Test. Added Reset Password View Test. Added Password Reset Confirm View Test. Added Membership Payment View Test for Post request. Added Membership Payment View test for urls, Membership Payment View Test tests for urls. Added odd cases to tests. 2016-10-04 23:26:02 -05:00
Levi Velázquez
2481f610a6 Merge pull request #128 from levivm/feature/new_digitalglarus 
Feature/new digitalglarus
 2016-10-01 17:20:36 -05:00
Levi
1a8b5e69a0 Fixed issue 2624, Creating command to charge all members for their membership month, Fixing bug on make charge membership command, Added language activation for make charge command 2016-10-01 17:17:46 -05:00
Levi
447ddc7c2e finishing digitalglarus booking 2016-09-29 00:04:40 -05:00
Levi
80095ed1aa #hotfix Fixed select date picker 2016-09-19 19:20:57 -05:00
Levi Velázquez
cb3c527198 Merge pull request #127 from levivm/feature/new_digitalglarus 
fixed jquery cdn link
 2016-09-15 23:28:43 -05:00
Levi
45374f8623 fixed jquery cdn link 2016-09-15 23:27:46 -05:00
Levi Velázquez
a95dc3f199 Merge pull request #126 from levivm/feature/new_digitalglarus 
fixed datepicker cdn link
 2016-09-15 23:25:33 -05:00
Levi
37b70df4be fixed datepicker cdn link 2016-09-15 23:24:46 -05:00
Levi Velázquez
9d706384fe Merge pull request #125 from levivm/feature/new_digitalglarus 
Fixing css bugs, Changed booking form, Changed booking input from ran…
 2016-09-15 23:19:47 -05:00
Levi
a7de458a02 Fixing css bugs, Changed booking form, Changed booking input from range to two separated inputs , Change booking view validations 2016-09-15 23:16:21 -05:00
Levi Velázquez
81a08be463 Merge pull request #124 from levivm/feature/new_digitalglarus 
#hotfix removed pdb
 2016-09-14 00:48:32 -05:00
Levi
974fdd3419 #hotfix removed pdb 2016-09-14 00:45:33 -05:00
Levi Velázquez
7afef7578f Merge pull request #123 from levivm/feature/new_digitalglarus 
Reduced pixels needed to navbar transition color, Added membership de…
 2016-09-14 00:26:16 -05:00
Levi
73cc787ca1 Reduced pixels needed to navbar transition color, Added membership deactivation form, Added membership deactivation view, Added membership status, Added membership charged.html, Added membership charged.txt, Extended class to send membership charge email, After membership, charge for first time an email is sent to the user, Fixed bug on redirecting, user to membership payment after signup, Fixed redirecting after buying a membership 2016-09-14 00:24:20 -05:00
Levi Velázquez
13d54ad8d3 Merge pull request #122 from levivm/feature/new_digitalglarus 
Fixed cc brand bug, Added button to print/save pdf to  booking order …
 2016-09-08 23:26:37 -05:00
Levi
d917c8a606 Fixed cc brand bug, Added button to print/save pdf to booking order detail view.Added booking order list.Added booking order list views. Added customised user navbar. Added “my bookings” link to navbar. Added membership active date range. Fixed function to calculate if a membership is active or not. Added membership order detail view. Added order membership view. Create order membership detail html.Added validation to not allow booking on already booked dates. 2016-09-08 23:24:52 -05:00
Levi Velázquez
7265131919 Merge pull request #121 from levivm/feature/new_digitalglarus 
fixed redirect url
 2016-09-05 20:06:47 -05:00
Levi
63dd0f3ea0 fixed redirect url 2016-09-05 20:06:20 -05:00
Levi Velázquez
e245c1d092 Merge pull request #120 from levivm/feature/new_digitalglarus 
Feature/new digitalglarus
 2016-09-05 19:48:40 -05:00
Levi
e3d1761d45 Now booking is only for users with memberships. Added method to know if a membership is active or not. Added new formula for booking pricing. handling border cases when an user want to book. Added booking order detail view. Added booking order detail html. 2016-09-05 19:45:45 -05:00
Levi
2eb2c90b1f Added membership pricing view. Added membership pricing html. Added membership pricing url. Started booking view. Started integrating booking.js. Added calendar date range js lib. Fixing date picker. Added function to calculate remaining free days. Updated function to calculate booking price. Added BookingDatesForm. Added backend validation for booking dates. fixed booking form. adding pricing to booking payment view. Added free days to booking payment view. Started booking payment stripe flow. Redefined dispatch method to booking view. Now login is required for payment selecting dates and booking. Added date range to booking payment. Fixed booking select dates view. Added form validations to booking form. Created a order after a confirm a booking. Added free_days to booking model in order to facilitate free_days Availability for the next booking. Creating a Stripe charge. Creating Booking model instance. Refactor booking payment views. Associated an order to a stripe charge. Associated booking order instance with a booking instance. 2016-08-30 21:32:45 -05:00
Levi Velázquez
9cba962f68 Merge pull request #119 from levivm/master 
Updating master
 2016-08-22 03:18:00 -05:00
Levi
66533b1c1a Merge branch 'master' of github.com:ungleich/dynamicweb 2016-08-22 03:14:20 -05:00
Levi
1152e41b6e Fixed membership payment view issues, Membership creation after a stripe charge, Membership order creation after stripe charge, Added membership activated view, Added membership activated html, Fixing membership cost function, Added function to format membership date ranges, Added membership calculated dates for first month into membership_payment html and membership_activated html 2016-08-22 02:52:29 -05:00
Levi
fbaf439ebc added signup links 2016-08-20 01:17:29 -05:00
Levi Velázquez
e98a7a497e Merge pull request #118 from levivm/feature/new_digitalglarus 
added signup links
 2016-08-20 01:16:51 -05:00