IDEMPIERE-462 Ticket #1001503: Credit Cards Online - Drop old payment button implementation
This commit is contained in:
parent
8609a6a53b
commit
5927908b34
|
@ -17,6 +17,9 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
package org.compiere.apps;
|
package org.compiere.apps;
|
||||||
|
|
||||||
|
import static org.compiere.model.SystemIDs.PROCESS_AD_CHANGELOG_REDO;
|
||||||
|
import static org.compiere.model.SystemIDs.PROCESS_AD_CHANGELOG_UNDO;
|
||||||
|
|
||||||
import java.awt.BorderLayout;
|
import java.awt.BorderLayout;
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.awt.Cursor;
|
import java.awt.Cursor;
|
||||||
|
@ -71,7 +74,6 @@ import org.compiere.grid.ICreateFrom;
|
||||||
import org.compiere.grid.RecordAccessDialog;
|
import org.compiere.grid.RecordAccessDialog;
|
||||||
import org.compiere.grid.VCreateFromFactory;
|
import org.compiere.grid.VCreateFromFactory;
|
||||||
import org.compiere.grid.VOnlyCurrentDays;
|
import org.compiere.grid.VOnlyCurrentDays;
|
||||||
import org.compiere.grid.VPayment;
|
|
||||||
import org.compiere.grid.VSortTab;
|
import org.compiere.grid.VSortTab;
|
||||||
import org.compiere.grid.VTabbedPane;
|
import org.compiere.grid.VTabbedPane;
|
||||||
import org.compiere.grid.ed.VButton;
|
import org.compiere.grid.ed.VButton;
|
||||||
|
@ -92,7 +94,6 @@ import org.compiere.model.MRole;
|
||||||
import org.compiere.model.MToolBarButtonRestrict;
|
import org.compiere.model.MToolBarButtonRestrict;
|
||||||
import org.compiere.model.MUser;
|
import org.compiere.model.MUser;
|
||||||
import org.compiere.model.MWindow;
|
import org.compiere.model.MWindow;
|
||||||
import static org.compiere.model.SystemIDs.*;
|
|
||||||
import org.compiere.model.X_AD_ToolBarButton;
|
import org.compiere.model.X_AD_ToolBarButton;
|
||||||
import org.compiere.plaf.CompiereColor;
|
import org.compiere.plaf.CompiereColor;
|
||||||
import org.compiere.print.AReport;
|
import org.compiere.print.AReport;
|
||||||
|
@ -2524,23 +2525,8 @@ public final class APanel extends CPanel
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean isProcessMandatory = false;
|
boolean isProcessMandatory = false;
|
||||||
|
|
||||||
// Pop up Payment Rules
|
|
||||||
if (col.equals("PaymentRule"))
|
|
||||||
{
|
|
||||||
VPayment vp = new VPayment(m_curWindowNo, m_curTab, vButton);
|
|
||||||
if (vp.isInitOK()) // may not be allowed
|
|
||||||
vp.setVisible(true);
|
|
||||||
vp.dispose();
|
|
||||||
if (vp.needSave())
|
|
||||||
{
|
|
||||||
cmd_save(false);
|
|
||||||
cmd_refresh();
|
|
||||||
}
|
|
||||||
} // PaymentRule
|
|
||||||
|
|
||||||
// Pop up Document Action (Workflow)
|
// Pop up Document Action (Workflow)
|
||||||
else if (col.equals("DocAction"))
|
if (col.equals("DocAction"))
|
||||||
{
|
{
|
||||||
isProcessMandatory = true;
|
isProcessMandatory = true;
|
||||||
VDocAction vda = new VDocAction(m_curWindowNo, m_curTab, vButton, record_ID);
|
VDocAction vda = new VDocAction(m_curWindowNo, m_curTab, vButton, record_ID);
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -44,12 +44,10 @@ import org.adempiere.webui.apps.BusyDialogTemplate;
|
||||||
import org.adempiere.webui.apps.ProcessModalDialog;
|
import org.adempiere.webui.apps.ProcessModalDialog;
|
||||||
import org.adempiere.webui.apps.form.WCreateFromFactory;
|
import org.adempiere.webui.apps.form.WCreateFromFactory;
|
||||||
import org.adempiere.webui.apps.form.WCreateFromWindow;
|
import org.adempiere.webui.apps.form.WCreateFromWindow;
|
||||||
import org.adempiere.webui.apps.form.WPayment;
|
|
||||||
import org.adempiere.webui.component.Listbox;
|
import org.adempiere.webui.component.Listbox;
|
||||||
import org.adempiere.webui.component.ProcessInfoDialog;
|
import org.adempiere.webui.component.ProcessInfoDialog;
|
||||||
import org.adempiere.webui.component.Window;
|
import org.adempiere.webui.component.Window;
|
||||||
import org.adempiere.webui.editor.IProcessButton;
|
import org.adempiere.webui.editor.IProcessButton;
|
||||||
import org.adempiere.webui.editor.WButtonEditor;
|
|
||||||
import org.adempiere.webui.editor.WEditor;
|
import org.adempiere.webui.editor.WEditor;
|
||||||
import org.adempiere.webui.event.ActionEvent;
|
import org.adempiere.webui.event.ActionEvent;
|
||||||
import org.adempiere.webui.event.ActionListener;
|
import org.adempiere.webui.event.ActionListener;
|
||||||
|
@ -2336,38 +2334,8 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean isProcessMandatory = false;
|
boolean isProcessMandatory = false;
|
||||||
|
|
||||||
// Pop up Payment Rules
|
|
||||||
if (col.equals("PaymentRule"))
|
|
||||||
{
|
|
||||||
final WPayment vp = new WPayment(curWindowNo, adtabPanel.getGridTab(), (WButtonEditor) wButton);
|
|
||||||
if (vp.isInitOK()) // may not be allowed
|
|
||||||
{
|
|
||||||
vp.setAttribute(Window.MODE_KEY, Window.MODE_HIGHLIGHTED);
|
|
||||||
vp.addEventListener(DialogEvents.ON_WINDOW_CLOSE, new EventListener<Event>() {
|
|
||||||
@Override
|
|
||||||
public void onEvent(Event event) throws Exception {
|
|
||||||
if (vp.needSave())
|
|
||||||
{
|
|
||||||
onSave(false, false, new Callback<Boolean>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCallback(Boolean result) {
|
|
||||||
onRefresh(true, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
AEnv.showWindow(vp);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
} // PaymentRule
|
|
||||||
|
|
||||||
// Pop up Document Action (Workflow)
|
// Pop up Document Action (Workflow)
|
||||||
|
if (col.equals("DocAction"))
|
||||||
else if (col.equals("DocAction"))
|
|
||||||
{
|
{
|
||||||
final WDocActionPanel win = new WDocActionPanel(adtabPanel.getGridTab());
|
final WDocActionPanel win = new WDocActionPanel(adtabPanel.getGridTab());
|
||||||
if (win.getNumberOfOptions() == 0)
|
if (win.getNumberOfOptions() == 0)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue