Skip to content

T
third-party
Commit 7a830c75 by Etienne Freiss
Options

sans street2

parent 05ef2f71
dev_cooperatic … #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7819-prevent-adding-product-already-in-order 7848-cannot-validate-qty-with-decimal-on-kg-product 7918_bug_quantites_stade_demande_prix adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_principale docker export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch master meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
6 merge requests!103WIP: Dev cooperatic,!64Ticket 1330,!84Ticket 1738,!87Integration Evolution bdm,!104merge dev_cooperatic into dev_principale,!106Dev principale
Pipeline #1483 passed with stage
in 1 minute 31 seconds
Showing with 27 additions and 26 deletions
members_space/static/js/members-space-my-info.js
...@@ -47,60 +47,60 @@ function init_my_info() { ...@@ -47,60 +47,60 @@ function init_my_info() {
$(".member_phone_line").hide(); $(".member_phone_line").hide();
} }
$('#edit_address').off('click').on('click', (e) => { $('#edit_address').off('click')
.on('click', () => {
$("#street_form").val(partner_data.street); $("#street_form").val(partner_data.street);
$("#street2_form").val(partner_data.street2); // $("#street2_form").val(partner_data.street2);
$("#city_form").val(partner_data.city); $("#city_form").val(partner_data.city);
$('#edit_address_value').hide(); $('#edit_address_value').hide();
$('#edit_address_form').show(); $('#edit_address_form').show();
}); });
$('#cancel_edit_address').on('click', (e) => { $('#cancel_edit_address').
on('click', () => {
$('#edit_address_form').hide(); $('#edit_address_form').hide();
$('#edit_address_value').show(); $('#edit_address_value').show();
}); });
$('#save_edit_address').off('click').on('click', (e) => { $('#save_edit_address').off('click')
.on('click', () => {
data= []; data= [];
data['street']= $("#street_form").val(); data['street']= $("#street_form").val();
data['street2']= $("#street2_form").val(); // data['street2']= $("#street2_form").val();
data['city']= $("#city_form").val(); data['city']= $("#city_form").val();
saveInfo(data, 'address') saveInfo(data, 'address');
}); });
$('#edit_phone').off('click').on('click', (e) => { $('#edit_phone').off('click')
.on('click', () => {
$("#phone_form").val(partner_data.phone); $("#phone_form").val(partner_data.phone);
$("#mobile_form").val(partner_data.mobile); $("#mobile_form").val(partner_data.mobile);
$('#edit_phone_value').hide(); $('#edit_phone_value').hide();
$('#edit_phone_form').show(); $('#edit_phone_form').show();
}); });
$('#cancel_edit_phone').off('click').on('click', (e) => { $('#cancel_edit_phone').off('click')
.on('click', () => {
$('#edit_phone_form').hide(); $('#edit_phone_form').hide();
$('#edit_phone_value').show(); $('#edit_phone_value').show();
}); });
$('#save_edit_phone').off('click').on('click', (e) => { $('#save_edit_phone').off('click')
.on('click', () => {
console.log('ici'); console.log('ici');
data =[]; data =[];
data['phone']= $("#phone_form").val(); data['phone']= $("#phone_form").val();
data['mobile']= $("#mobile_form").val(); data['mobile']= $("#mobile_form").val();
saveInfo(data, 'phone');
saveInfo(data, 'phone')
}); });
} }
function saveInfo(data, field){ function saveInfo(data, field) {
tData = '&idPartner=' + partner_data.partner_id tData = '&idPartner=' + partner_data.partner_id
+ '&shift_type=' + partner_data.shift_type + '&shift_type=' + partner_data.shift_type
+ '&verif_token=' + partner_data.verif_token + '&verif_token=' + partner_data.verif_token;
for(d in data){ for (d in data) {
tData+="&"+d+"="+data[d]; tData+="&"+d+"="+data[d];
} }
tUrl = '/members/save_partner_info'; tUrl = '/members/save_partner_info';
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
...@@ -108,22 +108,22 @@ function saveInfo(data, field){ ...@@ -108,22 +108,22 @@ function saveInfo(data, field){
dataType:"json", dataType:"json",
data: tData, data: tData,
timeout: 3000, timeout: 3000,
success: function(res) { success: function() {
for(d in data){ for (d in data) {
partner_data[d]=data[d] partner_data[d]=data[d];
} }
init_my_info(); init_my_info();
if(field == 'address'){ if (field == 'address') {
$('#edit_address_form').hide(); $('#edit_address_form').hide();
$('#edit_address_value').show(); $('#edit_address_value').show();
} }
if(field == 'phone'){ if (field == 'phone') {
$('#edit_phone_form').hide(); $('#edit_phone_form').hide();
$('#edit_phone_value').show(); $('#edit_phone_value').show();
} }
}, },
error: function(error) { error: function(error) {
console.log(error) console.log(error);
} }
}); });
} }
\ No newline at end of file
templates/members_space/my_info.html
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</div> </div>
<div class="my_info_line_right member_address_area1" id="edit_address_form"> <div class="my_info_line_right member_address_area1" id="edit_address_form">
<input type="text" name="street_form" id="street_form" placeholder="Rue"> <input type="text" name="street_form" id="street_form" placeholder="Rue">
<input type="text" name="street2_form" id="street2_form" placeholder="Complément"> <!-- <input type="text" name="street2_form" id="street2_form" placeholder="Complément"> -->
<input type="text" name="city_form" id="city_form" placeholder="Ville"> <br> <input type="text" name="city_form" id="city_form" placeholder="Ville"> <br>
<span id="cancel_edit_address"><i class="fas fa-times tile_icon edit-btn"></i></span> <span id="cancel_edit_address"><i class="fas fa-times tile_icon edit-btn"></i></span>
<span id="save_edit_address"><i class="fas fa-check tile_icon edit-btn"></i></span> <span id="save_edit_address"><i class="fas fa-check tile_icon edit-btn"></i></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment