Skip to content

Merge Master #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xzzy merged 4 commits into from
May 28, 2026
Merged

Merge Master #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44c6dd1
Merge pull request #1169 from xzzy/master2
xzzy Feb 12, 2026
129d8a6
Cipher Update
xzzy Apr 16, 2026
5fbbb4e
Update api.py
xzzy Apr 20, 2026
18a357c
Merge branch 'master2' into master
xzzy May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ledgergw/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,12 +302,12 @@ def update_user_info_id(request, userid,apikey):
if ledger_obj.postal_address.country != postal_address_obj['postal_country']:
models.EmailUserChangeLog.objects.create(emailuser=ledger_user[0], change_key="postal_country", change_value="ledger_api_client_"+api_key_obj_update_key+": " +ledgergw_utils.remove_html_tags(postal_address_obj['postal_country']),change_by=ledger_changeuser_obj)
ledger_obj.postal_address.country = ledgergw_utils.remove_html_tags(postal_address_obj['postal_country'])

if 'postal_same_as_residential' in postal_address_obj:
if ledger_obj.postal_same_as_residential != postal_address_obj['postal_same_as_residential']:
models.EmailUserChangeLog.objects.create(emailuser=ledger_user[0], change_key="postal_same_as_residential", change_value="ledger_api_client_"+api_key_obj_update_key+": " +str(postal_address_obj['postal_same_as_residential']),change_by=ledger_changeuser_obj)
if isinstance(postal_address_obj['postal_same_as_residential'], bool):
ledger_obj.postal_same_as_residential = postal_address_obj['postal_same_as_residential']
if 'postal_same_as_residential' in postal_address_obj:
if ledger_obj.postal_same_as_residential != postal_address_obj['postal_same_as_residential']:
models.EmailUserChangeLog.objects.create(emailuser=ledger_user[0], change_key="postal_same_as_residential", change_value="ledger_api_client_"+api_key_obj_update_key+": " +str(postal_address_obj['postal_same_as_residential']),change_by=ledger_changeuser_obj)
if isinstance(postal_address_obj['postal_same_as_residential'], bool):
ledger_obj.postal_same_as_residential = postal_address_obj['postal_same_as_residential']

ledger_obj.postal_address.save()
except Exception as e:
print (str(e))
Expand Down Expand Up @@ -2514,4 +2514,4 @@ def check_oracle_code(request,apikey):
# print(traceback.print_exc())
# raise



4 changes: 2 additions & 2 deletions ledgergw/management/commands/cba_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def handle(self, *args, **options):
print ("removing "+lbf)
os.remove(local_bank_directory+lbf)

result = subprocess.check_output('echo "ls '+remote_bank_directory+'" | sftp -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i /tmp/bank.key '+sftp_username+'@'+sftp_host, shell=True, text=True)
result = subprocess.check_output('echo "ls '+remote_bank_directory+'" | sftp -o Ciphers=aes256-ctr -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i /tmp/bank.key '+sftp_username+'@'+sftp_host, shell=True, text=True)
sftpfiles = result.split("\n")
for file in sftpfiles:
sftp_file = file.strip()
Expand All @@ -53,7 +53,7 @@ def handle(self, *args, **options):
print ("File already exists not downloading "+file_only)
else:
print ('downloading file '+file_only)
get_resp = subprocess.check_output('echo "get '+sftp_file+' '+local_bank_directory+'" | sftp -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i /tmp/bank.key '+sftp_username+'@'+sftp_host, shell=True, text=True)
get_resp = subprocess.check_output('echo "get '+sftp_file+' '+local_bank_directory+'" | sftp -o Ciphers=aes256-ctr -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i /tmp/bank.key '+sftp_username+'@'+sftp_host, shell=True, text=True)
#print (get_resp)
os.remove('/tmp/bank.key')
except Exception as e:
Expand Down
Loading