ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'master' into bugfix-charge-invoices

Browse source
This commit is contained in:
pcoder116 2024-02-09 15:41:43 +00:00
commit 5b5239d1d4
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
hosting/management/commands/change_ch_vatrate_2023.py
View file

@ -29,25 +29,25 @@ class Command(BaseCommand):
logger.debug("VAT rate for %s is %s" % (country_to_change, vat_rate.rate)) logger.debug("VAT rate for %s is %s" % (country_to_change, vat_rate.rate))
logger.debug("vat_rate object = %s" % vat_rate) logger.debug("vat_rate object = %s" % vat_rate)
logger.debug("Create end date for the VATRate %s" % vat_rate.id) logger.debug("Create end date for the VATRate %s" % vat_rate.id)
if MAKE_MODIFS: # if MAKE_MODIFS:
vat_rate.stop_date = datetime.date(2023, 12, 31) # vat_rate.stop_date = datetime.date(2023, 12, 31)
vat_rate.save() # vat_rate.save()
print("Creating a new VATRate for CH") # print("Creating a new VATRate for CH")
obj, created = VATRates.objects.get_or_create( # obj, created = VATRates.objects.get_or_create(
start_date=datetime.date(2024, 1, 1), # start_date=datetime.date(2024, 1, 1),
stop_date=None, # stop_date=None,
territory_codes=country_to_change, # territory_codes=country_to_change,
currency_code=currency_to_change, # currency_code=currency_to_change,
rate=new_rate, # rate=new_rate,
rate_type="standard", # rate_type="standard",
description="Switzerland standard VAT (added manually on %s)" % datetime.datetime.now() # description="Switzerland standard VAT (added manually on %s)" % datetime.datetime.now()
) # )
if created: # if created:
logger.debug("Created new VAT Rate for %s with the new rate %s" % (country_to_change, new_rate)) # logger.debug("Created new VAT Rate for %s with the new rate %s" % (country_to_change, new_rate))
logger.debug(obj) # logger.debug(obj)
else: # else:
logger.debug("VAT Rate for %s already exists with the rate %s" % (country_to_change, new_rate)) # logger.debug("VAT Rate for %s already exists with the rate %s" % (country_to_change, new_rate))
#
logger.debug("Getting all subscriptions of %s that need a VAT Rate change") logger.debug("Getting all subscriptions of %s that need a VAT Rate change")
subscriptions = stripe.Subscription.list(limit=100) # Increase the limit to 100 per page (maximum) subscriptions = stripe.Subscription.list(limit=100) # Increase the limit to 100 per page (maximum)
ch_subs = [] ch_subs = []

11
hosting/views.py
View file

@ -554,13 +554,22 @@ class SettingsView(LoginRequiredMixin, FormView):
Check if the user already saved contact details. If so, then show Check if the user already saved contact details. If so, then show
the form populated with those details, to let user change them. the form populated with those details, to let user change them.
""" """
username = self.request.GET.get('username')
if self.request.user.is_admin and username:
user = CustomUser.objects.get(username=username)
else:
user = self.request.user
return form_class( return form_class(
instance=self.request.user.billing_addresses.first(), instance=user.billing_addresses.first(),
**self.get_form_kwargs()) **self.get_form_kwargs())
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(SettingsView, self).get_context_data(**kwargs) context = super(SettingsView, self).get_context_data(**kwargs)
# Get user # Get user
username = self.request.GET.get('username')
if self.request.user.is_admin and username:
user = CustomUser.objects.get(username=username)
else:
user = self.request.user user = self.request.user
stripe_customer = None stripe_customer = None
if hasattr(user, 'stripecustomer'): if hasattr(user, 'stripecustomer'):