Commit graph

196 commits

Author SHA1 Message Date
1Day
ae1fecef33 Add payment methode to invoice 2021-12-22 13:48:21 +01:00
Dennis
c614e03526
Merge pull request #328 from IceToast/stripe_integration
feature: Stripe integration
2021-12-22 13:06:46 +01:00
1day2die
6531dd957f Update index.blade.php 2021-12-21 15:49:25 +01:00
1day2die
eef27ca8fe translation strings 2021-12-21 15:48:40 +01:00
Dennis
dce6aef535
Hotfix Quote-marks 2021-12-21 08:21:59 +01:00
IceToast
67767ef860
Merge branch 'development' into servercreation_resouce_card 2021-12-20 22:15:03 +01:00
Dennis
88d460c661
Update confirmed.blade.php 2021-12-20 19:23:41 +01:00
IceToast
e306dd8104 chore: 🌐 changed payment method missing text 2021-12-20 18:56:25 +01:00
IceToast
b775ce6cc7 fix: 🚑️ changed the payment setup detection 2021-12-20 18:50:18 +01:00
IceToast
7989ff57b9 feat: Added Notification if Stripe isnt setup (like paypal) in store 2021-12-20 11:18:35 +01:00
IceToast
9d8361641b feat: Added conditional payment methods options 2021-12-20 11:05:51 +01:00
IceToast
d33eef6523 fix: 🐛 translation strings 2021-12-20 09:20:43 +01:00
IceToast
754a3e38b8 Merge branch 'development' into stripe_integration
# Conflicts:
#	app/Http/Controllers/Admin/CreditProductController.php
#	app/Http/Controllers/Admin/PaymentController.php
#	composer.lock
#	resources/views/admin/payments/index.blade.php
#	resources/views/admin/store/edit.blade.php
#	resources/views/store/checkout.blade.php
#	resources/views/store/index.blade.php
2021-12-17 10:41:32 +01:00
1day2die
586bea8795 Translate Invoice-Email. Fix Typo 2021-12-16 19:38:25 +01:00
IceToast
fc0ffcb295 feat: added payment method selection & localized strings 2021-12-15 15:06:21 +01:00
IceToast
2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00
IceToast
1e9850c594 chore: 🔧 updated naming dashboard -> controlpanel.gg 2021-12-15 12:34:08 +01:00
IceToast
45b7d703a5 feat: ♻️ Changed payment Status to "paid" && Updated admin/payment table 2021-12-15 12:16:30 +01:00
1Day
2dd7997d28 Updated Translations 2021-12-15 11:50:04 +01:00
1Day
3b5b01f862 Delete .gitkeep 2021-12-15 11:37:25 +01:00
1Day
1d8e0e22dd Fully translate invoices 2021-12-15 11:25:37 +01:00
AVMG20
9ebca3aec3 logo padding fix 2021-12-14 19:36:44 +01:00
Dennis
26eb7c349e
Merge branch 'Invoices' into development 2021-12-14 19:31:14 +01:00
AVMG20
b8741b8e10 Merge remote-tracking branch 'origin/development' into development 2021-12-14 19:17:52 +01:00
AVMG20
505bf7b6fa added translation manager 2021-12-14 19:17:44 +01:00
1day2die
9ac3a86129 Fix shop page 2021-12-14 19:03:40 +01:00
Dennis
63c44e6c0b
Merge branch 'development' into Invoices 2021-12-14 18:54:58 +01:00
1Day
d9b9eb369e fix spaces 2021-12-14 16:08:51 +01:00
Dennis
d572a603d3
Merge branch 'development' into localization 2021-12-14 16:06:45 +01:00
1Day
82ce13fcbd resolve conflicts 2021-12-14 16:05:27 +01:00
IceToast
a77455c5fd feat: added StripePay Route 2021-12-14 15:47:50 +01:00
IceToast
e3b8ff5045 Rename PaypalProduct -> CreditProduct 2021-12-14 15:47:50 +01:00
1Day
720622ae02 Fixed Datatables 2021-12-14 15:47:17 +01:00
1Day
47b7402db8 fix column 2021-12-14 15:24:53 +01:00
IceToast
fdd0f2131a style: 💄 fixed code formatting 2021-12-14 00:38:45 +01:00
1day2die
e2328cb328 Translate Datatables 2021-12-13 22:39:40 +01:00
1Day
60b310bc0c multilanguage support 2021-12-13 13:28:01 +01:00
1Day
ff9be6b543 invoice translation 2021-12-13 12:52:13 +01:00
1Day
7ef8fdff4e guess im done? 2021-12-13 11:47:35 +01:00
1Day
6bc01d5ae6 All blade files 2021-12-13 11:14:42 +01:00
1Day
1a1223424a quicksafe 2021-12-13 10:42:22 +01:00
1Day
70828b6d48 fully translateable backend 2021-12-13 10:12:32 +01:00
1Day
88eafb72c5 quicksave 2021-12-13 08:59:27 +01:00
1Day
24ee173326 saving progress 2021-12-13 08:42:53 +01:00
IceToast
546f4a25e2 Styling 2021-12-13 00:29:32 +01:00
1day2die
9644fe0fe2 first steps 2021-12-06 17:11:48 +01:00
1day2die
a6de39bc32 small fixes, logo update, prefix update 2021-12-05 20:08:09 +01:00
1Day
75c550e0c1 Fixes requested by IceToast 2021-12-02 12:01:11 +01:00
WBLKLeipe
86716961f3 download all invoices button 2021-12-02 09:54:30 +01:00
IceToast
cda13a2007 feat: added basic product sorting -> by price 2021-12-01 21:58:21 +01:00