Commit graph

79 commits

Author SHA1 Message Date
Levi
8e5834b2dd fixed blog posts css issue 2017-01-31 10:09:24 -05:00
Levi
54e3059cef fixed payment membership button issue, fixed support us posts issue 2017-01-30 21:15:59 -05:00
Levi
63bb92fc6b Fixed change card feature 2017-01-20 11:33:25 -05:00
Levi
8a4a2ff941 fixed scroll navbar issue, fixed supportus, fixed billing addres 2017-01-16 11:03:23 -05:00
unknown
af3980d372 credit card edit elimated. The new card is a little more fastter. The whirte margin is again eliminated. 2017-01-06 11:33:55 -04:00
unknown
2b2b40a9ef carousel working fine, and new activity of edit exp date of credit card is on testing 2017-01-04 23:20:54 -04:00
unknown
86777a4699 credit card edit 2017-01-03 09:33:25 -04:00
unknown
ad581bbf40 Merge remote-tracking branch 'upstream/feature/new_digitalglarus' into hover_digitalglarus 2016-12-22 11:20:43 -04:00
unknown
1648d9558c credit card, button, modal size fixed 2016-12-20 11:15:09 -04:00
unknown
8f44c43850 credit card 2016-12-19 11:29:01 -04:00
Levi
3da05e8025 Finished responsive issues 2016-12-19 09:33:15 -05:00
unknown
089454e8ac fixing problems and credit card template and views 2016-12-14 10:34:20 -04:00
Levi
082cb09e9b Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus 2016-12-06 21:48:26 -05:00
Levi
61d15b1250 fixing payment booking bug 2016-12-06 21:47:59 -05:00
Levi Velázquez
c3714e3c4a Merge pull request #146 from naqv/hover_digitalglarus
Hover animation
2016-12-05 23:00:34 -05:00
Levi
16522cae1b Finished #2759 #2748 #2747 2016-12-04 19:44:26 -05:00
unknown
855c8f1140 narbar 2016-12-01 00:28:06 -04:00
Levi
8d78e417f8 Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus 2016-11-28 10:33:15 -05:00
Levi
f3ebc52679 Finished #2715 #2716 #2717 2016-11-28 10:32:37 -05:00
Natacha Quintero
0a63917eac new cchanges and the other changes 2016-11-27 00:35:15 -04:30
Natacha Quintero
b8d576f6ce hover animation,broken url 2016-11-27 00:21:01 -04:30
Natacha Quintero
b299a0383f terms and conditions 2016-11-21 20:26:03 -04:30
Levi
2a4b6e973d Downgrading django from 1.10 to 1.9. Added supports.html. Added supports view . Fixing post supports style. Working on # #2689 Removing links from supportus.html. . Working on # #2689 FIxed history fonts style and color . Working on # #2689 Finished supportus.html. Working on # #2689 Tagging post. Working on # #2689 Fixing broken links history.html. Working on #2674 Deactivate membership. Working on #2686 Reactivate membership 2016-11-17 21:08:16 -05:00
Levi
2102823f8e added supportus view 2016-11-03 12:59:32 -05:00
Levi
56776e8894 Edited membership_order_list.html to allow “become a member” option.Edited membership_order_list.html for new deactivate membership flow.Fixed get_current_membership function .Fixed Reactivated membership view.Fixed Mixin to know if an user is an active member or not. 2016-10-31 23:01:43 -05:00
Levi
ba2e231078 As an user I want to receive an email after finishing a booking process. Change Ungleich logo in email to DG logo. Error in membership booking email order dates. Fixed #2670 Design order email when a booking is free.Fixed template issues. Helping natacha to fix bug deploying project. Fixing copies.Fixed #2682. Fixed #2685 fixing copies . Helping natacha fixing bugs. Fixed #2677 Address line change. Started reactivate membership feature 2016-10-28 11:25:09 -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
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
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
fe01c0baf3 Added Billing Address success message 2016-10-14 01:17:10 -05:00
Levi
a44e4f4733 Fixed Error on Allowed booking days by user 2016-10-14 01:04:40 -05:00
Levi
e1a43f1d29 Fixed free days amount when user should pay extra membership months 2016-10-14 00:51:39 -05:00
Levi
eaf1f1de86 Created current user billing address model in membership payment 2016-10-13 23:50:13 -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
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
974fdd3419 #hotfix removed pdb 2016-09-14 00:45:33 -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
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
63dd0f3ea0 fixed redirect url 2016-09-05 20:06:20 -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
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
f56f294205 Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added  DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
 Please enter the commit message for your changes. Lines starting
2016-08-20 00:57:46 -05:00
Levi
1470caee89 added old dg index 2016-08-16 00:14:57 -05:00
Levi
a27e7f9828 added new index.html and history.html to digitalglarus 2016-08-09 00:54:25 -05:00
Levi
5fce858923 Changed donations.html table style, Added pagination to donations list view. Hiding donate now button if the user is logged in and already has a donation.Handled the case when an user has not donations yet in donations.html view. Fixed bug on donation signup 2016-08-03 00:50:33 -05:00
Levi
21cd0c21a9 fixed digitalglarus post detail view on DE 2016-07-01 00:40:39 -05:00
Levi
2b50f9fdd9 As an admin I want to be able to create a custom use. As an user I want to see listed only posts in the current selected language. As an user I want to be able to switch languages between EN-DE 2016-06-23 21:32:51 -05:00
Efstratios Goudelis
adcde9d5c7 Fixed issue with publish flag not be respected when getting blog posts for the site blog. Also for the digitalglarus blog now.
Related issue: https://redmine.ungleich.ch/issues/2284
2016-05-16 15:56:05 +03:00