Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4d3ce527

Von Sven Schöling vor fast 3 Jahren hinzugefügt

  • ID 4d3ce52751ba328509c3ecf03c7de37c3aab20c9
  • Vorgänger d332663c

DeliveryOrder: Anpassungen

Unterschiede anzeigen:

js/kivi.DeliveryOrder.js
1
namespace('kivi.Order', function(ns) {
1
namespace('kivi.DeliveryOrder', function(ns) {
2 2
  ns.check_cv = function() {
3 3
    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
4 4
      if ($('#order_customer_id').val() === '') {
......
115 115
      height: 600,
116 116
      title:  kivi.t8('Send email'),
117 117
      modal:  true,
118
      beforeClose: kivi.Order.finish_send_email_dialog,
119
      close: function(event, ui) {
120
        email_dialog.remove();
121
      }
118
      beforeClose: kivi.DeliveryOrder.finish_send_email_dialog,
119
      close: () => email_dialog.remove()
122 120
    };
123 121

  
124 122
    $('#' + id).remove();
......
127 125
    email_dialog.html(html);
128 126
    email_dialog.dialog(dialog_params);
129 127

  
130
    kivi.Order.setup_send_email_dialog();
128
    kivi.DeliveryOrder.setup_send_email_dialog();
131 129

  
132 130
    $('.cancel').click(ns.close_email_dialog);
133 131

  
......
178 176
    ns.reformat_number(event);
179 177
  };
180 178

  
181
  ns.update_exchangerate = function(event) {
179
  ns.update_exchangerate = function() {
182 180
    if (!ns.check_cv()) {
183 181
      $('#order_currency_id').val($('#old_currency_id').val());
184 182
      return;
......
226 224
    });
227 225
  };
228 226

  
229
  ns.exchangerate_changed = function(event) {
227
  ns.exchangerate_changed = function() {
230 228
    if (kivi.parse_amount($('#order_exchangerate_as_null_number').val()) != kivi.parse_amount($('#old_exchangerate').val())) {
231 229
      kivi.display_flash('warning', kivi.t8('You have changed the currency or exchange rate. Please check prices.'));
232 230
      $('#old_exchangerate').val($('#order_exchangerate_as_null_number').val());
......
250 248
    $(select_elt).data('oldval', $(select_elt).val());
251 249

  
252 250
    var data = $('#order_form').serializeArray();
253
    data.push({ name: 'action',           value: 'Order/unit_changed'     },
254
              { name: 'item_id',          value: item_id_dom.val()        },
255
              { name: 'old_unit',         value: oldval                   },
256
              { name: 'sellprice_dom_id', value: sellprice_dom.attr('id') });
251
    data.push(
252
      { name: 'action',           value: 'Order/unit_changed'     },
253
      { name: 'item_id',          value: item_id_dom.val()        },
254
      { name: 'old_unit',         value: oldval                   },
255
      { name: 'sellprice_dom_id', value: sellprice_dom.attr('id') }
256
    );
257 257

  
258 258
    $.post("controller.pl", data, kivi.eval_json_result);
259 259
  };
......
274 274
      return;
275 275
    }
276 276
    var data = $('#order_form').serializeArray();
277
    data.push({ name: 'action',     value: 'Order/load_second_rows' },
278
              { name: 'item_ids[]', value: item_id_dom.val()        });
277
    data.push(
278
      { name: 'action',     value: 'Order/load_second_rows' },
279
      { name: 'item_ids[]', value: item_id_dom.val()        }
280
    );
279 281

  
280 282
    $.post("controller.pl", data, kivi.eval_json_result);
281 283
  };
......
369 371
        ns.load_second_row(row);
370 372
        ns.toggle_second_row(row);
371 373
        return false;
372
      })
374
      });
373 375
    });
374 376

  
375 377
  };
......
420 422
    $('#' + order_by + '_header_id a').append('<img border=0 data-sort-dir=' + dir + ' src=' + src + ' alt="' + kivi.t8('sort items') + '">');
421 423

  
422 424
    var data = $('#order_form').serializeArray();
423
    data.push({ name: 'action',   value: 'Order/reorder_items' },
424
              { name: 'order_by', value: order_by              },
425
              { name: 'sort_dir', value: dir                   });
425
    data.push(
426
      { name: 'action',   value: 'Order/reorder_items' },
427
      { name: 'order_by', value: order_by              },
428
      { name: 'sort_dir', value: dir                   }
429
    );
426 430

  
427 431
    $.post("controller.pl", data, kivi.eval_json_result);
428 432
  };
......
462 466
    var insert_before_item_id = ns.get_insert_before_item_id($('#add_item_position').val());
463 467

  
464 468
    var data = $('#order_form').serializeArray();
465
    data.push({ name: 'action', value: 'Order/add_item' },
466
              { name: 'insert_before_item_id', value: insert_before_item_id });
469
    data.push(
470
      { name: 'action', value: 'Order/add_item' },
471
      { name: 'insert_before_item_id', value: insert_before_item_id }
472
    );
467 473

  
468 474
    $.post("controller.pl", data, kivi.eval_json_result);
469 475
  };
......
479 485
  ns.add_multi_items = function(data) {
480 486
    var insert_before_item_id = ns.get_insert_before_item_id($('#multi_items_position').val());
481 487
    data = data.concat($('#order_form').serializeArray());
482
    data.push({ name: 'action', value: 'Order/add_multi_items' },
483
              { name: 'insert_before_item_id', value: insert_before_item_id });
488
    data.push(
489
      { name: 'action', value: 'Order/add_multi_items' },
490
      { name: 'insert_before_item_id', value: insert_before_item_id }
491
    );
484 492
    $.post("controller.pl", data, kivi.eval_json_result);
485 493
  };
486 494

  
......
522 530
    var item_id_dom = $(row).find('[name="orderitem_ids[+]"]');
523 531

  
524 532
    var data = $('#order_form').serializeArray();
525
    data.push({ name: 'action',  value: 'Order/price_popup' },
526
              { name: 'item_id', value: item_id_dom.val()   });
533
    data.push(
534
      { name: 'action',  value: 'Order/price_popup' },
535
      { name: 'item_id', value: item_id_dom.val()   }
536
    );
527 537

  
528 538
    $.post("controller.pl", data, kivi.eval_json_result);
529 539
  };
......
603 613

  
604 614
    kivi.popup_dialog({
605 615
      url:    'controller.pl?action=Order/show_periodic_invoices_config_dialog',
606
      data:   { type:              $('#type').val(),
607
                id:                $('#id').val(),
608
                config:            $('#order_periodic_invoices_config').val(),
609
                customer_id:       $('#order_customer_id').val(),
610
                transdate_as_date: $('#order_transdate_as_date').val(),
611
                language_id:       $('#language_id').val()
612
              },
616
      data:   {
617
        type:              $('#type').val(),
618
        id:                $('#id').val(),
619
        config:            $('#order_periodic_invoices_config').val(),
620
        customer_id:       $('#order_customer_id').val(),
621
        transdate_as_date: $('#order_transdate_as_date').val(),
622
        language_id:       $('#language_id').val()
623
      },
613 624
      id:     'jq_periodic_invoices_config_dialog',
614 625
      load:   kivi.reinit_widgets,
615 626
      dialog: {
......
627 638

  
628 639
  ns.assign_periodic_invoices_config = function() {
629 640
    var data = $('[name="Form"]').serializeArray();
630
    data.push({ name: 'type',   value: $('#type').val() },
631
              { name: 'action', value: 'Order/assign_periodic_invoices_config' });
641
    data.push(
642
      { name: 'type',   value: $('#type').val() },
643
      { name: 'action', value: 'Order/assign_periodic_invoices_config' }
644
    );
632 645
    $.post("controller.pl", data, kivi.eval_json_result);
633 646
  };
634 647

  
......
639 652
    var active = false;
640 653
    $.ajax({
641 654
      url:      'controller.pl',
642
      data:     { action: 'Order/get_has_active_periodic_invoices',
643
                  type  : type,
644
                  id    : $('#id').val(),
645
                  config: $('#order_periodic_invoices_config').val(),
646
                },
655
      data:     {
656
        action: 'Order/get_has_active_periodic_invoices',
657
        type  : type,
658
        id    : $('#id').val(),
659
        config: $('#order_periodic_invoices_config').val(),
660
      },
647 661
      method:   "GET",
648 662
      async:    false,
649 663
      dataType: 'text',
......
676 690

  
677 691
    kivi.popup_dialog({
678 692
      url:    'controller.pl',
679
      data:   { action: 'Order/show_customer_vendor_details_dialog',
680
                type  : $('#type').val(),
681
                vc    : vc,
682
                vc_id : vc_id
683
              },
693
      data:   {
694
        action: 'Order/show_customer_vendor_details_dialog',
695
        type  : $('#type').val(),
696
        vc    : vc,
697
        vc_id : vc_id
698
      },
684 699
      id:     'jq_customer_vendor_details_dialog',
685 700
      dialog: {
686 701
        title:  title,
......
762 777
      shipto = shipto_elements.join('; ');
763 778
    }
764 779

  
765
    var use_it = false;
766 780
    if (!empty) {
767 781
      ns.direct_delivery_dialog(shipto);
768 782
    } else {
......
787 801
    var text2 = kivi.t8('Do you want to carry this shipping address over to the new purchase order so that the vendor can deliver the goods directly to your customer?');
788 802
    var html  = '<div id="direct-delivery-dialog"><p>' + text1 + '</p><p>' + shipto + '</p><p>' + text2 + '</p>';
789 803
    html      = html + '<hr><p>';
790
    html      = html + '<input type="button" value="' + kivi.t8('Yes') + '" size="30" onclick="kivi.Order.direct_delivery_callback(true)">';
804
    html      = html + '<input type="button" value="' + kivi.t8('Yes') + '" size="30" onclick="kivi.DeliveryOrder.direct_delivery_callback(true)">';
791 805
    html      = html + '&nbsp;';
792
    html      = html + '<input type="button" value="' + kivi.t8('No')  + '" size="30" onclick="kivi.Order.direct_delivery_callback(false)">';
806
    html      = html + '<input type="button" value="' + kivi.t8('No')  + '" size="30" onclick="kivi.DeliveryOrder.direct_delivery_callback(false)">';
793 807
    html      = html + '</p></div>';
794 808
    $(html).hide().appendTo('#order_form');
795 809

  
796
    kivi.popup_dialog({id: 'direct-delivery-dialog',
797
                       dialog: {title:  kivi.t8('Carry over shipping address'),
798
                                height: 300,
799
                                width:  500 }});
810
    kivi.popup_dialog({
811
      id: 'direct-delivery-dialog',
812
      dialog: {
813
        title:  kivi.t8('Carry over shipping address'),
814
        height: 300,
815
        width:  500
816
      }
817
    });
800 818
  };
801 819

  
802 820
  ns.follow_up_window = function() {
......
818 836
    }
819 837

  
820 838
    var info = '';
821
    if (number_info !== '') { info += ' (' + number_info + ')' }
822
    if (name_info   !== '') { info += ' (' + name_info + ')' }
839
    if (number_info !== '') { info += ' (' + number_info + ')'; }
840
    if (name_info   !== '') { info += ' (' + name_info + ')'; }
823 841

  
824 842
    if (!$('#follow_up_rowcount').lenght) {
825 843
      $('<input type="hidden" name="follow_up_rowcount"        id="follow_up_rowcount">').appendTo('#order_form');
......
841 859

  
842 860
$(function() {
843 861
  if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
844
    $('#order_customer_id').change(kivi.Order.reload_cv_dependent_selections);
862
    $('#order_customer_id').change(kivi.DeliveryOrder.reload_cv_dependent_selections);
845 863
  } else {
846
    $('#order_vendor_id').change(kivi.Order.reload_cv_dependent_selections);
864
    $('#order_vendor_id').change(kivi.DeliveryOrder.reload_cv_dependent_selections);
847 865
  }
848 866

  
849
  $('#order_currency_id').change(kivi.Order.update_exchangerate);
850
  $('#order_transdate_as_date').change(kivi.Order.update_exchangerate);
851
  $('#order_exchangerate_as_null_number').change(kivi.Order.exchangerate_changed);
867
  $('#order_currency_id').change(kivi.DeliveryOrder.update_exchangerate);
868
  $('#order_transdate_as_date').change(kivi.DeliveryOrder.update_exchangerate);
869
  $('#order_exchangerate_as_null_number').change(kivi.DeliveryOrder.exchangerate_changed);
852 870

  
853 871
  if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation' ) {
854
    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)) });
872
    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.sellprice, -2)); });
855 873
  } else {
856
    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.lastcost, -2)) });
874
    $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_sellprice_as_number').val(kivi.format_amount(o.lastcost, -2)); });
857 875
  }
858
  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description) });
859
  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit) });
876
  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_description').val(o.description); });
877
  $('#add_item_parts_id').on('set_item:PartPicker', function(e,o) { $('#add_item_unit').val(o.unit); });
860 878

  
861 879
  $('.add_item_input').keydown(function(event) {
862 880
    if (event.keyCode == 13) {
863 881
      event.preventDefault();
864
      kivi.Order.add_item();
882
      kivi.DeliveryOrder.add_item();
865 883
      return false;
866 884
    }
867 885
  });
868 886

  
869
  kivi.Order.init_row_handlers();
887
  kivi.DeliveryOrder.init_row_handlers();
870 888

  
871
  $('#row_table_id').on('sortstop', function(event, ui) {
889
  $('#row_table_id').on('sortstop', () => {
872 890
    $('#row_table_id thead a img').remove();
873
    kivi.Order.renumber_positions();
891
    kivi.DeliveryOrder.renumber_positions();
874 892
  });
875 893

  
876 894
  $('#expand_all').on('click', function(event) {
......
881 899
      $('#expand_all').attr('alt', kivi.t8('Show all details'));
882 900
      $('#expand_all').attr('title', kivi.t8('Show all details'));
883 901
      $('.row_entry').each(function(idx, elt) {
884
        kivi.Order.hide_second_row(elt);
902
        kivi.DeliveryOrder.hide_second_row(elt);
885 903
      });
886 904
    } else {
887 905
      $('#expand_all').data('expanded', 1);
888 906
      $('#expand_all').attr('src', "image/collapse.svg");
889 907
      $('#expand_all').attr('alt', kivi.t8('Hide all details'));
890 908
      $('#expand_all').attr('title', kivi.t8('Hide all details'));
891
      kivi.Order.load_all_second_rows();
909
      kivi.DeliveryOrder.load_all_second_rows();
892 910
      $('.row_entry').each(function(idx, elt) {
893
        kivi.Order.show_second_row(elt);
911
        kivi.DeliveryOrder.show_second_row(elt);
894 912
      });
895 913
    }
896 914
    return false;
897 915
  });
898 916

  
899
  $('.reformat_number_as_null_number').change(kivi.Order.reformat_number_as_null_number);
917
  $('.reformat_number_as_null_number').change(kivi.DeliveryOrder.reformat_number_as_null_number);
900 918

  
901 919
});

Auch abrufbar als: Unified diff