development #1
bobby.vishwakarma
commented
Collaborator
No description provided.
bobby.vishwakarma
added 287 commits 2025-01-23 06:36:35 +00:00
refactor(setting): structure setting for different env
e5017899e3
Merge pull request #1 from WDI-Ideas/development
507f147e51
Merge pull request #2 from WDI-Ideas/development
af0426c51c
production url updated for stripe
348ed6e910
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into development
150249cce3
Merge pull request #3 from WDI-Ideas/development
a35f5f92d4
handling active subscription if exist
5b98584c57
Merge pull request #4 from WDI-Ideas/development
8ba3b6d250
handling active subscription if exist 2
c5e3a8afd1
Merge pull request #5 from WDI-Ideas/development
4067285d39
handling active subscription if exist 3
ff433e4a76
Merge pull request #6 from WDI-Ideas/development
0db4639b6a
html web view
f35ffded81
Merge pull request #7 from WDI-Ideas/development
b36f983de3
html web view 2
446535855b
Merge pull request #8 from WDI-Ideas/development
8413b058a7
html web view 3
478783054b
Merge pull request #9 from WDI-Ideas/development
e23576658b
html web view
a6979aba61
Merge pull request #10 from WDI-Ideas/development
98f7628854
existing subscription validation
899c2c1685
Merge pull request #11 from WDI-Ideas/development
33c9795920
existing subscription validation 2
c13f992e36
Merge pull request #12 from WDI-Ideas/development
d036dac763
existing subscription validation 3
4040ddfd43
Merge pull request #13 from WDI-Ideas/development
2b170ee912
existing subscription validation 4
cb0b0a3e68
Merge pull request #14 from WDI-Ideas/development
17a179d278
existing subscription validation 5
ed5d5253f0
Merge pull request #15 from WDI-Ideas/development
fb34cac60f
existing subscription validation 6
d4a49fcf56
Merge pull request #16 from WDI-Ideas/development
946b8f016e
existing subscription validation 7
ca08d0aeb0
Merge pull request #17 from WDI-Ideas/development
0079a2f55f
existing subscription validation 8
1afda70bf1
Merge pull request #18 from WDI-Ideas/development
eacb7c5cff
existing subscription validation 8
685ee8a9fb
Merge pull request #19 from WDI-Ideas/development
08ae3d5cef
existing subscription validation 9
3cab0dbbc4
Merge pull request #20 from WDI-Ideas/development
8cb8ab7e97
updating to event list serializer
496e8a3fba
Merge pull request #21 from WDI-Ideas/development
572143ca4f
Merge branch 'main' of https://github.com/WDI-Ideas/goodtimes into development
411dd517a9
optimized event api query and added events till 7 days
ff74aad3e5
Merge pull request #22 from WDI-Ideas/development
d74fbba0c5
updating to event list serializer 2
679abb78fe
Merge pull request #23 from WDI-Ideas/development
5b404ecd7b
added deleted in the principal form
df59f0714e
Merge pull request #24 from WDI-Ideas/development
2f6187df22
solved account deleted bug
97bae9e940
Merge pull request #25 from WDI-Ideas/development
09e1702a46
transaction filters only success and fail
a3d31f8dd7
Merge pull request #27 from WDI-Ideas/development
6a0cddffde
solved event notifications bug
a9725dd0fc
Merge pull request #28 from WDI-Ideas/development
b7309f1e68
cron event bug solved
e7b5b37e58
Merge pull request #29 from WDI-Ideas/development
6e0812df38
removed eventlistserializer in my events api
051d8788bd
Merge pull request #31 from WDI-Ideas/development
bb99a3e049
event view count
6262afea17
Merge pull request #32 from WDI-Ideas/development
a53d221091
reports pdf
10171170f4
report
5ddccc0860
report and share api
d09ff0f973
Merge pull request #33 from WDI-Ideas/development
19363af620
report and share api 2
b6a4567ff8
Merge pull request #34 from WDI-Ideas/development
ea80afb990
referral and reports
ecd9246375
Merge pull request #35 from WDI-Ideas/development
6241c5253d
corrected code
d43d135123
Merge pull request #36 from WDI-Ideas/development
c5ac748ca6
referral notifications correction
9b37e0ee5b
Merge pull request #37 from WDI-Ideas/development
25ab9b0341
testing
6ae855cfe1
report problem
9d502d5b60
Merge pull request #39 from WDI-Ideas/development
fd73d1fb9c
report problem 2
a303d1056d
Merge pull request #40 from WDI-Ideas/development
cc6345cc4c
report problem 3
2126660d9b
report problem 4
59a9a5eb98
report problem 5
e6ca0c5c71
Merge pull request #41 from WDI-Ideas/development
b0e8df3437
report problem 6
f746f0c29a
Merge pull request #42 from WDI-Ideas/development
1454fc2838
added model admin for favorites
e9079f6c82
Merge pull request #43 from WDI-Ideas/development
c639e66ed8
removed the active and deleted from views and reviews
9a3ff98253
Merge pull request #44 from WDI-Ideas/development
346ff66eeb
updated report count
d1f24f0867
Merge pull request #45 from WDI-Ideas/development
36912fec48
saving interested and going notifications into database if enabled False
15265b1914
Merge pull request #46 from WDI-Ideas/development
8ab25d6c2c
selling selected rewards
b6a0b0b537
Merge pull request #48 from WDI-Ideas/development
5b201bf91f
selling selected rewards 2
c87cf3eea8
Merge pull request #49 from WDI-Ideas/development
dd41d4856a
text wrapping token field
8ee574de52
Merge pull request #50 from WDI-Ideas/development
79422fbf0c
in app notfctns one week
ad649848cd
Merge pull request #51 from WDI-Ideas/development
912c6e42d9
added coupon code
1ed0d78fa6
Merge pull request #53 from WDI-Ideas/development
ef8f91809e
refactored consumers.py
a459742801
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into development
7a0f82b4a6
Merge pull request #54 from WDI-Ideas/development
142803a5de
updated requirements.txt
ed92443e36
Merge pull request #55 from WDI-Ideas/development
9abfb25cc2
fix:event multiple image and add mobile no
2398d91c93
Merge pull request #56 from WDI-Ideas/development
a9cb97b406
feat(module 1): add customer, non transferlist, import , export
8e7f2d6d69
Merge branch 'feature/module_1' into development
35d904603d
Merge pull request #57 from WDI-Ideas/development
5cb9c51bc2
feat(module 1):multiple image input, form validation
a5ce725b30
Merge branch 'feature/module_1' into development
92f597d830
Merge pull request #58 from WDI-Ideas/development
f336c1f866
fix(module_1):event form validation, venue validation
04e428fcf6
Merge branch 'feature/module_1' into development
3ae21b747d
fix(module_1):default venue select in dropdown and remove deleted venue
fa05aee1b1
Merge branch 'feature/module_1' into development
dea6b60c43
Merge pull request #59 from WDI-Ideas/development
d5b69ce6bd
fix(moduel_1):form validation
d602988b81
Merge branch 'feature/module_1' into development
3396f5ce01
Merge pull request #61 from WDI-Ideas/development
e25f402cea
feat(module_2_filter):Home page advance filter api
1ebf7f6838
Merge pull request #62 from WDI-Ideas/development
b8ac4ed4e6
fix(module_2_filter):improve location filter and ordering nearest event
31e9d5a03c
Merge pull request #63 from WDI-Ideas/development
2db24f203c
fix(module_2_filter):removed end date and changed price type
38fad86990
Merge pull request #64 from WDI-Ideas/development
5d320cccfe
fix(module_2_filter):changed base query of event filter
23bae8cf3d
fix(module_2_filter):fixed order by latest
91dba0308c
fix(module_2_filter):fixed order by latest
83efd28687
Merge pull request #65 from WDI-Ideas/development
8faa9eb81f
feat(module_2_filter): fix nearest ordering issue
d670a18599
Merge pull request #66 from WDI-Ideas/development
7921c3f89d
feat(socialmedia):added twitter service
29011dff06
feat(age_group): dynamically change age group in filter and event
3da21b0c0b
Merge pull request #68 from WDI-Ideas/development
f918a2f76f
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_8_socialmedia
161cba37ab
feat(module_2_filter):change age group dynamically
ee25cf5a8b
Merge pull request #70 from WDI-Ideas/development
f17f523e25
feat(module_2_filter):changed age_group in admin side
e96bfe9068
Merge pull request #71 from WDI-Ideas/development
81e35c1562
feat(module_2_filter):fixed migration file issue
b226e1f584
Merge pull request #72 from WDI-Ideas/development
46802f202a
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_8_socialmedia
ab80b06f54
manage coupons
473a961ab6
manage coupons list, add, edit, delete views
6a8dc781d2
feat(socialmedia):post event to social media
33030ca728
Merge pull request #75 from WDI-Ideas/development
66c5b8674a
refactor(social media):change message of success and failure in social media response
a68f114f99
Merge pull request #76 from WDI-Ideas/development
8bcc4bef7d
sync Wdipl with Staging
8d212430ec
sync Wdipl with Staging 2
4afbfb33f7
debugging coupon on stripe
9397b26708
debugging coupon on stripe 2
2db723f12d
debugging coupon on stripe 3
53a572c19e
implementing stripe subscription
cdf9d06e8c
debugging on stripe subscription
d739d9bd91
debugging on stripe subscription 2
036b8ae935
debugging on stripe subscription 3
77be3218b7
debugging on stripe subscription 4
7992e456a4
feat(filter): fixed nearest, latest and preference event
27a124b0b2
Merge pull request #77 from WDI-Ideas/development
7f7ef04a25
feat(filter):refactor sorting logic
ce676aa81d
Merge pull request #78 from WDI-Ideas/development
6e0d34312c
auto recurring testing
e3189344ea
auto recurring testing phase 2
e3b86d64fd
auto recurring testing phase 3
31f9e768ea
auto recurring testing phase 4
32afbd952e
auto recurring testing phase 5
0ba056cb63
auto recurring testing phase 6
54bdca8630
auto recurring testing phase 6
4e1d533deb
auto recurring testing phase 7
cf7f1a5b51
auto recurring testing phase 8
0f7ec4418c
auto recurring testing phase 8
d585a8311b
auto recurring testing phase 9
41ddf0ebca
auto recurring testing phase 10
deeb584c12
auto recurring testing phase 11
b958765b29
auto recurring testing phase 12
731f162531
auto recurring testing phase 13
1cf66abbff
auto recurring testing phase 14
0036e3246e
auto recurring testing phase 15
f7d904fee1
auto recurring testing phase 16
d1ab24dc0d
auto recurring testing phase 17
eb18a5d4dc
auto recurring testing phase 18
9ef1593f33
auto recurring testing phase 19
1711af39bc
auto recurring testing phase 20
4397ac52b8
auto recurring testing phase 21
338f5c29c5
auto recurring testing phase 21
442ce193d4
auto recurring testing phase 22
74425add85
auto recurring testing phase 23
0a2738496d
auto recurring testing phase 24
a75b579459
auto recurring testing phase 25
c52b42e67d
auto recurring testing phase 26
33d1c3c94e
auto recurring testing phase 27
dbed6999dc
auto recurring testing phase 28
a6dfdf8cd1
auto recurring testing phase 29
f595089b05
auto recurring testing phase 30
06bfae09b3
auto recurring testing phase 31
85767e7b96
refactored webhook realted to coupon
73ca0ea974
refactored webhook realted to coupon 2
3ac7e0d522
refactored webhook realted to coupon 3
fccd7378f7
refactored webhook realted to coupon 4
7aabd0c9fa
Merge branch 'staging' of https://github.com/WDI-Ideas/goodtimes into feature/module_9_coupons
5b29245ab2
added model admin for coupons
6d4ebe533a
commented twisted-iocpsupport==1.0.4 : error on linux server
93796ceb46
getting discounted amount from transaction
48d18d6ef3
getting discounted amount from transaction 2
6e8eb96f4f
feat(freeapp):add limitation to user preference and search filter
a81b5b4f7f
fix(socialmedia):allowed only active event to publish on social media
8fb1a7eb41
Merge pull request #80 from WDI-Ideas/feature/module_8_socialmedia
b837749fe0
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_freeapp
593dac0a0c
Merge pull request #81 from WDI-Ideas/feature/module_freeapp
9894a94b8c
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_freeapp
87f711b3f5
updated webhook module
33a11af520
updated webhook module
e8b90b8fdb
updated webhook module
70c5c815fa
updated webhook module
32a834726e
updated webhook module
e0ed41f096
updated webhook module
4c2d693ebf
Merge pull request #82 from WDI-Ideas/development
390206548b
refactor(Profile):changed profile serializer
234e9e900a
Merge pull request #83 from WDI-Ideas/feature/module_freeapp
e99095fb19
my subscriptions page
1a2013e10b
my subscriptions page 2
15a7308cb8
my subscriptions page 3
ee27d86010
my subscriptions page 4
6e93793665
my subscriptions page 5
08adadffbf
my subscriptions page 6
5cee9f21ad
my subscriptions page 7
e47a96c742
my subscriptions page 8
efbdc47aab
my subscriptions page 9
438f0005ee
my subscriptions page 10
cfff16393f
my subscriptions page 11
8f59f81796
my subscriptions page 12
f22777a72f
my subscriptions page 13
7278ef6d92
my subscriptions page 14
9c2b484fa0
my subscriptions page 15
e57901de33
my subscriptions page 16
a0dabe85ac
my subscriptions page 17
e80b01a549
my subscriptions page 18
8f6d577031
my subscriptions page 19
ab684a3e07
my subscriptions page 20
bd76a3a4cf
my subscriptions page 21
52887b0328
my subscriptions page 22
bc3a1d741b
refactor(add customer) add more field to add customer form and in excel import
797a089a50
refactor(customer details): added social info in customer detail page
66bf95ef87
Merge pull request #84 from WDI-Ideas/feature/module_1
5b68e5643e
refactor(profile): added preference count in extended data api
5bd5b7a500
Merge pull request #86 from WDI-Ideas/feature/module_freeapp
a8fee238c6
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_9_coupons
7710f2be9b
Merge pull request #87 from WDI-Ideas/feature/module_9_coupons
1b3fc0e4db
Merge branch 'staging' into development
c57ff88ec0
Merge pull request #88 from WDI-Ideas/development
b43bde15c2
fix: filter to get active user subscriptions
88fd84bbdb
refactor(profile): added social link in profile and in organization
342b36efc6
refactor(subscription): removed unnecessary field and complexity
4866f0a5d4
refactor(subscription): removed unnecessary complexity
5d107ad17a
refactor(subscription): removed unnecessary code
1f580c099d
Merge pull request #90 from WDI-Ideas/feature/module_9_coupons
3efc093de3
fix: age-group filter, url redirect
70d807220e
refator(subscription): update functionality, list view, subscription design
7ba73dff35
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_9_coupons
5dc82d28c7
Merge pull request #92 from WDI-Ideas/feature/module_9_coupons
aefce76db3
fix: create subscription and update logic
bef5a52b55
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into feature/module_9_coupons
b3db97baf4
Merge pull request #94 from WDI-Ideas/feature/module_9_coupons
1caad5ceb5
feat(social media): added api for post to social media
89639c7a38
Merge pull request #97 from WDI-Ideas/feature/module_8_socialmedia
cb904b3057
fixed: webhook, edit customer
b6b4295d7e
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into development
389dbbe390
refactor: manage customer edit
449d8615c8
fix: stipe key issue
540442fa28
Updated : key guest for multiple
6f07fe4877
Merge pull request #102 from WDI-Ideas/feature/key-guest-multiple
9ba960fcad
chore(email): adjust email configuration to reduce spam
eef12c8579
Merge branch 'development' of https://github.com/WDI-Ideas/goodtimes into development
76323a1ea1
fix: report isssue and custom command to generate individual marchant report
76ac9413c4
fixed: filter title with tag and calendar issue
3f263b2af5
refactor: custom command to update social key
8ccec7012c
updated : requirement.txt
3425d82891
feat(customer): customer cred and postcode for address
24949ade3e
updated(event): added link field in event
b559c62926
Update(Customer): added profile photo field
bec8f9d608
fixed:(customer): fixed issue of veiw button
5693ec3c48
fix: event multi image upload
9d20583a78
bobby.vishwakarma
merged commit b3e23de837 into main
bobby.vishwakarma
referenced this issue from a commit
Merge pull request #1 from WDI-Ideas/development
bobby.vishwakarma
referenced this issue from a commit
Merge pull request 'development' (#1) from development into main
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: Rizwan.Shaikh/goodtimes#1
Reference in New Issue
Block a user
No description provided.
Delete Branch "development"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?